Fix minor bug with y axis screwing up in stack mode of multibar chart

master-patched
Bob Monteverde 12 years ago
parent 1edf924478
commit cfa185d2ba

@ -3872,6 +3872,16 @@ nv.models.multiBar = function() {
var availableWidth = width - margin.left - margin.right,
availableHeight = height - margin.top - margin.bottom;
if (stacked) {
//var stackedData = d3.layout.stack()
data = d3.layout.stack()
.offset('zero')
.values(function(d){ return d.values })
.y(getY)
(data);
}
//add series index to each data point for reference
data = data.map(function(series, i) {
@ -3904,6 +3914,7 @@ nv.models.multiBar = function() {
x.domain([x.domain()[0] - x.domain()[0] * 0.01, x.domain()[1] + x.domain()[1] * 0.01])
: x.domain([-1,1]);
nv.log(y.domain());
if (y.domain()[0] === y.domain()[1])
y.domain()[0] ?
y.domain([y.domain()[0] + y.domain()[0] * 0.01, y.domain()[1] - y.domain()[1] * 0.01])
@ -3916,16 +3927,6 @@ nv.models.multiBar = function() {
if (stacked) {
//var stackedData = d3.layout.stack()
data = d3.layout.stack()
.offset('zero')
.values(function(d){ return d.values })
.y(getY)
(data);
}

6
nv.d3.min.js vendored

File diff suppressed because one or more lines are too long

@ -35,6 +35,16 @@ nv.models.multiBar = function() {
var availableWidth = width - margin.left - margin.right,
availableHeight = height - margin.top - margin.bottom;
if (stacked) {
//var stackedData = d3.layout.stack()
data = d3.layout.stack()
.offset('zero')
.values(function(d){ return d.values })
.y(getY)
(data);
}
//add series index to each data point for reference
data = data.map(function(series, i) {
@ -67,6 +77,7 @@ nv.models.multiBar = function() {
x.domain([x.domain()[0] - x.domain()[0] * 0.01, x.domain()[1] + x.domain()[1] * 0.01])
: x.domain([-1,1]);
nv.log(y.domain());
if (y.domain()[0] === y.domain()[1])
y.domain()[0] ?
y.domain([y.domain()[0] + y.domain()[0] * 0.01, y.domain()[1] - y.domain()[1] * 0.01])
@ -79,16 +90,6 @@ nv.models.multiBar = function() {
if (stacked) {
//var stackedData = d3.layout.stack()
data = d3.layout.stack()
.offset('zero')
.values(function(d){ return d.values })
.y(getY)
(data);
}

Loading…
Cancel
Save