diff --git a/share/collection.js b/share/collection.js
index 3ee5ccc03361a2ebafa7c1dae319f66dca632c6b..57de19dd44a9f8fe9575ed97762d2f40dfa26905 100644 (file)
--- a/share/collection.js
+++ b/share/collection.js
function value_to_string (value) /* {{{ */
{
- var abs_value = Math.abs (value);
+ var abs_value;
+ var v2s = function (value)
+ {
+ var tmp = Math.round (100.0 * value) / 100.0;
+ return ("" + tmp);
+ }
+
+ if (value == null)
+ return ('NaN');
+ else if (value == 0)
+ return ('0');
+
+ abs_value = Math.abs (value);
if ((abs_value < 10000) && (abs_value >= 0.1))
- return ("" + value);
+ return (v2s (value));
else if (abs_value > 1)
{
if (abs_value < 10000000)
- return ("" + (value / 1000) + "k");
+ return (v2s (value / 1000) + "k");
else if (abs_value < 10000000000)
- return ("" + (value / 1000000) + "M");
+ return (v2s (value / 1000000) + "M");
else if (abs_value < 10000000000000)
- return ("" + (value / 1000000000) + "G");
+ return (v2s (value / 1000000000) + "G");
else
- return ("" + (value / 1000000000000) + "T");
+ return (v2s (value / 1000000000000) + "T");
}
else
{
if (abs_value >= 0.001)
- return ("" + (value * 1000) + "m");
+ return (v2s (value * 1000) + "m");
else if (abs_value >= 0.000001)
- return ("" + (value * 1000000) + "u");
+ return (v2s (value * 1000000) + "u");
else
- return ("" + (value * 1000000000) + "n");
+ return (v2s (value * 1000000000) + "n");
}
} /* }}} function value_to_string */
-function instance_get_params (graph) /* {{{ */
+function instance_get_params (inst) /* {{{ */
{
- var graph_selector = graph.graph_selector;
- var inst_selector = graph.instance_selector;
+ var graph_selector = inst.graph_selector;
+ var inst_selector = inst.instance_selector;
var selector = {};
if (graph_selector.host == inst_selector.host)
return (ret);
} /* }}} ident_clone */
-function graph_get_defs (graph) /* {{{ */
+function inst_get_defs (inst) /* {{{ */
{
- if (!graph.def)
+ if (!inst.def)
{
- var params = ident_clone (graph.graph_selector);
+ var params = instance_get_params (inst);
params.action = "graph_def_json";
$.ajax({
if (!data)
return;
- graph.def = data;
+ inst.def = data;
}});
}
- if (graph.def)
- return (graph.def);
+ if (inst.def)
+ return (inst.def);
return;
-} /* }}} graph_get_defs */
+} /* }}} inst_get_defs */
function ident_matches (selector, ident) /* {{{ */
{
return (ret);
} /* }}} function ident_describe */
-function def_draw_one (def, data, chart_opts) /* {{{ */
+function def_draw_one (def, data, series_array) /* {{{ */
{
var chart_series = new Object ();
chart_series.type = 'line';
- chart_series.name = def.legend || def.data_source;
- chart_series.pointInterval = data.interval * 1000;
- chart_series.pointStart = data.first_value_time * 1000;
+ chart_series.pointInterval = data.interval * 1000.0;
+ chart_series.pointStart = data.first_value_time * 1000.0;
chart_series.data = data.data;
chart_series.lineWidth = 1;
chart_series.shadow = false;
chart_series.marker = { enabled: false };
+ if (def.legend)
+ chart_series.name = def.legend;
+ else if (def.ds_name)
+ chart_series.name = def.ds_name;
+
if (def.area)
chart_series.type = 'area';
if ((def.color) && (def.color != 'random'))
chart_series.color = def.color;
- chart_opts.series.push (chart_series);
+ series_array.push (chart_series);
} /* }}} function def_draw_one */
-function def_draw (def, data_list, chart_opts) /* {{{ */
+function def_draw (def, data_list, series_array) /* {{{ */
{
var i;
if (!ident_matches (def.select, data_list[i].file))
continue;
- def_draw_one (def, data_list[i], chart_opts);
+ def_draw_one (def, data_list[i], series_array);
}
} /* }}} function def_draw */
-function instance_draw (inst, def, data_list) /* {{{ */
+function inst_get_chart_opts (inst, def) /* {{{ */
{
- var x_data = [];
- var y_data = [];
- var i;
-
var chart_opts = new Object ();
- if (!inst || !def || !data_list)
- return;
-
chart_opts.chart =
{
renderTo: inst.container,
{
type: 'datetime',
maxZoom: 300, // five minutes
- title: { text: null }
+ title: { text: null },
+ events:
+ {
+ setExtremes: function (event)
+ {
+ var begin = null;
+ var end = null;
+
+ if ((event.min) && (event.max))
+ {
+ begin = event.min / 1000.0;
+ end = event.max / 1000.0;
+ }
+ inst_fetch_data (inst, begin, end);
+ }
+ }
};
chart_opts.yAxis =
{
{
formatter: function () { return (value_to_string (this.value)); }
},
+ startOnTick: false,
endOnTick: false
};
+ chart_opts.legend =
+ {
+ labelFormatter: function ()
+ {
+ var series = this;
+ var min = Number.MAX_VALUE;
+ var max = Number.NEGATIVE_INFINITY;
+ var num = 0;
+ var sum = 0;
+ var avg;
+ var i;
+
+ for (i = 0; i < this.data.length; i++)
+ {
+ var v;
+
+ v = this.data[i].y;
+ if (v == null)
+ continue;
+
+ if (min > v)
+ min = v;
+ if (max < v)
+ max = v;
+
+ sum += v;
+ num++;
+ }
+
+ if (num == 0)
+ {
+ min = null;
+ max = null;
+ avg = null;
+ }
+ else
+ {
+ avg = sum / num;
+ }
+
+ return (this.name + " (" + value_to_string (min) + " min, "
+ + value_to_string (avg) + " avg, "
+ + value_to_string (max) + " max)");
+ }
+ };
chart_opts.series = new Array ();
if (def.title)
chart_opts.title = { text: def.title };
- for (i = def.defs.length - 1; i >= 0; i--)
- def_draw (def.defs[i], data_list, chart_opts);
+ return (chart_opts);
+} /* }}} function chart_opts_get */
-// if ((def.defs.length == 0) && (data_list.length == 1))
-// def_draw_one (null, data_list[0], chart_opts);
+function inst_draw (inst, def, data_list) /* {{{ */
+{
+ var chart_opts;
+ var i;
+
+ if (!inst || !def || !data_list)
+ return;
+
+ chart_opts = inst_get_chart_opts (inst, def);
+
+ for (i = def.defs.length - 1; i >= 0; i--)
+ def_draw (def.defs[i], data_list, chart_opts.series);
inst.chart = new Highcharts.Chart (chart_opts);
-} /* }}} function instance_draw */
+} /* }}} function inst_draw */
-function json_graph_update (index) /* {{{ */
+function inst_redraw (inst, def, data_list) /* {{{ */
{
- var inst;
- var def;
- var params;
+ var series_array;
+ var i;
- inst = c4.instances[index];
- if (!inst)
+ if (!inst.chart)
+ return (inst_draw (inst, def, data_list));
+
+ series_array = new Array ();
+ for (i = def.defs.length - 1; i >= 0; i--)
+ def_draw (def.defs[i], data_list, series_array);
+
+ if (inst.chart.series.length != series_array.length)
+ {
+ alert ("inst.chart.series.length != series_array.length");
return;
+ }
- def = graph_get_defs (inst);
+ for (i = inst.chart.series.length - 1; i >= 0; i--)
+ inst.chart.series[i].remove (/* redraw = */ false);
+
+ for (i = 0; i < series_array.length; i++)
+ inst.chart.addSeries (series_array[i], /* redraw = */ false);
+
+ inst.chart.redraw ();
+} /* }}} function inst_redraw */
+
+function inst_fetch_data (inst, begin, end) /* {{{ */
+{
+ var def;
+ var params;
+
+ def = inst_get_defs (inst);
if (!def)
return;
- if (!inst.container)
- inst.container = "c4-graph" + index;
-
params = instance_get_params (inst);
params.action = "instance_data_json";
- params.begin = inst.begin;
- params.end = inst.end;
+ params.begin = begin || inst.begin;
+ params.end = end || inst.end;
$.getJSON ("collection.fcgi", params,
function (data)
{
- instance_draw (inst, def, data);
+ inst_redraw (inst, def, data);
}); /* getJSON */
+} /* }}} inst_fetch_data */
+
+function json_graph_update (index) /* {{{ */
+{
+ var inst;
+
+ inst = c4.instances[index];
+ if (!inst)
+ return;
+
+ if (!inst.container)
+ inst.container = "c4-graph" + index;
+
+ inst_fetch_data (inst);
} /* }}} json_graph_update */
function format_instance(inst)