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

Implement vertical waterfall

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-01-10 21:10:40 +01:00
parent 2c6c43b38d
commit 276410dc97
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Chart/BarChart.js
View File

@ -174,8 +174,6 @@
{ {
return x(d.y); return x(d.y);
}); });
console.log(this.chart.dataset);
} else { } else {
rect.transition() rect.transition()
.duration(500) .duration(500)

32
Chart/VWaterfallChart.js
View File

@ -52,7 +52,7 @@
visible: true visible: true
} }
}; };
this.chart.subtype = 'waterfall'; this.chart.subtype = 'vwaterfall';
}; };
jsOMS.Chart.VWaterfallChart.prototype.getChart = function () jsOMS.Chart.VWaterfallChart.prototype.getChart = function ()
@ -83,15 +83,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(this.chart.dataset[0].points.map(function(d) { return d.name; })); x.domain([0, d3.max(this.chart.dataset[0].points, function(d) { return d.y*1.05; })]);
y.domain([0, d3.max(this.chart.dataset[0].points, function(d) { return d.y*1.05; })]); y.domain(this.chart.dataset[0].points.map(function(d) { return d.name; }));
svg = this.chart.chartSelect.append("svg") svg = this.chart.chartSelect.append("svg")
.attr("width", this.chart.dimension.width) .attr("width", this.chart.dimension.width)
@ -133,25 +133,19 @@
dataPointEnter = dataPoint.enter().append("g") dataPointEnter = dataPoint.enter().append("g")
.attr("class", function(d) { return "dataPoint " + (d.y < d.y0 ? 'negative' : 'positive'); }) .attr("class", function(d) { return "dataPoint " + (d.y < d.y0 ? 'negative' : 'positive'); })
.attr("transform", function(d) { return "translate(" + x(d.name) + ",0)"; }); .attr("transform", function(d) { return "translate(0," + y(d.name) + ")"; });
dataPointEnter.append("rect") dataPointEnter.append("rect")
.attr("y", function(d) { return y( Math.max(d.y0, d.y) ); }) .attr("x", function(d) { return x( Math.min(d.y0, d.y) ); })
.attr("height", function(d) { return Math.abs( y(d.y0) - y(d.y) ); }) .attr("width", function(d) { return Math.abs( x(d.y0) - x(d.y) ); })
.attr("width", x.rangeBand()); .attr("height", y.rangeBand());
dataPointEnter.append("text")
.attr("x", x.rangeBand() / 2)
.attr("y", function(d) { return y(d.y) + 5; })
.attr("dy", function(d) { return ((d.y < d.y0) ? '-' : '') + ".75em" })
.text(function(d) { return d.y - d.y0; });
dataPointEnter.filter(function(d) { return d.class != "total" }).append("line") dataPointEnter.filter(function(d) { return d.class != "total" }).append("line")
.attr("class", "connector") .attr("class", "connector")
.attr("x1", x.rangeBand() + 5 ) .attr("x1", y.rangeBand() + 5 )
.attr("y1", function(d) { return y(d.y) } ) .attr("y1", function(d) { return x(d.y) } )
.attr("x2", x.rangeBand() / ( 1 - 5) - 5 ) .attr("x2", y.rangeBand() / ( 1 - 5) - 5 )
.attr("y2", function(d) { return y(d.y) } ); .attr("y2", function(d) { return x(d.y) } );
return [dataPointEnter, dataPoint]; return [dataPointEnter, dataPoint];
}; };