Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-02-15 08:48:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Bar chart

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-01-10 19:54:52 +01:00
parent f01bde58cf
commit 2c6c43b38d
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Chart/BarChart.js
View File

@ -91,15 +91,15 @@
this.chart.calculateDimension(); this.chart.calculateDimension();
x = this.chart.createXScale('ordinal'); x = this.chart.createXScale('linear');
y = this.chart.createYScale('linear'); y = this.chart.createYScale('ordinal');
xAxis1 = this.chart.createXAxis(x); xAxis1 = this.chart.createXAxis(x);
yAxis1 = this.chart.createYAxis(y); yAxis1 = this.chart.createYAxis(y);
xGrid = this.chart.createXGrid(x); xGrid = this.chart.createXGrid(x);
yGrid = this.chart.createYGrid(y); yGrid = this.chart.createYGrid(y);
x.domain(d3.range(this.chart.dataset[0].points.length)).rangeRoundBands([0, this.chart.dimension.width - this.chart.margin.right - this.chart.margin.left], .1); x.domain([0, this.chart.axis.y.max + 1]);
y.domain([0, this.chart.axis.y.max + 1]); y.domain(d3.range(this.chart.dataset[0].points.length)).rangeRoundBands([0, this.chart.dimension.height - this.chart.margin.top - this.chart.margin.bottom], .1);
svg = this.chart.chartSelect.append("svg") svg = this.chart.chartSelect.append("svg")
.attr("width", this.chart.dimension.width) .attr("width", this.chart.dimension.width)
@ -152,13 +152,13 @@
return d.points; return d.points;
}) })
.enter().append("rect") .enter().append("rect")
.attr("x", function (d) .attr("y", function (d)
{ {
return x(d.x); return y(d.x);
}) })
.attr("y", this.chart.dimension.height - this.chart.margin.top - this.chart.margin.bottom) .attr("x", 0)
.attr("width", x.rangeBand()) .attr("width", 0)
.attr("height", 0); .attr("height", y.rangeBand());
if(this.chart.subtype === 'stacked') { if(this.chart.subtype === 'stacked') {
rect.transition() rect.transition()
@ -166,14 +166,16 @@
{ {
return i * 10; return i * 10;
}) })
.attr("y", function (d) .attr("x", function (d)
{ {
return y(d.y0 + d.y); return x(d.y0);
}) })
.attr("height", function (d) .attr("width", function (d)
{ {
return y(d.y0) - y(d.y0 + d.y); return x(d.y);
}); });
console.log(this.chart.dataset);
} else { } else {
rect.transition() rect.transition()
.duration(500) .duration(500)
@ -181,19 +183,16 @@
{ {
return i * 10; return i * 10;
}) })
.attr("x", function (d, i, j) .attr("y", function (d, i, j)
{ {
return x(d.x) + x.rangeBand() / self.chart.dataset.length * j; return y(d.x) + y.rangeBand() / self.chart.dataset.length * j;
}) })
.attr("width", x.rangeBand() /self.chart.dataset.length) .attr("height", y.rangeBand() /self.chart.dataset.length)
.transition() .transition()
.attr("y", function (d) .attr("x", 0)
.attr("width", function (d)
{ {
return y(d.y); return x(d.y);
})
.attr("height", function (d)
{
return self.chart.dimension.height - self.chart.margin.top - self.chart.margin.bottom - y(d.y);
}); });
} }