echarts 4.0.1 → 4.1.0

package/lib/processor/dataSample.js

@@ -1,3 +1,21 @@
+/*
+* 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 samplers = {
   average: function (frame) {
     var sum = 0;
@@ -28,18 +46,20 @@ var samplers = {
 
     for (var i = 0; i < frame.length; i++) {
       frame[i] > max && (max = frame[i]);
-    }
+    } // NaN will cause illegal axis extent.
+
 
-    return max;
+    return isFinite(max) ? max : NaN;
   },
   min: function (frame) {
     var min = Infinity;
 
     for (var i = 0; i < frame.length; i++) {
       frame[i] < min && (min = frame[i]);
-    }
+    } // NaN will cause illegal axis extent.
+
 
-    return min;
+    return isFinite(min) ? min : NaN;
   },
   // TODO
   // Median
@@ -55,6 +75,7 @@ var indexSampler = function (frame, value) {
 function _default(seriesType) {
   return {
     seriesType: seriesType,
+    modifyOutputEnd: true,
     reset: function (seriesModel, ecModel, api) {
       var data = seriesModel.getData();
       var sampling = seriesModel.get('sampling');
@@ -78,7 +99,8 @@ function _default(seriesType) {
           }
 
           if (sampler) {
-            seriesModel.setData(data.downSample(valueAxis.dim, 1 / rate, sampler, indexSampler));
+            // Only support sample the first dim mapped from value axis.
+            seriesModel.setData(data.downSample(data.mapDimension(valueAxis.dim), 1 / rate, sampler, indexSampler));
           }
         }
       }

package/lib/processor/dataStack.js

@@ -0,0 +1,118 @@
+var _util = require("zrender/lib/core/util");
+
+var createHashMap = _util.createHashMap;
+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.
+*/
+// (1) [Caution]: the logic is correct based on the premises:
+//     data processing stage is blocked in stream.
+//     See <module:echarts/stream/Scheduler#performDataProcessorTasks>
+// (2) Only register once when import repeatly.
+//     Should be executed before after series filtered and before stack calculation.
+function _default(ecModel) {
+  var stackInfoMap = createHashMap();
+  ecModel.eachSeries(function (seriesModel) {
+    var stack = seriesModel.get('stack'); // Compatibal: when `stack` is set as '', do not stack.
+
+    if (stack) {
+      var stackInfoList = stackInfoMap.get(stack) || stackInfoMap.set(stack, []);
+      var data = seriesModel.getData();
+      var stackInfo = {
+        // Used for calculate axis extent automatically.
+        stackResultDimension: data.getCalculationInfo('stackResultDimension'),
+        stackedOverDimension: data.getCalculationInfo('stackedOverDimension'),
+        stackedDimension: data.getCalculationInfo('stackedDimension'),
+        stackedByDimension: data.getCalculationInfo('stackedByDimension'),
+        isStackedByIndex: data.getCalculationInfo('isStackedByIndex'),
+        data: data,
+        seriesModel: seriesModel
+      }; // If stacked on axis that do not support data stack.
+
+      if (!stackInfo.stackedDimension || !(stackInfo.isStackedByIndex || stackInfo.stackedByDimension)) {
+        return;
+      }
+
+      stackInfoList.length && data.setCalculationInfo('stackedOnSeries', stackInfoList[stackInfoList.length - 1].seriesModel);
+      stackInfoList.push(stackInfo);
+    }
+  });
+  stackInfoMap.each(calculateStack);
+}
+
+function calculateStack(stackInfoList) {
+  each(stackInfoList, function (targetStackInfo, idxInStack) {
+    var resultVal = [];
+    var resultNaN = [NaN, NaN];
+    var dims = [targetStackInfo.stackResultDimension, targetStackInfo.stackedOverDimension];
+    var targetData = targetStackInfo.data;
+    var isStackedByIndex = targetStackInfo.isStackedByIndex; // Should not write on raw data, because stack series model list changes
+    // depending on legend selection.
+
+    var newData = targetData.map(dims, function (v0, v1, dataIndex) {
+      var sum = targetData.get(targetStackInfo.stackedDimension, dataIndex); // Consider `connectNulls` of line area, if value is NaN, stackedOver
+      // should also be NaN, to draw a appropriate belt area.
+
+      if (isNaN(sum)) {
+        return resultNaN;
+      }
+
+      var byValue;
+      var stackedDataRawIndex;
+
+      if (isStackedByIndex) {
+        stackedDataRawIndex = targetData.getRawIndex(dataIndex);
+      } else {
+        byValue = targetData.get(targetStackInfo.stackedByDimension, dataIndex);
+      } // If stackOver is NaN, chart view will render point on value start.
+
+
+      var stackedOver = NaN;
+
+      for (var j = idxInStack - 1; j >= 0; j--) {
+        var stackInfo = stackInfoList[j]; // Has been optimized by inverted indices on `stackedByDimension`.
+
+        if (!isStackedByIndex) {
+          stackedDataRawIndex = stackInfo.data.rawIndexOf(stackInfo.stackedByDimension, byValue);
+        }
+
+        if (stackedDataRawIndex >= 0) {
+          var val = stackInfo.data.getByRawIndex(stackInfo.stackResultDimension, stackedDataRawIndex); // Considering positive stack, negative stack and empty data
+
+          if (sum >= 0 && val > 0 || // Positive stack
+          sum <= 0 && val < 0 // Negative stack
+          ) {
+              sum += val;
+              stackedOver = val;
+              break;
+            }
+        }
+      }
+
+      resultVal[0] = sum;
+      resultVal[1] = stackedOver;
+      return resultVal;
+    });
+    targetData.hostModel.setData(newData); // Update for consequent calculation
+
+    targetStackInfo.data = newData;
+  });
+}
+
+module.exports = _default;

