playground
/
c3
mirror of https://github.com/masayuki0812/c3.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fix bar width on subchart when brush - #497

pull/542/head
Masayuki Tanaka 11 years ago
parent
bab6c75f16
commit
8f35e4acc2
4 changed files with 10 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      c3.js
  2. 4
      c3.min.js
  3. 3
      src/axis.js
  4. 3
      src/shape.bar.js

6
c3.js
Unescape View File

@ -2885,8 +2885,9 @@
}; };
c3_chart_internal_fn.generateGetBarPoints = function (barIndices, isSub) { c3_chart_internal_fn.generateGetBarPoints = function (barIndices, isSub) {
var $$ = this, var $$ = this,
axis = isSub ? $$.subXAxis : $$.xAxis,
barTargetsNum = barIndices.__max__ + 1, barTargetsNum = barIndices.__max__ + 1,
barW = $$.getBarW($$.xAxis, barTargetsNum), barW = $$.getBarW(axis, barTargetsNum),
barX = $$.getShapeX(barW, barTargetsNum, barIndices, !!isSub), barX = $$.getShapeX(barW, barTargetsNum, barIndices, !!isSub),
barY = $$.getShapeY(!!isSub), barY = $$.getShapeY(!!isSub),
barOffset = $$.getShapeOffset($$.isBarType, barIndices, !!isSub), barOffset = $$.getShapeOffset($$.isBarType, barIndices, !!isSub),
@ -3758,7 +3759,8 @@
} else { } else {
// TODO: move this to c3_axis // TODO: move this to c3_axis
axis.tickOffset = function () { axis.tickOffset = function () {
var edgeX = $$.getEdgeX($$.data.targets), diff = $$.x(edgeX[1]) - $$.x(edgeX[0]), var scale = this.scale(),
edgeX = $$.getEdgeX($$.data.targets), diff = scale(edgeX[1]) - scale(edgeX[0]),
base = diff ? diff : (config.axis_rotated ? $$.height : $$.width); base = diff ? diff : (config.axis_rotated ? $$.height : $$.width);
return (base / $$.getMaxDataCount()) / 2; return (base / $$.getMaxDataCount()) / 2;
}; };

4
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
src/axis.js
Unescape View File

@ -48,7 +48,8 @@ c3_chart_internal_fn.getXAxis = function (scale, orient, tickFormat, tickValues)
} else { } else {
// TODO: move this to c3_axis // TODO: move this to c3_axis
axis.tickOffset = function () { axis.tickOffset = function () {
var edgeX = $$.getEdgeX($$.data.targets), diff = $$.x(edgeX[1]) - $$.x(edgeX[0]), var scale = this.scale(),
edgeX = $$.getEdgeX($$.data.targets), diff = scale(edgeX[1]) - scale(edgeX[0]),
base = diff ? diff : (config.axis_rotated ? $$.height : $$.width); base = diff ? diff : (config.axis_rotated ? $$.height : $$.width);
return (base / $$.getMaxDataCount()) / 2; return (base / $$.getMaxDataCount()) / 2;
}; };

3
src/shape.bar.js
Unescape View File

@ -86,8 +86,9 @@ c3_chart_internal_fn.generateDrawBar = function (barIndices, isSub) {
}; };
c3_chart_internal_fn.generateGetBarPoints = function (barIndices, isSub) { c3_chart_internal_fn.generateGetBarPoints = function (barIndices, isSub) {
var $$ = this, var $$ = this,
axis = isSub ? $$.subXAxis : $$.xAxis,
barTargetsNum = barIndices.__max__ + 1, barTargetsNum = barIndices.__max__ + 1,
barW = $$.getBarW($$.xAxis, barTargetsNum), barW = $$.getBarW(axis, barTargetsNum),
barX = $$.getShapeX(barW, barTargetsNum, barIndices, !!isSub), barX = $$.getShapeX(barW, barTargetsNum, barIndices, !!isSub),
barY = $$.getShapeY(!!isSub), barY = $$.getShapeY(!!isSub),
barOffset = $$.getShapeOffset($$.isBarType, barIndices, !!isSub), barOffset = $$.getShapeOffset($$.isBarType, barIndices, !!isSub),

Write Preview
Loading…
Cancel
Save