vitalif-js
/
dimple
mirror of https://github.com/vitalif/dimple
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed the bar width for proportional X axis. Removed draw from setMargin

master
sfrantsuzov 2015-08-17 12:18:11 +01:00
parent d99c6ea0cd
commit 449e09d5a2
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/objects/chart/methods/_getData.js
View File

@ -286,12 +286,12 @@
returnData.forEach(function (ret) {
if (x !== null) {
if (useCount.x === true) { ret.xValue = ret.xValueList.length; }
tot = (totals.x[ret.xField.join("/")] || 0) + (y._hasMeasure() ? Math.abs(ret.yValue) : 0);
tot = (totals.x[ret.xField.join("/")] || 0) + (x._hasMeasure() ? Math.abs(ret.xValue) : 0);
totals.x[ret.xField.join("/")] = tot;
}
if (y !== null) {
if (useCount.y === true) { ret.yValue = ret.yValueList.length; }
tot = (totals.y[ret.yField.join("/")] || 0) + (x._hasMeasure() ? Math.abs(ret.xValue) : 0);
tot = (totals.y[ret.yField.join("/")] || 0) + (y._hasMeasure() ? Math.abs(ret.yValue) : 0);
totals.y[ret.yField.join("/")] = tot;
}
if (p !== null) {

2
src/objects/chart/methods/setMargins.js
View File

@ -24,8 +24,6 @@
this._heightPixels = function () {
return dimple._parentHeight(this.svg.node()) - this._yPixels() - dimple._parseYPosition(bottom, this.svg.node());
};
// Refresh the axes to redraw them against the new bounds
this.draw(0, true);
// return the chart object for method chaining
return this;
};