echarts 3.5.4 → 3.6.0

package/src/util/graphic.js

@@ -5,7 +5,6 @@ define(function(require) {
     var zrUtil = require('zrender/core/util');
 
     var pathTool = require('zrender/tool/path');
-    var round = Math.round;
     var Path = require('zrender/graphic/Path');
     var colorTool = require('zrender/tool/color');
     var matrix = require('zrender/core/matrix');
@@ -13,6 +12,10 @@ define(function(require) {
     var Transformable = require('zrender/mixin/Transformable');
     var BoundingRect = require('zrender/core/BoundingRect');
 
+    var round = Math.round;
+    var mathMax = Math.max;
+    var mathMin = Math.min;
+
     var graphic = {};
 
     graphic.Group = require('zrender/container/Group');
@@ -407,6 +410,17 @@ define(function(require) {
         });
     };
 
+    graphic.getFont = function (opt, ecModel) {
+        var gTextStyleModel = ecModel && ecModel.getModel('textStyle');
+        return [
+            // FIXME in node-canvas fontWeight is before fontStyle
+            opt.fontStyle || gTextStyleModel && gTextStyleModel.getShallow('fontStyle') || '',
+            opt.fontWeight || gTextStyleModel && gTextStyleModel.getShallow('fontWeight') || '',
+            (opt.fontSize || gTextStyleModel && gTextStyleModel.getShallow('fontSize') || 12) + 'px',
+            opt.fontFamily || gTextStyleModel && gTextStyleModel.getShallow('fontFamily') || 'sans-serif'
+        ].join(' ');
+    };
+
     function animateOrSetProps(isUpdate, el, props, animatableModel, dataIndex, cb) {
         if (typeof dataIndex === 'function') {
             cb = dataIndex;
@@ -588,5 +602,43 @@ define(function(require) {
         });
     };
 
+    /**
+     * @param {Array.<Array.<number>>} points Like: [[23, 44], [53, 66], ...]
+     * @param {Object} rect {x, y, width, height}
+     * @return {Array.<Array.<number>>} A new clipped points.
+     */
+    graphic.clipPointsByRect = function (points, rect) {
+        return zrUtil.map(points, function (point) {
+            var x = point[0];
+            x = mathMax(x, rect.x);
+            x = mathMin(x, rect.x + rect.width);
+            var y = point[1];
+            y = mathMax(y, rect.y);
+            y = mathMin(y, rect.y + rect.height);
+            return [x, y];
+        });
+    };
+
+    /**
+     * @param {Object} targetRect {x, y, width, height}
+     * @param {Object} rect {x, y, width, height}
+     * @return {Object} A new clipped rect. If rect size are negative, return undefined.
+     */
+    graphic.clipRectByRect = function (targetRect, rect) {
+        var x = mathMax(targetRect.x, rect.x);
+        var x2 = mathMin(targetRect.x + targetRect.width, rect.x + rect.width);
+        var y = mathMax(targetRect.y, rect.y);
+        var y2 = mathMin(targetRect.y + targetRect.height, rect.y + rect.height);
+
+        if (x2 >= x && y2 >= y) {
+            return {
+                x: x,
+                y: y,
+                width: x2 - x,
+                height: y2 - y
+            };
+        }
+    };
+
     return graphic;
 });

package/src/util/model.js

@@ -145,6 +145,7 @@ define(function(require) {
             var rawDataIndex = data.getRawIndex(dataIndex);
             var name = data.getName(dataIndex, true);
             var itemOpt = data.getRawDataItem(dataIndex);
+            var color = data.getItemVisual(dataIndex, 'color');
 
             return {
                 componentType: this.mainType,
@@ -158,7 +159,8 @@ define(function(require) {
                 data: itemOpt,
                 dataType: dataType,
                 value: rawValue,
-                color: data.getItemVisual(dataIndex, 'color'),
+                color: color,
+                marker: formatUtil.getTooltipMarker(color),
 
                 // Param name list for mapping `a`, `b`, `c`, `d`, `e`
                 $vars: ['seriesName', 'name', 'value']
@@ -333,22 +335,22 @@ define(function(require) {
         // to specify multi components (like series) by one name.
 
         // Ensure that each id is distinct.
-        var idMap = {};
+        var idMap = zrUtil.createHashMap();
 
         each(mapResult, function (item, index) {
             var existCpt = item.exist;
-            existCpt && (idMap[existCpt.id] = item);
+            existCpt && idMap.set(existCpt.id, item);
         });
 
         each(mapResult, function (item, index) {
             var opt = item.option;
 
             zrUtil.assert(
-                !opt || opt.id == null || !idMap[opt.id] || idMap[opt.id] === item,
+                !opt || opt.id == null || !idMap.get(opt.id) || idMap.get(opt.id) === item,
                 'id duplicates: ' + (opt && opt.id)
             );
 
-            opt && opt.id != null && (idMap[opt.id] = item);
+            opt && opt.id != null && idMap.set(opt.id, item);
             !item.keyInfo && (item.keyInfo = {});
         });
 
@@ -388,10 +390,10 @@ define(function(require) {
                 do {
                     keyInfo.id = '\0' + keyInfo.name + '\0' + idNum++;
                 }
-                while (idMap[keyInfo.id]);
+                while (idMap.get(keyInfo.id));
             }
 
-            idMap[keyInfo.id] = item;
+            idMap.set(keyInfo.id, item);
         });
     };
 
@@ -597,6 +599,60 @@ define(function(require) {
         return result;
     };
 
+    /**
+     * @see {module:echarts/data/helper/completeDimensions}
+     * @param {module:echarts/data/List} data
+     * @param {string|number} dataDim
+     * @return {string}
+     */
+    modelUtil.dataDimToCoordDim = function (data, dataDim) {
+        var dimensions = data.dimensions;
+        dataDim = data.getDimension(dataDim);
+        for (var i = 0; i < dimensions.length; i++) {
+            var dimItem = data.getDimensionInfo(dimensions[i]);
+            if (dimItem.name === dataDim) {
+                return dimItem.coordDim;
+            }
+        }
+    };
+
+    /**
+     * @see {module:echarts/data/helper/completeDimensions}
+     * @param {module:echarts/data/List} data
+     * @param {string} coordDim
+     * @return {Array.<string>} data dimensions on the coordDim.
+     */
+    modelUtil.coordDimToDataDim = function (data, coordDim) {
+        var dataDim = [];
+        each(data.dimensions, function (dimName) {
+            var dimItem = data.getDimensionInfo(dimName);
+            if (dimItem.coordDim === coordDim) {
+                dataDim[dimItem.coordDimIndex] = dimItem.name;
+            }
+        });
+        return dataDim;
+    };
+
+    /**
+     * @see {module:echarts/data/helper/completeDimensions}
+     * @param {module:echarts/data/List} data
+     * @param {string} otherDim Can be `otherDims`
+     *                        like 'label' or 'tooltip'.
+     * @return {Array.<string>} data dimensions on the otherDim.
+     */
+    modelUtil.otherDimToDataDim = function (data, otherDim) {
+        var dataDim = [];
+        each(data.dimensions, function (dimName) {
+            var dimItem = data.getDimensionInfo(dimName);
+            var otherDims = dimItem.otherDims;
+            var dimIndex = otherDims[otherDim];
+            if (dimIndex != null && dimIndex !== false) {
+                dataDim[dimIndex] = dimItem.name;
+            }
+        });
+        return dataDim;
+    };
+
     function has(obj, prop) {
         return obj && obj.hasOwnProperty(prop);
     }

package/src/coord/cartesian/axisLabelInterval.js

@@ -1,26 +0,0 @@
-/**
- * Helper function for axisLabelInterval calculation
- */
-
-define(function(require) {
-    'use strict';
-
-    var zrUtil = require('zrender/core/util');
-    var axisHelper = require('../axisHelper');
-
-    return function (axis) {
-        var axisModel = axis.model;
-        var labelModel = axisModel.getModel('axisLabel');
-        var labelInterval = labelModel.get('interval');
-        if (!(axis.type === 'category' && labelInterval === 'auto')) {
-            return labelInterval === 'auto' ? 0 : labelInterval;
-        }
-
-        return axisHelper.getAxisLabelInterval(
-            zrUtil.map(axis.scale.getTicks(), axis.dataToCoord, axis),
-            axisModel.getFormattedLabels(),
-            labelModel.getModel('textStyle').getFont(),
-            axis.isHorizontal()
-        );
-    };
-});