提交 078782c2 编写于 作者: P pah100

Merge branch 'master' of https://github.com/pissang/echarts-next

...@@ -78,8 +78,6 @@ define(function (require) { ...@@ -78,8 +78,6 @@ define(function (require) {
*/ */
getExtent: function () { getExtent: function () {
var ret = this._extent.slice(); var ret = this._extent.slice();
this.inverse && ret.reverse();
return ret; return ret;
}, },
...@@ -109,9 +107,8 @@ define(function (require) { ...@@ -109,9 +107,8 @@ define(function (require) {
*/ */
setExtent: function (start, end) { setExtent: function (start, end) {
var extent = this._extent; var extent = this._extent;
var inverse = this.inverse; extent[0] = start;
extent[0] = inverse ? end : start; extent[1] = end;
extent[1] = inverse ? start : end;
}, },
/** /**
...@@ -219,11 +216,11 @@ define(function (require) { ...@@ -219,11 +216,11 @@ define(function (require) {
*/ */
getBandWidth: function () { getBandWidth: function () {
var axisExtent = this._extent; 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; return Math.abs(size) / len;
} }
......
...@@ -103,6 +103,7 @@ define(function (require) { ...@@ -103,6 +103,7 @@ define(function (require) {
splitNumber: 6 splitNumber: 6
}, defaultOption); }, defaultOption);
// FIXME
var timeAxis = zrUtil.merge({}, valueAxis); var timeAxis = zrUtil.merge({}, valueAxis);
var logAxis = zrUtil.merge({}, valueAxis); var logAxis = zrUtil.merge({}, valueAxis);
logAxis.scale = true; logAxis.scale = true;
......
...@@ -28,6 +28,7 @@ define(function (require) { ...@@ -28,6 +28,7 @@ define(function (require) {
var radiusAxis = this.getRadiusAxis(); var radiusAxis = this.getRadiusAxis();
var size = Math.min(width, height) / 2; var size = Math.min(width, height) / 2;
// var idx = radiusAxis.inverse ? 1 : 0;
radiusAxis.setExtent( radiusAxis.setExtent(
parsePercent(radius[0], size), parsePercent(radius[0], size),
parsePercent(radius[1], size) parsePercent(radius[1], size)
...@@ -44,12 +45,12 @@ define(function (require) { ...@@ -44,12 +45,12 @@ define(function (require) {
axis.type = axisModel.get('type'); axis.type = axisModel.get('type');
axis.scale = axisHelper.createScaleByModel(axisModel); axis.scale = axisHelper.createScaleByModel(axisModel);
axis.onBand = axisModel.get('boundaryGap') && axis.type === 'category'; axis.onBand = axisModel.get('boundaryGap') && axis.type === 'category';
axis.inverse = axisModel.get('inverse');
// FIXME Radius axis not support inverse axis
if (axisModel.type === 'angleAxis') { if (axisModel.type === 'angleAxis') {
var startAngle = axisModel.get('startAngle'); var startAngle = axisModel.get('startAngle');
axis.setExtent(startAngle, startAngle + 360); axis.inverse = axisModel.get('inverse') ^ axisModel.get('clockwise');
axis.inverse = axisModel.get('clockwise'); axis.setExtent(startAngle, startAngle + (axis.inverse ? -360 : 360));
} }
// Inject axis instance // Inject axis instance
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册