echarts 4.0.1 → 4.1.0

package/lib/coord/parallel/AxisModel.js

@@ -10,6 +10,24 @@ var numberUtil = require("../../util/number");
 
 var axisModelCommonMixin = require("../axisModelCommonMixin");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var AxisModel = ComponentModel.extend({
   type: 'baseParallelAxis',
 
@@ -66,14 +84,23 @@ var AxisModel = ComponentModel.extend({
       return 'normal';
     }
 
-    if (value == null) {
+    if (value == null || isNaN(value)) {
       return 'inactive';
-    }
+    } // Simple optimization
+
 
-    for (var i = 0, len = activeIntervals.length; i < len; i++) {
-      if (activeIntervals[i][0] <= value && value <= activeIntervals[i][1]) {
+    if (activeIntervals.length === 1) {
+      var interval = activeIntervals[0];
+
+      if (interval[0] <= value && value <= interval[1]) {
         return 'active';
       }
+    } else {
+      for (var i = 0, len = activeIntervals.length; i < len; i++) {
+        if (activeIntervals[i][0] <= value && value <= activeIntervals[i][1]) {
+          return 'active';
+        }
+      }
     }
 
     return 'inactive';

package/lib/coord/parallel/Parallel.js

@@ -14,6 +14,25 @@ var numberUtil = require("../../util/number");
 
 var sliderMove = require("../../component/helper/sliderMove");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * Parallel Coordinates
  * <https://en.wikipedia.org/wiki/Parallel_coordinates>
@@ -261,8 +280,7 @@ Parallel.prototype = {
         axisLabelShow: posInfo.axisLabelShow,
         nameTruncateMaxWidth: posInfo.nameTruncateMaxWidth,
         tickDirection: 1,
-        labelDirection: 1,
-        labelInterval: axes.get(dim).getLabelInterval()
+        labelDirection: 1
       };
     }, this);
   },
@@ -291,28 +309,33 @@ Parallel.prototype = {
    * @param {module:echarts/data/List} data
    * @param {Functio} cb param: {string} activeState 'active' or 'inactive' or 'normal'
    *                            {number} dataIndex
-   * @param {Object} context
+   * @param {number} [start=0] the start dataIndex that travel from.
+   * @param {number} [end=data.count()] the next dataIndex of the last dataIndex will be travel.
    */
-  eachActiveState: function (data, callback, context) {
+  eachActiveState: function (data, callback, start, end) {
+    start == null && (start = 0);
+    end == null && (end = data.count());
+    var axesMap = this._axesMap;
     var dimensions = this.dimensions;
-    var dataDimensions = zrUtil.map(dimensions, function (axisDim) {
-      return data.mapDimension(axisDim);
+    var dataDimensions = [];
+    var axisModels = [];
+    zrUtil.each(dimensions, function (axisDim) {
+      dataDimensions.push(data.mapDimension(axisDim));
+      axisModels.push(axesMap.get(axisDim).model);
     });
-    var axesMap = this._axesMap;
     var hasActiveSet = this.hasAxisBrushed();
 
-    for (var i = 0, len = data.count(); i < len; i++) {
-      var values = data.getValues(dataDimensions, i);
+    for (var dataIndex = start; dataIndex < end; dataIndex++) {
       var activeState;
 
       if (!hasActiveSet) {
         activeState = 'normal';
       } else {
         activeState = 'active';
+        var values = data.getValues(dataDimensions, dataIndex);
 
         for (var j = 0, lenj = dimensions.length; j < lenj; j++) {
-          var dimName = dimensions[j];
-          var state = axesMap.get(dimName).model.getActiveState(values[j], j);
+          var state = axisModels[j].getActiveState(values[j]);
 
           if (state === 'inactive') {
             activeState = 'inactive';
@@ -321,7 +344,7 @@ Parallel.prototype = {
         }
       }
 
-      callback.call(context, activeState, i);
+      callback(activeState, dataIndex);
     }
   },
 

package/lib/coord/parallel/ParallelAxis.js

@@ -2,6 +2,25 @@ var zrUtil = require("zrender/lib/core/util");
 
 var Axis = require("../Axis");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * @constructor module:echarts/coord/parallel/ParallelAxis
  * @extends {module:echarts/coord/Axis}

package/lib/coord/parallel/ParallelModel.js

@@ -4,6 +4,24 @@ var Component = require("../../model/Component");
 
 require("./AxisModel");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var _default = Component.extend({
   type: 'parallel',
   dependencies: ['parallelAxis'],

package/lib/coord/parallel/parallelCreator.js

@@ -2,6 +2,25 @@ var Parallel = require("./Parallel");
 
 var CoordinateSystem = require("../../CoordinateSystem");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * Parallel coordinate system creater.
  */

package/lib/coord/parallel/parallelPreprocessor.js

@@ -2,6 +2,24 @@ var zrUtil = require("zrender/lib/core/util");
 
 var modelUtil = require("../../util/model");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 function _default(option) {
   createParallelIfNeeded(option);
   mergeAxisOptionFromParallel(option);

package/lib/coord/polar/AngleAxis.js

@@ -2,6 +2,24 @@ var zrUtil = require("zrender/lib/core/util");
 
 var Axis = require("../Axis");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 function AngleAxis(scale, angleExtent) {
   angleExtent = angleExtent || [0, 360];
   Axis.call(this, 'angle', scale, angleExtent);

package/lib/coord/polar/AxisModel.js

@@ -6,6 +6,24 @@ var axisModelCreator = require("../axisModelCreator");
 
 var axisModelCommonMixin = require("../axisModelCommonMixin");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var PolarAxisModel = ComponentModel.extend({
   type: 'polarAxis',
 

package/lib/coord/polar/Polar.js

@@ -2,6 +2,25 @@ var RadiusAxis = require("./RadiusAxis");
 
 var AngleAxis = require("./AngleAxis");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * @module echarts/coord/polar/Polar
  */

package/lib/coord/polar/PolarModel.js

@@ -2,6 +2,24 @@ var echarts = require("../../echarts");
 
 require("./AxisModel");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var _default = echarts.extendComponentModel({
   type: 'polar',
   dependencies: ['polarAxis', 'angleAxis'],

package/lib/coord/polar/RadiusAxis.js

@@ -2,6 +2,24 @@ var zrUtil = require("zrender/lib/core/util");
 
 var Axis = require("../Axis");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 function RadiusAxis(scale, radiusExtent) {
   Axis.call(this, 'radius', scale, radiusExtent);
   /**

package/lib/coord/polar/polarCreator.js

@@ -17,10 +17,31 @@ var niceScaleExtent = _axisHelper.niceScaleExtent;
 
 var CoordinateSystem = require("../../CoordinateSystem");
 
+var _dataStackHelper = require("../../data/helper/dataStackHelper");
+
+var getStackedDimension = _dataStackHelper.getStackedDimension;
+
 require("./PolarModel");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 // TODO Axis scale
-// 依赖 PolarModel 做预处理
 
 /**
  * Resize method bound to the polar
@@ -54,10 +75,10 @@ function updatePolarScale(ecModel, api) {
     if (seriesModel.coordinateSystem === polar) {
       var data = seriesModel.getData();
       zrUtil.each(data.mapDimension('radius', true), function (dim) {
-        radiusAxis.scale.unionExtentFromData(data, dim);
+        radiusAxis.scale.unionExtentFromData(data, getStackedDimension(data, dim));
       });
       zrUtil.each(data.mapDimension('angle', true), function (dim) {
-        angleAxis.scale.unionExtentFromData(data, dim);
+        angleAxis.scale.unionExtentFromData(data, getStackedDimension(data, dim));
       });
     }
   });

package/lib/coord/polar/prepareCustom.js

@@ -1,5 +1,23 @@
 var zrUtil = require("zrender/lib/core/util");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 function dataToCoordSize(dataSize, dataItem) {
   // dataItem is necessary in log axis.
   return zrUtil.map(['Radius', 'Angle'], function (dim, dimIdx) {

package/lib/coord/radar/IndicatorAxis.js

@@ -2,6 +2,24 @@ var zrUtil = require("zrender/lib/core/util");
 
 var Axis = require("../Axis");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 function IndicatorAxis(dim, scale, radiusExtent) {
   Axis.call(this, dim, scale, radiusExtent);
   /**

package/lib/coord/radar/Radar.js

@@ -13,6 +13,24 @@ var niceScaleExtent = _axisHelper.niceScaleExtent;
 
 var CoordinateSystem = require("../../CoordinateSystem");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 // TODO clockwise
 function Radar(radarModel, ecModel, api) {
   this._model = radarModel;

package/lib/coord/radar/RadarModel.js

@@ -8,6 +8,24 @@ var Model = require("../../model/Model");
 
 var axisModelCommonMixin = require("../axisModelCommonMixin");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var valueAxisDefault = axisDefault.valueAxis;
 
 function defaultsShow(opt, show) {

package/lib/coord/single/AxisModel.js

@@ -6,6 +6,24 @@ var axisModelCreator = require("../axisModelCreator");
 
 var axisModelCommonMixin = require("../axisModelCommonMixin");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var AxisModel = ComponentModel.extend({
   type: 'singleAxis',
   layoutMode: 'box',

package/lib/coord/single/Single.js

@@ -10,6 +10,25 @@ var _util = require("zrender/lib/core/util");
 
 var each = _util.each;
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * Single coordinates system.
  */

package/lib/coord/single/SingleAxis.js

@@ -2,6 +2,25 @@ var zrUtil = require("zrender/lib/core/util");
 
 var Axis = require("../Axis");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * @constructor  module:echarts/coord/single/SingleAxis
  * @extends {module:echarts/coord/Axis}
@@ -41,11 +60,6 @@ var SingleAxis = function (dim, scale, coordExtent, axisType, position) {
    */
 
   this.orient = null;
-  /**
-   * @type {number}
-   */
-
-  this._labelInterval = null;
 };
 
 SingleAxis.prototype = {

package/lib/coord/single/prepareCustom.js

@@ -1,5 +1,23 @@
 var zrUtil = require("zrender/lib/core/util");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 function dataToCoordSize(dataSize, dataItem) {
   // dataItem is necessary in log axis.
   var axis = this.getAxis();