Skip to content

I
incubator-echarts

x649585723 / incubator-echarts
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
I
incubator-echarts

体验新版 GitCode，发现更多精彩内容 >>

提交 b7dafa91 编写于 作者: K kener
浏览文件
操作

坐标轴精确度优化

上级 f14bfb73
隐藏空白更改
内联 并排
Showing with 56 addition and 42 deletion
src/component/categoryAxis.js
浏览文件 @ b7dafa91
......@@ -166,6 +166,8 @@ define(function (require) {
// 轴线
function _buildAxisLine() {
var lineWidth = option.axisLine.lineStyle.width;
var halfLineWidth = lineWidth / 2;
var axShape = {
shape : 'line',
zlevel : _zlevelBase + 1,
......@@ -174,34 +176,34 @@ define(function (require) {
switch (option.position) {
case 'left' :
axShape.style = {
xStart : grid.getX(),
yStart : grid.getYend(),
xEnd : grid.getX(),
yEnd : grid.getY()
xStart : grid.getX() - halfLineWidth,
yStart : grid.getYend() + halfLineWidth,
xEnd : grid.getX() - halfLineWidth,
yEnd : grid.getY() - halfLineWidth
};
break;
case 'right' :
axShape.style = {
xStart : grid.getXend(),
yStart : grid.getYend(),
xEnd : grid.getXend(),
yEnd : grid.getY()
xStart : grid.getXend() + halfLineWidth,
yStart : grid.getYend() + halfLineWidth,
xEnd : grid.getXend() + halfLineWidth,
yEnd : grid.getY() - halfLineWidth
};
break;
case 'bottom' :
axShape.style = {
xStart : grid.getX(),
yStart : grid.getYend(),
xEnd : grid.getXend(),
yEnd : grid.getYend()
xStart : grid.getX() - halfLineWidth,
yStart : grid.getYend() + halfLineWidth,
xEnd : grid.getXend() + halfLineWidth,
yEnd : grid.getYend() + halfLineWidth
};
break;
case 'top' :
axShape.style = {
xStart : grid.getX(),
yStart : grid.getY(),
xEnd : grid.getXend(),
yEnd : grid.getY()
xStart : grid.getX() - halfLineWidth,
yStart : grid.getY() - halfLineWidth,
xEnd : grid.getXend() + halfLineWidth,
yEnd : grid.getY() - halfLineWidth
};
break;
}
......@@ -221,7 +223,6 @@ define(function (require) {
}
axShape.style.strokeColor = option.axisLine.lineStyle.color;
var lineWidth = option.axisLine.lineStyle.width;
axShape.style.lineWidth = lineWidth;
// 亚像素优化
if (option.position == 'left' || option.position == 'right') {
......@@ -259,17 +260,17 @@ define(function (require) {
: typeof onGap == 'undefined'
? (option.boundaryGap ? (getGap() / 2) : 0)
: 0;
var startIndex = optGap > 0 ? -interval : 0;
if (option.position == 'bottom' || option.position == 'top') {
// 横向
var yPosition = option.position == 'bottom'
? (tickOption.inside ? (grid.getYend() - length) : grid.getYend())
: (tickOption.inside ? grid.getY() : (grid.getY() - length));
var x;
for (var i = 0; i < dataLength; i += interval) {
for (var i = startIndex; i < dataLength; i += interval) {
// 亚像素优化
x = self.subPixelOptimize(
getCoordByIndex(i) + optGap, lineWidth
getCoordByIndex(i) + (i >= 0 ? optGap : 0), lineWidth
);
axShape = {
shape : 'line',
......@@ -294,10 +295,10 @@ define(function (require) {
: (tickOption.inside ? (grid.getXend() - length) : grid.getXend());
var y;
for (var i = 0; i < dataLength; i += interval) {
for (var i = startIndex; i < dataLength; i += interval) {
// 亚像素优化
y = self.subPixelOptimize(
getCoordByIndex(i) - optGap, lineWidth
getCoordByIndex(i) - (i >= 0 ? optGap : 0), lineWidth
);
axShape = {
shape : 'line',
......@@ -451,7 +452,7 @@ define(function (require) {
: typeof onGap == 'undefined'
? (option.boundaryGap ? (getGap() / 2) : 0)
: 0;
dataLength -= (onGap || (typeof onGap == 'undefined' && option.boundaryGap)) ? 1 : 0;
if (option.position == 'bottom' || option.position == 'top') {
// 横向
var sy = grid.getY();
......@@ -669,7 +670,6 @@ define(function (require) {
var gap = getGap();
var position = option.boundaryGap ? (gap / 2) : 0;
// Math.floor可能引起一些偏差，但性能会更好
for (var i = 0; i < dataLength; i++) {
if (data[i] == value
|| (typeof data[i].value != 'undefined'
......@@ -685,9 +685,14 @@ define(function (require) {
// 纵向
position = grid.getYend() - position;
}
return position;
// Math.floor可能引起一些偏差，但性能会更好
/* 准确更重要
return (i === 0 || i == dataLength - 1)
? position
: Math.floor(position);
*/
}
position += gap;
}
......@@ -726,9 +731,13 @@ define(function (require) {
// 纵向
position = grid.getYend() - position;
}
return position;
/* 准确更重要
return (dataIndex === 0 || dataIndex == option.data.length - 1)
? position
: Math.floor(position);
*/
}
}
......
src/component/valueAxis.js
浏览文件 @ b7dafa91
......@@ -52,6 +52,8 @@ define(function (require) {
// 轴线
function _buildAxisLine() {
var lineWidth = option.axisLine.lineStyle.width;
var halfLineWidth = lineWidth / 2;
var axShape = {
shape : 'line',
zlevel : _zlevelBase + 1,
......@@ -60,34 +62,34 @@ define(function (require) {
switch (option.position) {
case 'left' :
axShape.style = {
xStart : grid.getX(),
yStart : grid.getYend(),
xEnd : grid.getX(),
yEnd : grid.getY()
xStart : grid.getX() - halfLineWidth,
yStart : grid.getYend() + halfLineWidth,
xEnd : grid.getX() - halfLineWidth,
yEnd : grid.getY() - halfLineWidth
};
break;
case 'right' :
axShape.style = {
xStart : grid.getXend(),
yStart : grid.getYend(),
xEnd : grid.getXend(),
yEnd : grid.getY()
xStart : grid.getXend() + halfLineWidth,
yStart : grid.getYend() + halfLineWidth,
xEnd : grid.getXend() + halfLineWidth,
yEnd : grid.getY() - halfLineWidth
};
break;
case 'bottom' :
axShape.style = {
xStart : grid.getX(),
yStart : grid.getYend(),
xEnd : grid.getXend(),
yEnd : grid.getYend()
xStart : grid.getX() - halfLineWidth,
yStart : grid.getYend() + halfLineWidth,
xEnd : grid.getXend() + halfLineWidth,
yEnd : grid.getYend() + halfLineWidth
};
break;
case 'top' :
axShape.style = {
xStart : grid.getX(),
yStart : grid.getY(),
xEnd : grid.getXend(),
yEnd : grid.getY()
xStart : grid.getX() - halfLineWidth,
yStart : grid.getY() - halfLineWidth,
xEnd : grid.getXend() + halfLineWidth,
yEnd : grid.getY() - halfLineWidth
};
break;
}
......@@ -308,7 +310,7 @@ define(function (require) {
var ey = grid.getYend();
var x;
for (var i = 0; i < dataLength; i++) {
for (var i = 1; i < dataLength - 1; i++) {
// 亚像素优化
x = self.subPixelOptimize(getCoord(data[i]), lineWidth);
axShape = {
......@@ -335,7 +337,7 @@ define(function (require) {
var ex = grid.getXend();
var y;
for (var i = 0; i < dataLength; i++) {
for (var i = 1; i < dataLength - 1; i++) {
// 亚像素优化
y = self.subPixelOptimize(getCoord(data[i]), lineWidth);
axShape = {
......@@ -876,10 +878,13 @@ define(function (require) {
result = (value - _min) / valueRange * total + grid.getX();
}
return result;
// Math.floor可能引起一些偏差，但性能会更好
/* 准确更重要
return (value == _min || value == _max)
? result
: Math.floor(result);
*/
}
function getPosition() {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或