diff --git a/build/config.js b/build/config.js index 273ebcab40a56c29a6d66596a70a6620e86ee351..96239bb430b3e2a2bbf05e916188783380e36ba0 100644 --- a/build/config.js +++ b/build/config.js @@ -28,9 +28,11 @@ 'echarts/chart/graph', 'echarts/chart/gauge', 'echarts/chart/funnel', + 'echarts/chart/parallel', 'echarts/component/geo', 'echarts/component/polar', + 'echarts/component/parallel', 'echarts/component/title', @@ -39,7 +41,9 @@ 'echarts/component/dataRange', 'echarts/component/markPoint', - 'echarts/component/markLine' + 'echarts/component/markLine', + + 'echarts/parser/gexf' ], out: '../dist/echarts.js' } \ No newline at end of file diff --git a/src/component/axis/AxisBuilder.js b/src/component/axis/AxisBuilder.js index ab71a739dde20feda39e290ab7d573172c1f502d..1d6d970aa2c519ade469d400704bb26230a03280 100644 --- a/src/component/axis/AxisBuilder.js +++ b/src/component/axis/AxisBuilder.js @@ -87,9 +87,6 @@ define(function (require) { var opt = this.opt; var extent = this.axisModel.axis.getExtent(); - // FIXME - // 改过后,extent须在inverse时反向。 - opt.offset = 0; // FIXME diff --git a/src/coord/parallel/Parallel.js b/src/coord/parallel/Parallel.js index bf05f8ab58b446fc3ea19c10b23ec7d1cb29c19a..38904b267bf646e73580ae2a716b1a5f70926f0e 100644 --- a/src/coord/parallel/Parallel.js +++ b/src/coord/parallel/Parallel.js @@ -160,32 +160,29 @@ define(function(require) { }); each(dimensions, function (dim, idx) { - var axis = axes[dim.name]; var pos = layoutLength * idx / (dimensions.length - 1); - var inverse = axis.inverse ? 'inverse' : 'forward'; - inverse = 'forward'; var positionTable = { horizontal: { - x: {forward: pos, inverse: pos}, - y: {forward: axisLength, inverse: 0} + x: pos, + y: axisLength }, vertical: { - x: {forward: 0, inverse: axisLength}, - y: {forward: pos, inverse: pos} + x: 0, + y: pos } }; var rotationTable = { - horizontal: {forward: PI / 2, inverse: PI * 1.5}, - vertical: {forward: 0, inverse: PI} + horizontal: PI / 2, + vertical: 0 }; var position = [ - positionTable[layout]['x'][inverse] + rect.x, - positionTable[layout]['y'][inverse] + rect.y + positionTable[layout].x + rect.x, + positionTable[layout].y + rect.y ]; - var rotation = rotationTable[layout][inverse]; + var rotation = rotationTable[layout]; var transform = matrix.create(); matrix.rotate(transform, transform, rotation); matrix.translate(transform, transform, position);