blob42/nvd3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added a 'noErrorCheck' method to cumulativeLineChart

Browse Source
This commit is contained in:
Robin Hu 2013-12-16 22:25:26 -05:00
parent 37ca61f8d1
commit 3d88c7a5eb
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nv.d3.js
View File

@ -2520,6 +2520,7 @@ nv.models.cumulativeLineChart = function() {
, average = function(d) { return d.average }
, dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState')
, transitionDuration = 250
, noErrorCheck = false //if set to TRUE, will bypass an error check in the indexify function.
;
xAxis
@ -3202,6 +3203,12 @@ nv.models.cumulativeLineChart = function() {
return chart;
};
chart.noErrorCheck = function(_) {
if (!arguments.length) return noErrorCheck;
noErrorCheck = _;
return chart;
};
//============================================================
@ -3218,8 +3225,9 @@ nv.models.cumulativeLineChart = function() {
var v = lines.y()(line.values[idx], idx);
//TODO: implement check below, and disable series if series loses 100% or more cause divide by 0 issue
if (v < -.95) {
if (v < -.95 && !noErrorCheck) {
//if a series loses more than 100%, calculations fail.. anything close can cause major distortion (but is mathematically correct till it hits 100)
line.tempDisabled = true;
return line;
}

10
src/models/cumulativeLineChart.js
View File

@ -38,6 +38,7 @@ nv.models.cumulativeLineChart = function() {
, average = function(d) { return d.average }
, dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'stateChange', 'changeState')
, transitionDuration = 250
, noErrorCheck = false //if set to TRUE, will bypass an error check in the indexify function.
;
xAxis
@ -720,6 +721,12 @@ nv.models.cumulativeLineChart = function() {
return chart;
};
chart.noErrorCheck = function(_) {
if (!arguments.length) return noErrorCheck;
noErrorCheck = _;
return chart;
};
//============================================================
@ -736,8 +743,9 @@ nv.models.cumulativeLineChart = function() {
var v = lines.y()(line.values[idx], idx);
//TODO: implement check below, and disable series if series loses 100% or more cause divide by 0 issue
if (v < -.95) {
if (v < -.95 && !noErrorCheck) {
//if a series loses more than 100%, calculations fail.. anything close can cause major distortion (but is mathematically correct till it hits 100)
line.tempDisabled = true;
return line;
}