Commit 6071db2b authored by Evgeny's avatar Evgeny

Normalized chart -- cut min and max y values with original minmax. Fixes CHRT-206

parent 185906de
...@@ -3543,7 +3543,7 @@ ...@@ -3543,7 +3543,7 @@
var data = []; var data = [];
data.noNegative = true; data.onlyPositive = true;
targets.forEach(function(target){ targets.forEach(function(target){
data.push($$.cloneTarget(target)); data.push($$.cloneTarget(target));
...@@ -3554,7 +3554,7 @@ ...@@ -3554,7 +3554,7 @@
for(c in targets) { for(c in targets) {
if(targets[c].values[k]){ if(targets[c].values[k]){
if(targets[c].values[k].value < 0){ if(targets[c].values[k].value < 0){
data.noNegative = false; data.onlyPositive = false;
} }
tt = tt + Math.abs(targets[c].values[k].value); tt = tt + Math.abs(targets[c].values[k].value);
} }
...@@ -4871,7 +4871,7 @@ ...@@ -4871,7 +4871,7 @@
// if we don't need to tune // if we don't need to tune
if($$.config.normalized){ if($$.config.normalized){
$$.data.targets = $$.normalize($$.data._targets); $$.data.targets = $$.normalize($$.data._targets);
if($$.data.targets.noNegative){ if($$.data.targets.onlyPositive){
$$.cachedRedraw(); $$.cachedRedraw();
return; return;
} }
...@@ -4887,9 +4887,13 @@ ...@@ -4887,9 +4887,13 @@
} }
var sizesY = $$.getAxisData(minmax.minY, minmax.maxY); var sizesY = $$.getAxisData(minmax.minY, minmax.maxY);
if($$.config.normalized){ if($$.config.normalized){
sizesY.max = Math.min(sizesY.max, 1); sizesY.max = Math.min(sizesY.max, 1);
sizesY.min = Math.max(sizesY.min, -1); sizesY.min = Math.max(sizesY.min, -1);
sizesY.max = Math.min(sizesY.max, minmax.maxY);
sizesY.min = Math.max(sizesY.min, minmax.minY);
} }
$$.api.axis.range({ $$.api.axis.range({
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -381,7 +381,7 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){ ...@@ -381,7 +381,7 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){
// if we don't need to tune // if we don't need to tune
if($$.config.normalized){ if($$.config.normalized){
$$.data.targets = $$.normalize($$.data._targets); $$.data.targets = $$.normalize($$.data._targets);
if($$.data.targets.noNegative){ if($$.data.targets.onlyPositive){
$$.cachedRedraw(); $$.cachedRedraw();
return; return;
} }
...@@ -397,9 +397,13 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){ ...@@ -397,9 +397,13 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){
} }
var sizesY = $$.getAxisData(minmax.minY, minmax.maxY); var sizesY = $$.getAxisData(minmax.minY, minmax.maxY);
if($$.config.normalized){ if($$.config.normalized){
sizesY.max = Math.min(sizesY.max, 1); sizesY.max = Math.min(sizesY.max, 1);
sizesY.min = Math.max(sizesY.min, -1); sizesY.min = Math.max(sizesY.min, -1);
sizesY.max = Math.min(sizesY.max, minmax.maxY);
sizesY.min = Math.max(sizesY.min, minmax.minY);
} }
$$.api.axis.range({ $$.api.axis.range({
......
...@@ -7,7 +7,7 @@ c3.chart.internal.fn.normalize = function(targets){ ...@@ -7,7 +7,7 @@ c3.chart.internal.fn.normalize = function(targets){
var data = []; var data = [];
data.noNegative = true; data.onlyPositive = true;
targets.forEach(function(target){ targets.forEach(function(target){
data.push($$.cloneTarget(target)); data.push($$.cloneTarget(target));
...@@ -18,7 +18,7 @@ c3.chart.internal.fn.normalize = function(targets){ ...@@ -18,7 +18,7 @@ c3.chart.internal.fn.normalize = function(targets){
for(c in targets) { for(c in targets) {
if(targets[c].values[k]){ if(targets[c].values[k]){
if(targets[c].values[k].value < 0){ if(targets[c].values[k].value < 0){
data.noNegative = false; data.onlyPositive = false;
} }
tt = tt + Math.abs(targets[c].values[k].value); tt = tt + Math.abs(targets[c].values[k].value);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment