提交 63696588 编写于 作者: P pah100

tweak

上级 078782c2
......@@ -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
......@@ -87,9 +87,6 @@ define(function (require) {
var opt = this.opt;
var extent = this.axisModel.axis.getExtent();
// FIXME
// 改过后,extent须在inverse时反向。
opt.offset = 0;
// FIXME
......
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册