diff options
| author | alisonjm <alisonjm> | 2011-06-08 21:34:47 +0000 |
|---|---|---|
| committer | alisonjm <alisonjm> | 2011-06-08 21:34:47 +0000 |
| commit | 8d0015e0d6fc7a55f68fe22ab5e7ab73edf04118 (patch) | |
| tree | f0870ad33d9705dbe07125013cec2efd30cd168e | |
| parent | bf002a03d47f2a835cc4bddd666e8d65eea8c33a (diff) | |
Commiting in case
| -rw-r--r-- | src/lib/rrdFlotSupport.js | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/src/lib/rrdFlotSupport.js b/src/lib/rrdFlotSupport.js index 499aca1..116dc35 100644 --- a/src/lib/rrdFlotSupport.js +++ b/src/lib/rrdFlotSupport.js @@ -349,8 +349,36 @@ rrdFlotSelection.prototype.trim_data = function(data_list) { var out_data=[];
for (var i=0; i<data_list.length; i++) {
+
+ if (data_list[i]==null) continue; // protect
+ //data_list[i][0]+=3550000*5;
+ var nr=data_list[i][0]; //date in unix time
+ if ((nr>=this.selection_min) && (nr<=this.selection_max)) {
+ out_data.push(data_list[i]);
+ }
+ }
+ return out_data;
+};
+
+
+// Given an array of flot lines, limit to the selection
+rrdFlotSelection.prototype.trim_flot_timezone_data = function(flot_data,shift) {
+ var out_data=[];
+ for (var i=0; i<flot_data.length; i++) {
+ var data_el=flot_data[i];
+ out_data.push({label : data_el.label, data:this.trim_timezone_data(data_el.data,shift), color:data_el.color, lines:data_el.lines, yaxis:data_el.yaxis});
+ }
+ return out_data;
+};
+
+// Limit to selection the flot series data element
+rrdFlotSelection.prototype.trim_timezone_data = function(data_list,shift) {
+ if (this.selection_min==null) return data_list; // no selection => no filtering
+
+ var out_data=[];
+ for (var i=0; i<data_list.length; i++) {
if (data_list[i]==null) continue; // protect
- var nr=data_list[i][0];
+ var nr=data_list[i][0]+shift;
if ((nr>=this.selection_min) && (nr<=this.selection_max)) {
out_data.push(data_list[i]);
}
@@ -358,8 +386,9 @@ rrdFlotSelection.prototype.trim_data = function(data_list) { return out_data;
};
+
// ======================================
-// Miscelabeous helper functions
+// Miscelaneous helper functions
// ======================================
function rfs_format_time(s) {
|