Skip to content

C
c3-closed
Commit bc7234a5 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

fix findMinMax function for stacked chart (eterbug #10934)

parent 86cecc4b
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 108 deletions
c3.js
View file @ bc7234a5
...@@ -4982,17 +4982,24 @@ ...@@ -4982,17 +4982,24 @@
var minY, maxY, minX, maxX; var minY, maxY, minX, maxX;
var i,j, id; var i,j, id;
// detect if we have stacked group
var stacked = false;
var groups = $$.api.groups();
groups.forEach(function(elem){
if(elem.length) {
stacked = true;
}
});
var stackedSum = [];
var allData = $$.api.data(); var allData = $$.api.data();
allData.forEach(function(v){ allData.forEach(function(v){
var data; if(!v)
if(v){ return;
data = v.values; var data = v.values;
} else {
data = {
length: 0
};
}
// calc min/max for X axis
for(i = 0; i < data.length; i++) { for(i = 0; i < data.length; i++) {
if (isUndefined(maxX) || data[i].x > maxX) if (isUndefined(maxX) || data[i].x > maxX)
maxX = data[i].x; maxX = data[i].x;
...@@ -5000,56 +5007,30 @@ ...@@ -5000,56 +5007,30 @@
minX = data[i].x; minX = data[i].x;
} }
var stacked = false; // calc min/max for Y axis
for(i = 0; i < data.length; i++) {
var groups = $$.api.groups(); if (isUndefined(maxY) || data[i].value > maxY)
maxY = data[i].value;
groups.forEach(function(elem){ if (isUndefined(minY) || data[i].value < minY)
if(elem.length){ minY = data[i].value;
stacked = true; // calc sum row for stacked
} if (stacked) {
}); if (!stackedSum[i])
stackedSum[i] = 0;
if(stacked){ stackedSum[i] += data[i].value;
data = $$.api.data();
var tmp = [];
for(i = 0; i < data.length; i++){
var tmp_seq = [];
var values = data[i].values;
values.forEach(function(value){
tmp_seq.push(value);
});
tmp.push(tmp_seq);
}
for(i = 0; i < data.length; i++){
for(var j = 0; j < tmp[0].length; j++){
var s = 0;
for(var k = 0; k < tmp.length; k++){
s += tmp[k][j].value;
}
if (isUndefined(maxY) || s > maxY){
maxY = s;
}
if (isUndefined(minY) || s < minY){
minY = s;
}
}
}
} else {
for(i = 0; i < data.length; i++) {
if (isUndefined(maxY) || data[i].value > maxY)
maxY = data[i].value;
if (isUndefined(minY) || data[i].value < minY)
minY = data[i].value;
} }
} }
}); });
if (stacked) {
for(i = 0; i < stackedSum.length; i++) {
if (isUndefined(maxY) || stackedSum[i] > maxY)
maxY = stackedSum[i];
if (isUndefined(minY) || stackedSum[i] < minY)
minY = stackedSum[i];
}
}
return {minY: minY, maxY: maxY, minX: minX, maxX: maxX}; return {minY: minY, maxY: maxY, minX: minX, maxX: maxX};
}; };
......
c3.min.js
View file @ bc7234a5
This source diff could not be displayed because it is too large. You can view the blob instead.
src/axis.js
View file @ bc7234a5
...@@ -587,17 +587,24 @@ c3_chart_internal_fn.findMinMax = function () { ...@@ -587,17 +587,24 @@ c3_chart_internal_fn.findMinMax = function () {
var minY, maxY, minX, maxX; var minY, maxY, minX, maxX;
var i,j, id; var i,j, id;
// detect if we have stacked group
var stacked = false;
var groups = $$.api.groups();
groups.forEach(function(elem){
if(elem.length) {
stacked = true;
}
});
var stackedSum = [];
var allData = $$.api.data(); var allData = $$.api.data();
allData.forEach(function(v){ allData.forEach(function(v){
var data; if(!v)
if(v){ return;
data = v.values; var data = v.values;
} else {
data = {
length: 0
};
}
// calc min/max for X axis
for(i = 0; i < data.length; i++) { for(i = 0; i < data.length; i++) {
if (isUndefined(maxX) || data[i].x > maxX) if (isUndefined(maxX) || data[i].x > maxX)
maxX = data[i].x; maxX = data[i].x;
...@@ -605,56 +612,30 @@ c3_chart_internal_fn.findMinMax = function () { ...@@ -605,56 +612,30 @@ c3_chart_internal_fn.findMinMax = function () {
minX = data[i].x; minX = data[i].x;
} }
var stacked = false; // calc min/max for Y axis
for(i = 0; i < data.length; i++) {
var groups = $$.api.groups(); if (isUndefined(maxY) || data[i].value > maxY)
maxY = data[i].value;
groups.forEach(function(elem){ if (isUndefined(minY) || data[i].value < minY)
if(elem.length){ minY = data[i].value;
stacked = true; // calc sum row for stacked
} if (stacked) {
}); if (!stackedSum[i])
stackedSum[i] = 0;
if(stacked){ stackedSum[i] += data[i].value;
data = $$.api.data();
var tmp = [];
for(i = 0; i < data.length; i++){
var tmp_seq = [];
var values = data[i].values;
values.forEach(function(value){
tmp_seq.push(value);
});
tmp.push(tmp_seq);
}
for(i = 0; i < data.length; i++){
for(var j = 0; j < tmp[0].length; j++){
var s = 0;
for(var k = 0; k < tmp.length; k++){
s += tmp[k][j].value;
}
if (isUndefined(maxY) || s > maxY){
maxY = s;
}
if (isUndefined(minY) || s < minY){
minY = s;
}
}
}
} else {
for(i = 0; i < data.length; i++) {
if (isUndefined(maxY) || data[i].value > maxY)
maxY = data[i].value;
if (isUndefined(minY) || data[i].value < minY)
minY = data[i].value;
} }
} }
}); });
if (stacked) {
for(i = 0; i < stackedSum.length; i++) {
if (isUndefined(maxY) || stackedSum[i] > maxY)
maxY = stackedSum[i];
if (isUndefined(minY) || stackedSum[i] < minY)
minY = stackedSum[i];
}
}
return {minY: minY, maxY: maxY, minX: minX, maxX: maxX}; return {minY: minY, maxY: maxY, minX: minX, maxX: maxX};
}; };
......
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