vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-05 19:15:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix for negative values in y axis

Browse source
This commit is contained in:
emanuele-f 2019-07-05 20:33:39 +02:00
parent 3732fbc691
commit fe8a586e6a
3 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

47
httpdocs/js/graph_utils.js
View file

@ -347,6 +347,16 @@ function hideQuerySlow() {
$("#query-slow-alert").hide();
}
function chart_data_sum(series) {
return(series.reduce(function(acc, x) {
return(acc + x.values.reduce(
function(acc, pt) {
return(acc + pt[1] || 0);
}, 0)
)
}, 0));
}
// add a new updateStackedChart function
function attachStackedChartCallback(chart, schema_name, chart_id, zoom_reset_id, params, step,
metric_type, align_step, show_all_smooth, initial_range, ts_table_shown) {
@ -392,20 +402,28 @@ function attachStackedChartCallback(chart, schema_name, chart_id, zoom_reset_id,
/* The default number of y points */
var num_ticks_y1 = null;
var num_ticks_y2 = null;
var domain_y1 = null;
var domain_y2 = null;
var first_run = true;
var update_chart_data = function(new_data) {
/* reset chart data so that the next transition animation will be gracefull */
d3_sel.datum([]).call(chart);
d3_sel.datum(new_data);
/* This additional refresh is needed to determine the yticks
* and domain, needed below. */
d3_sel.call(chart);
if(first_run) {
num_ticks_y1 = chart.yAxis1.ticks();
num_ticks_y2 = chart.yAxis2.ticks();
domain_y1 = chart.yDomain1();
domain_y2 = chart.yDomain2();
first_run = false;
}
if(metric_type === "gauge") {
/* This additional refresh is needed to determine the yticks
* and domain, needed below. */
d3_sel.transition().call(chart);
if(!num_ticks_y1) num_ticks_y1 = chart.yAxis1.ticks();
if(!num_ticks_y2) num_ticks_y2 = chart.yAxis2.ticks();
var cur_domain_y1 = chart.yAxis1.scale().domain();
var cur_domain_y2 = chart.yAxis2.scale().domain();
@ -421,9 +439,22 @@ function attachStackedChartCallback(chart, schema_name, chart_id, zoom_reset_id,
chart.yAxis2.ticks(Math.min(cur_domain_y2, num_ticks_y2));
}
var y1_sum = chart_data_sum(new_data.filter(function(x) { return(x.yAxis == 1); }))
var y2_sum = chart_data_sum(new_data.filter(function(x) { return(x.yAxis == 2); }))
/* Fix negative ydomain values appearing when dataset is empty */
if(y1_sum == 0)
chart.yDomain1([0, 1]);
else
chart.yDomain1(domain_y1);
if(y2_sum == 0)
chart.yDomain2([0, 1]);
else
chart.yDomain2(domain_y2);
/* Refresh the chart */
d3_sel.transition().call(chart);
nv.utils.windowResize(chart.update);
spinner.remove();
}