do now allow zero values in valueRange min
Costa Tsaousis (ktsaou) committed
Jan 14, 2018 at 21:31 UTC
54d45d7c10e702befe15890e90ecbd9b2e276f7b
1 file changed
+15
-5
web/dashboard.js
+15
-5
@@ -6005,6 +6005,11 @@ var NETDATA = window.NETDATA || {};
6005
options.isZoomedIgnoreProgrammaticZoom = true;
6006
}
6007
6008
+ if(NETDATA.chartLibraries.dygraph.isLogScale(state) === true) {
6009
+ if(Array.isArray(options.valueRange) && options.valueRange[0] <= 0)
6010
+ options.valueRange[0] = null;
6011
+ }
6012
+
6013
dygraph.updateOptions(options);
6014
6015
var redraw = false;
@@ -6034,7 +6039,7 @@ var NETDATA = window.NETDATA || {};
6039
6040
var chart_type = NETDATA.dataAttribute(state.element, 'dygraph-type', state.chart.chart_type);
6041
if(chart_type === 'stacked' && data.dimensions === 1) chart_type = 'area';
6037
- if(chart_type === 'stacked' && this.isLogScale(state) === true) chart_type = 'area';
6042
+ if(chart_type === 'stacked' && NETDATA.chartLibraries.dygraph.isLogScale(state) === true) chart_type = 'area';
6043
6044
var highlightCircleSize = (NETDATA.chartLibraries.dygraph.isSparkline(state) === true)?3:4;
6045
@@ -6057,7 +6062,7 @@ var NETDATA = window.NETDATA || {};
6062
labelsDivStyles: NETDATA.dataAttribute(state.element, 'dygraph-labelsdivstyles', { 'fontSize':'1px' }),
6063
labelsDivWidth: NETDATA.dataAttribute(state.element, 'dygraph-labelsdivwidth', state.chartWidth() - 70),
6064
labelsSeparateLines: NETDATA.dataAttributeBoolean(state.element, 'dygraph-labelsseparatelines', true),
6060
- labelsShowZeroValues: (this.isLogScale(state) === true)?false:NETDATA.dataAttributeBoolean(state.element, 'dygraph-labelsshowzerovalues', true),
6065
+ labelsShowZeroValues: (NETDATA.chartLibraries.dygraph.isLogScale(state) === true)?false:NETDATA.dataAttributeBoolean(state.element, 'dygraph-labelsshowzerovalues', true),
6066
labelsKMB: false,
6067
labelsKMG2: false,
6068
showLabelsOnHighlight: NETDATA.dataAttributeBoolean(state.element, 'dygraph-showlabelsonhighlight', true),
@@ -6086,7 +6091,7 @@ var NETDATA = window.NETDATA || {};
6091
// Draw points at the edges of gaps in the data.
6092
// This improves visibility of small data segments or other data irregularities.
6093
drawGapEdgePoints: NETDATA.dataAttributeBoolean(state.element, 'dygraph-drawgapedgepoints', true),
6089
- connectSeparatedPoints: (this.isLogScale(state) === true)?false:NETDATA.dataAttributeBoolean(state.element, 'dygraph-connectseparatedpoints', false),
6094
+ connectSeparatedPoints: (NETDATA.chartLibraries.dygraph.isLogScale(state) === true)?false:NETDATA.dataAttributeBoolean(state.element, 'dygraph-connectseparatedpoints', false),
6095
pointSize: NETDATA.dataAttribute(state.element, 'dygraph-pointsize', 1),
6096
6097
// enabling this makes the chart with little square lines
@@ -6121,7 +6126,7 @@ var NETDATA = window.NETDATA || {};
6126
highlightSeriesBackgroundAlpha: NETDATA.dataAttribute(state.element, 'dygraph-highlightseriesbackgroundalpha', null), // TOO SLOW: (chart_type === 'stacked')?0.7:0.5,
6127
pointClickCallback: NETDATA.dataAttribute(state.element, 'dygraph-pointclickcallback', undefined),
6128
visibility: state.dimensions_visibility.selected2BooleanArray(state.data.dimension_names),
6124
- logscale: (this.isLogScale(state) === true)?'y':undefined,
6129
+ logscale: (NETDATA.chartLibraries.dygraph.isLogScale(state) === true)?'y':undefined,
6130
6131
axes: {
6132
x: {
@@ -6134,7 +6139,7 @@ var NETDATA = window.NETDATA || {};
6139
}
6140
},
6141
y: {
6137
- logscale: (this.isLogScale(state) === true)?true:undefined,
6142
+ logscale: (NETDATA.chartLibraries.dygraph.isLogScale(state) === true)?true:undefined,
6143
pixelsPerLabel: NETDATA.dataAttribute(state.element, 'dygraph-ypixelsperlabel', 15),
6144
axisLabelWidth: NETDATA.dataAttribute(state.element, 'dygraph-yaxislabelwidth', 50),
6145
axisLabelFormatter: function (y) {
@@ -6698,6 +6703,11 @@ var NETDATA = window.NETDATA || {};
6703
}
6704
};
6705
6706
+ if(NETDATA.chartLibraries.dygraph.isLogScale(state) === true) {
6707
+ if(Array.isArray(state.tmp.dygraph_options.valueRange) && state.tmp.dygraph_options.valueRange[0] <= 0)
6708
+ state.tmp.dygraph_options.valueRange[0] = null;
6709
+ }
6710
+
6711
if(NETDATA.chartLibraries.dygraph.isSparkline(state) === true) {
6712
state.tmp.dygraph_options.drawGrid = false;
6713
state.tmp.dygraph_options.drawAxis = false;