Fix sampling in stream.

apache · Mar 25, 2018 · 81fb75e · 81fb75e
1 parent 7d62bf3
commit 81fb75e
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 9 deletions.
diff --git a/src/component/dataZoom/dataZoomProcessor.js b/src/component/dataZoom/dataZoomProcessor.js
@@ -21,7 +21,7 @@ echarts.registerProcessor({
         return seriesModelMap;
     },
 
-    isOverallFilter: true,
+    modifyOutputEnd: true,
 
     // Consider appendData, where filter should be performed. Because data process is
     // in block mode currently, it is not need to worry about that the overallProgress

diff --git a/src/model/Series.js b/src/model/Series.js
@@ -231,7 +231,7 @@ var SeriesModel = ComponentModel.extend({
         if (task) {
             var context = task.context;
             // Consider case: filter, data sample.
-            if (context.data !== data && task.isOverallFilter) {
+            if (context.data !== data && task.modifyOutputEnd) {
                 task.setOutputEnd(data.count());
             }
             context.outputData = data;

diff --git a/src/processor/dataSample.js b/src/processor/dataSample.js
@@ -47,7 +47,11 @@ var indexSampler = function (frame, value) {
 
 export default function (seriesType) {
     return {
+
         seriesType: seriesType,
+
+        modifyOutputEnd: true,
+
         reset: function (seriesModel, ecModel, api) {
             var data = seriesModel.getData();
             var sampling = seriesModel.get('sampling');

diff --git a/src/stream/Scheduler.js b/src/stream/Scheduler.js
@@ -2,7 +2,7 @@
  * @module echarts/stream/Scheduler
  */
 
-import {each, isArray, isFunction, createHashMap, noop, assert} from 'zrender/src/core/util';
+import {each, isFunction, createHashMap, noop} from 'zrender/src/core/util';
 import {createTask} from './task';
 import {getUID} from '../util/component';
 import GlobalModel from '../model/Global';
@@ -347,7 +347,7 @@ function createOverallStageTask(scheduler, stageHandler, stageHandlerRecord, ecM
     var seriesType = stageHandler.seriesType;
     var getTargetSeries = stageHandler.getTargetSeries;
     var overallProgress = true;
-    var isOverallFilter = stageHandler.isOverallFilter;
+    var modifyOutputEnd = stageHandler.modifyOutputEnd;
 
     // An overall task with seriesType detected or has `getTargetSeries`, we add
     // stub in each pipelines, it will set the overall task dirty when the pipeline
@@ -382,7 +382,7 @@ function createOverallStageTask(scheduler, stageHandler, stageHandlerRecord, ecM
         stub.context = {
             model: seriesModel,
             overallProgress: overallProgress,
-            isOverallFilter: isOverallFilter
+            modifyOutputEnd: modifyOutputEnd
         };
         stub.agent = overallTask;
         stub.__block = overallProgress;

diff --git a/src/stream/task.js b/src/stream/task.js
@@ -73,8 +73,6 @@ taskProto.perform = function (performArgs) {
         if (__DEV__) {
             assert(upTask._outputDueEnd != null);
         }
-        // ??? FIXME move to schedueler?
-        // this._dueEnd = Math.max(upTask._outputDueEnd, this._dueEnd);
         this._dueEnd = upTask._outputDueEnd;
     }
     // DataTask or overallTask
@@ -198,14 +196,12 @@ taskProto.getDownstream = function () {
 };
 
 taskProto.setOutputEnd = function (end) {
-    // ??? FIXME: check
     // This only happend in dataTask, dataZoom, map, currently.
     // where dataZoom do not set end each time, but only set
     // when reset. So we should record the setted end, in case
     // that the stub of dataZoom perform again and earse the
     // setted end by upstream.
     this._outputDueEnd = this._settedOutputEnd = end;
-    // this._outputDueEnd = end;
 };
 
 

diff --git a/test/line-large.html b/test/line-large.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <script src="lib/esl.js"></script>
+        <script src="lib/config.js"></script>
+        <script src="lib/jquery.min.js"></script>
+        <script src="lib/facePrint.js"></script>
+        <script src="lib/testHelper.js"></script>
+        <link rel="stylesheet" href="lib/reset.css" />
+    </head>
+    <body>
+        <style>
+            .test-title {
+                background: #146402;
+                color: #fff;
+            }
+        </style>
+
+
+        <div id="main0"></div>
+
+
+        <script>
+
+            var chart;
+            var myChart;
+            var option;
+
+            require([
+                'echarts'/*, 'map/js/china' */
+            ], function (echarts) {
+
+                var count = 1e6;
+
+                function randomData() {
+                    value = value + Math.random() * 21 - 10;
+                    return [
+                        xValue += 1,
+                        Math.round(value)
+                    ];
+                }
+
+                var data = [];
+                var xValue = 100;
+                var value = Math.random() * 1000;
+                for (var i = 0; i < count; i++) {
+                    data.push(randomData());
+                }
+
+
+                var option = {
+                    tooltip: {
+                        trigger: 'axis'
+                    },
+                    legend: {},
+                    xAxis: {
+                    },
+                    yAxis: {
+                    },
+                    dataZoom: [{}, {type: 'inside'}],
+                    series: [{
+                        name: 'large-line',
+                        type: 'line',
+                        showSymbol: false,
+                        sampling: 'max',
+                        data: data
+                    }]
+                };
+
+                chart = myChart = testHelper.create(echarts, 'main0', {
+                    option: option
+                });
+            });
+
+        </script>
+    </body>
+</html>