亚像素优化

Author: kener

src/component/base.js

@@ -889,7 +889,11 @@ define(function(require) {
         // 亚像素优化
         function subPixelOptimize(position, lineWidth) {
             if (lineWidth % 2 == 1) {
-                position += position == Math.ceil(position) ? 0.5 : 0;
+                //position += position == Math.ceil(position) ? 0.5 : 0;
+                position = Math.floor(position) + 0.5;
+            }
+            else {
+                position = Math.round(position);
             }
             return position;
         }

src/component/categoryAxis.js

@@ -625,15 +625,15 @@ define(function (require) {
 
         // 根据类目轴数据索引换算位置
         function getCoordByIndex(dataIndex) {
-            if (dataIndex < 0) {
+            if (dataIndex <= 0) {
                 if (option.position == 'bottom' || option.position == 'top') {
                     return grid.getX();
                 }
                 else {
                     return grid.getYend();
                 }
             }
-            else if (dataIndex >= option.data.length) {
+            else if (dataIndex >= option.data.length - 1) {
                 if (option.position == 'bottom' || option.position == 'top') {
                     return grid.getXend();
                 }
@@ -644,7 +644,6 @@ define(function (require) {
             else {
                 var gap = getGap();
                 var position = option.boundaryGap ? gap : 0;
-    
                 position += dataIndex * gap;
 
                 if (option.position == 'bottom'
@@ -657,12 +656,7 @@ define(function (require) {
                     // 纵向
                     position = grid.getYend() - position;
                 }
-                
-                return (dataIndex === 0 || dataIndex == option.data.length - 1)
-                       ? position
-                       : Math.floor(position);
-                
-               // return getCoord(option.data[dataIndex]);
+                return Math.floor(position);
             }
         }
 

src/component/tooltip.js

@@ -66,6 +66,7 @@ define(function (require) {
         var _zrWidth = zr.getWidth();
 
         var _lastTipShape = false;
+        var _axisLineWidth = 0;
         var _axisLineShape = {
             shape : 'line',
             id : zr.newShapeId('tooltip'),
@@ -513,7 +514,10 @@ define(function (require) {
                     }
                 );
                 y = zrEvent.getY(_event) + 10;
-                x = categoryAxis.getCoordByIndex(dataIndex);
+                x = self.subPixelOptimize(
+                    categoryAxis.getCoordByIndex(dataIndex),
+                    _axisLineWidth
+                );
                 _styleAxisPointer(
                     seriesArray,
                     x, grid.getY(), 
@@ -567,7 +571,10 @@ define(function (require) {
                     }
                 );
                 x = zrEvent.getX(_event) + 10;
-                y = categoryAxis.getCoordByIndex(dataIndex);
+                y = self.subPixelOptimize(
+                    categoryAxis.getCoordByIndex(dataIndex),
+                    _axisLineWidth
+                );
                 _styleAxisPointer(
                     seriesArray,
                     grid.getX(), y, 
@@ -1303,6 +1310,8 @@ define(function (require) {
             _tDom.style.position = 'absolute';  // 不是多余的，别删！
             self.hasAppend = false;
             _setSelectedMap();
+            
+            _axisLineWidth = option.tooltip.axisPointer.lineStyle.width;
         }
 
         /**
@@ -1325,6 +1334,7 @@ define(function (require) {
                     option.tooltip.padding
                 );
                 _setSelectedMap();
+                _axisLineWidth = option.tooltip.axisPointer.lineStyle.width;
             }
         }