diff --git a/src/coord/Axis.js b/src/coord/Axis.js index 96dae29769f3d8c7322c5e67b1380b00d9ed93ad..1e97b9ed83f169c96224f77670a2785ab9f19ef3 100644 --- a/src/coord/Axis.js +++ b/src/coord/Axis.js @@ -78,8 +78,6 @@ define(function (require) { */ getExtent: function () { var ret = this._extent.slice(); - this.inverse && ret.reverse(); - return ret; }, @@ -109,9 +107,8 @@ define(function (require) { */ setExtent: function (start, end) { var extent = this._extent; - var inverse = this.inverse; - extent[0] = inverse ? end : start; - extent[1] = inverse ? start : end; + extent[0] = start; + extent[1] = end; }, /** @@ -219,11 +216,11 @@ define(function (require) { */ getBandWidth: function () { var axisExtent = this._extent; - var extent = this.scale.getExtent(); + var dataExtent = this.scale.getExtent(); - var len = extent[1] - extent[0] + (this.onBand ? 1 : 0); + var len = dataExtent[1] - dataExtent[0] + (this.onBand ? 1 : 0); - var size = axisExtent[1] - axisExtent[0]; + var size = Math.abs(axisExtent[1] - axisExtent[0]); return Math.abs(size) / len; } diff --git a/src/coord/axisDefault.js b/src/coord/axisDefault.js index 161518c83173ef5bf2a36b9a6d8bace268d220b9..45b7557fde7ada2d7ebf87dd391e37e32ab92605 100644 --- a/src/coord/axisDefault.js +++ b/src/coord/axisDefault.js @@ -103,6 +103,7 @@ define(function (require) { splitNumber: 6 }, defaultOption); + // FIXME var timeAxis = zrUtil.merge({}, valueAxis); var logAxis = zrUtil.merge({}, valueAxis); logAxis.scale = true; diff --git a/src/coord/polar/polarCreator.js b/src/coord/polar/polarCreator.js index 20b90f1a2cb6cedd1a78da52651abcba8bf34dfa..dd79a1fa0adbf3512cacdcf8704fd345d2234dc9 100644 --- a/src/coord/polar/polarCreator.js +++ b/src/coord/polar/polarCreator.js @@ -28,6 +28,7 @@ define(function (require) { var radiusAxis = this.getRadiusAxis(); var size = Math.min(width, height) / 2; + // var idx = radiusAxis.inverse ? 1 : 0; radiusAxis.setExtent( parsePercent(radius[0], size), parsePercent(radius[1], size) @@ -44,12 +45,12 @@ define(function (require) { axis.type = axisModel.get('type'); axis.scale = axisHelper.createScaleByModel(axisModel); axis.onBand = axisModel.get('boundaryGap') && axis.type === 'category'; - axis.inverse = axisModel.get('inverse'); + // FIXME Radius axis not support inverse axis if (axisModel.type === 'angleAxis') { var startAngle = axisModel.get('startAngle'); - axis.setExtent(startAngle, startAngle + 360); - axis.inverse = axisModel.get('clockwise'); + axis.inverse = axisModel.get('inverse') ^ axisModel.get('clockwise'); + axis.setExtent(startAngle, startAngle + (axis.inverse ? -360 : 360)); } // Inject axis instance