Commit 8cd56366 authored by Evgeny's avatar Evgeny

Use Excel-like axis calc for stacked with negative values

parent 5affb553
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
return c3; return c3;
} }
var injectedMethods = ['getAxisData', 'getAbscissa']; var injectedMethods = ['getAxisData', 'getAbscissa', 'getAxisStackedData'];
function Chart(config) { function Chart(config) {
var $$ = this.internal = new ChartInternal(this); var $$ = this.internal = new ChartInternal(this);
...@@ -5013,7 +5013,12 @@ ...@@ -5013,7 +5013,12 @@
if($$.config.is_xy){ if($$.config.is_xy){
sizesX = $$.getAbscissa($$.config.ed3Type, minmax.minX, minmax.maxX); sizesX = $$.getAbscissa($$.config.ed3Type, minmax.minX, minmax.maxX);
} }
sizesY = $$.getAxisData(minmax.minY, minmax.maxY);
if($$.config.normalized){
sizesY = $$.getAxisStackedData(minmax.minY, minmax.maxY);
} else {
sizesY = $$.getAxisData(minmax.minY, minmax.maxY);
}
} else { } else {
sizesY = { sizesY = {
min: minmax.minY, min: minmax.minY,
...@@ -5028,18 +5033,6 @@ ...@@ -5028,18 +5033,6 @@
sizesY.min = Math.max(sizesY.min, -1); sizesY.min = Math.max(sizesY.min, -1);
} }
if($$.config.normalized){
if(sizesY.min < 0 && minmax.minY < 0){
while(sizesY.min < minmax.minY){
sizesY.min += sizesY.step;
}
if(sizesY.min >= minmax.minY){
sizesY.min -= sizesY.step;
}
}
}
$$.api.axis.range({ $$.api.axis.range({
min: { min: {
x: sizesX ? sizesX.min : undefined, x: sizesX ? sizesX.min : undefined,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -401,7 +401,12 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){ ...@@ -401,7 +401,12 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){
if($$.config.is_xy){ if($$.config.is_xy){
sizesX = $$.getAbscissa($$.config.ed3Type, minmax.minX, minmax.maxX); sizesX = $$.getAbscissa($$.config.ed3Type, minmax.minX, minmax.maxX);
} }
sizesY = $$.getAxisData(minmax.minY, minmax.maxY);
if($$.config.normalized){
sizesY = $$.getAxisStackedData(minmax.minY, minmax.maxY);
} else {
sizesY = $$.getAxisData(minmax.minY, minmax.maxY);
}
} else { } else {
sizesY = { sizesY = {
min: minmax.minY, min: minmax.minY,
...@@ -416,18 +421,6 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){ ...@@ -416,18 +421,6 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){
sizesY.min = Math.max(sizesY.min, -1); sizesY.min = Math.max(sizesY.min, -1);
} }
if($$.config.normalized){
if(sizesY.min < 0 && minmax.minY < 0){
while(sizesY.min < minmax.minY){
sizesY.min += sizesY.step;
}
if(sizesY.min >= minmax.minY){
sizesY.min -= sizesY.step;
}
}
}
$$.api.axis.range({ $$.api.axis.range({
min: { min: {
x: sizesX ? sizesX.min : undefined, x: sizesX ? sizesX.min : undefined,
......
...@@ -7,7 +7,7 @@ var c3init = function(module){ ...@@ -7,7 +7,7 @@ var c3init = function(module){
return c3; return c3;
} }
var injectedMethods = ['getAxisData', 'getAbscissa']; var injectedMethods = ['getAxisData', 'getAbscissa', 'getAxisStackedData'];
function Chart(config) { function Chart(config) {
var $$ = this.internal = new ChartInternal(this); var $$ = this.internal = new ChartInternal(this);
......
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