package/lib/scale/Interval.js

@@ -6,6 +6,25 @@ var Scale = require("./Scale");
 
 var helper = require("./helper");
 
+/*
+* 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.
+*/
+
 /**
  * Interval scale
  * @module echarts/scale/Interval
@@ -64,20 +83,6 @@ var IntervalScale = Scale.extend({
     return helper.intervalScaleGetTicks(this._interval, this._extent, this._niceExtent, this._intervalPrecision);
   },
 
-  /**
-   * @return {Array.<string>}
-   */
-  getTicksLabels: function () {
-    var labels = [];
-    var ticks = this.getTicks();
-
-    for (var i = 0; i < ticks.length; i++) {
-      labels.push(this.getLabel(ticks[i]));
-    }
-
-    return labels;
-  },
-
   /**
    * @param {number} data
    * @param {Object} [opt]

package/lib/scale/Log.js

@@ -6,6 +6,25 @@ var numberUtil = require("../util/number");
 
 var IntervalScale = require("./Interval");
 
+/*
+* 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.
+*/
+
 /**
  * Log scale
  * @module echarts/scale/Log
@@ -101,9 +120,9 @@ var LogScale = Scale.extend({
    * @override
    */
   unionExtentFromData: function (data, dim) {
-    this.unionExtent(data.getApproximateExtent(dim, true, function (val) {
-      return val > 0;
-    }));
+    // TODO
+    // filter value that <= 0
+    this.unionExtent(data.getApproximateExtent(dim));
   },
 
   /**

package/lib/scale/Ordinal.js

@@ -4,6 +4,25 @@ var Scale = require("./Scale");
 
 var OrdinalMeta = require("../data/OrdinalMeta");
 
+/*
+* 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.
+*/
+
 /**
  * Linear continuous scale
  * @module echarts/coord/scale/Ordinal
@@ -73,7 +92,10 @@ var OrdinalScale = Scale.extend({
    * @return {string}
    */
   getLabel: function (n) {
-    return this._ordinalMeta.categories[n];
+    if (!this.isBlank()) {
+      // Note that if no data, ordinalMeta.categories is an empty array.
+      return this._ordinalMeta.categories[n];
+    }
   },
 
   /**
@@ -87,7 +109,10 @@ var OrdinalScale = Scale.extend({
    * @override
    */
   unionExtentFromData: function (data, dim) {
-    this.unionExtent(data.getApproximateExtent(dim, false));
+    this.unionExtent(data.getApproximateExtent(dim));
+  },
+  getOrdinalMeta: function () {
+    return this._ordinalMeta;
   },
   niceTicks: zrUtil.noop,
   niceExtent: zrUtil.noop

package/lib/scale/Scale.js

@@ -1,5 +1,24 @@
 var clazzUtil = require("../util/clazz");
 
+/*
+* 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.
+*/
+
 /**
  * // Scale class management
  * @module echarts/scale/Scale
@@ -96,7 +115,7 @@ Scale.prototype.unionExtent = function (other) {
 
 
 Scale.prototype.unionExtentFromData = function (data, dim) {
-  this.unionExtent(data.getApproximateExtent(dim, true));
+  this.unionExtent(data.getApproximateExtent(dim));
 };
 /**
  * Get extent
@@ -125,21 +144,6 @@ Scale.prototype.setExtent = function (start, end) {
     thisExtent[1] = end;
   }
 };
-/**
- * @return {Array.<string>}
- */
-
-
-Scale.prototype.getTicksLabels = function () {
-  var labels = [];
-  var ticks = this.getTicks();
-
-  for (var i = 0; i < ticks.length; i++) {
-    labels.push(this.getLabel(ticks[i]));
-  }
-
-  return labels;
-};
 /**
  * When axis extent depends on data and no data exists,
  * axis ticks should not be drawn, which is named 'blank'.
@@ -156,6 +160,13 @@ Scale.prototype.isBlank = function () {
 Scale.prototype.setBlank = function (isBlank) {
   this._isBlank = isBlank;
 };
+/**
+ * @abstract
+ * @param {*} tick
+ * @return {string} label of the tick.
+ */
+
+Scale.prototype.getLabel = null;
 clazzUtil.enableClassExtend(Scale);
 clazzUtil.enableClassManagement(Scale, {
   registerWhenExtend: true

package/lib/scale/Time.js

@@ -8,6 +8,24 @@ var scaleHelper = require("./helper");
 
 var IntervalScale = require("./Interval");
 
+/*
+* 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.
+*/
 // [About UTC and local time zone]:
 // In most cases, `number.parseDate` will treat input data string as local time
 // (except time zone is specified in time string). And `format.formateTime` returns

package/lib/scale/helper.js

@@ -1,5 +1,24 @@
 var numberUtil = require("../util/number");
 
+/*
+* 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.
+*/
+
 /**
  * For testable.
  */