Fix updateTransform.

tweak task.

src/echarts.js

@@ -781,7 +781,7 @@ var updateMethods = {
         clearColorPalette(ecModel);
         scheduler.performStageTasks(visualFuncs, ecModel, payload);
 
-        render(this, ecModel, api, payload, true);
+        render(this, ecModel, api, payload);
 
         // Set background
         var backgroundColor = ecModel.get('backgroundColor') || 'transparent';
@@ -864,7 +864,7 @@ var updateMethods = {
             visualFuncs, ecModel, payload, {setDirty: true, seriesModels: seriesModels}
         );
 
-        render(this, ecModel, this._api, payload, true, seriesModels);
+        renderSeries(this, ecModel, this._api, payload, seriesModels);
 
         performPostUpdateFuncs(ecModel, this._api);
     },
@@ -888,7 +888,7 @@ var updateMethods = {
         // Keep pipe to the exist pipeline because it depends on the render task of the full pipeline.
         this._scheduler.performStageTasks(visualFuncs, ecModel, payload, {setDirty: true});
 
-        render(this, this._model, this._api, payload, true);
+        render(this, this._model, this._api, payload);
 
         performPostUpdateFuncs(ecModel, this._api);
     },
@@ -912,7 +912,7 @@ var updateMethods = {
         // Keep pipe to the exist pipeline because it depends on the render task of the full pipeline.
         this._scheduler.performStageTasks(visualFuncs, ecModel, payload, {visualType: 'visual', setDirty: true});
 
-        render(this, this._model, this._api, payload, true);
+        render(this, this._model, this._api, payload);
 
         performPostUpdateFuncs(ecModel, this._api);
     },
@@ -935,7 +935,7 @@ var updateMethods = {
         // this._scheduler.performStageTasks(visualFuncs, ecModel, payload, 'layout', true);
         this._scheduler.performStageTasks(visualFuncs, ecModel, payload, {setDirty: true});
 
-        render(this, this._model, this._api, payload, true);
+        render(this, this._model, this._api, payload);
 
         performPostUpdateFuncs(ecModel, this._api);
     }
@@ -1362,25 +1362,34 @@ function clearColorPalette(ecModel) {
     });
 }
 
+function render(ecIns, ecModel, api, payload) {
+    // Render all components
+    each(ecIns._componentsViews, function (componentView) {
+        var componentModel = componentView.__model;
+        componentView.render(componentModel, ecModel, api, payload);
+
+        updateZ(componentModel, componentView);
+    });
+
+    each(ecIns._chartsViews, function (chart) {
+        chart.__alive = false;
+    });
+
+    renderSeries(ecIns, ecModel, api, payload);
+
+    // Remove groups of unrendered charts
+    each(ecIns._chartsViews, function (chart) {
+        if (!chart.__alive) {
+            chart.remove(ecModel, api);
+        }
+    });
+}
+
 /**
  * Render each chart and component
  * @private
  */
-function render(ecIns, ecModel, api, payload, isReset, seriesModels) {
-    if (isReset) {
-        // Render all components
-        each(ecIns._componentsViews, function (componentView) {
-            var componentModel = componentView.__model;
-            componentView.render(componentModel, ecModel, api, payload);
-
-            updateZ(componentModel, componentView);
-        });
-
-        each(ecIns._chartsViews, function (chart) {
-            chart.__alive = false;
-        });
-    }
-
+function renderSeries(ecIns, ecModel, api, payload, seriesModels) {
     // Render all charts
     var scheduler = ecIns._scheduler;
     var unfinished;
@@ -1406,15 +1415,6 @@ function render(ecIns, ecModel, api, payload, isReset, seriesModels) {
 
     // If use hover layer
     // ??? updateHoverLayerStatus(this._zr, ecModel);
-
-    if (isReset) {
-        // Remove groups of unrendered charts
-        each(ecIns._chartsViews, function (chart) {
-            if (!chart.__alive) {
-                chart.remove(ecModel, api);
-            }
-        });
-    }
 }
 
 function performPostUpdateFuncs(ecModel, api) {

src/model/Series.js

@@ -67,7 +67,6 @@ var SeriesModel = ComponentModel.extend({
         // this.settingTask = createTask();
 
         this.initTask = createTask({
-            reset: initTaskReset,
             count: initTaskCount
         }, {model: this});
 
@@ -384,8 +383,4 @@ function initTaskCount(context) {
     return context.model.getRawData().getProvider().count();
 }
 
-function initTaskReset(context) {
-    return {noProgress: true};
-}
-
 export default SeriesModel;
\ No newline at end of file

src/stream/Scheduler.js

@@ -203,7 +203,6 @@ function createSeriesStageTask(scheduler, stageHandler, stageHandlerRecord, ecMo
         if (!task) {
             task = createTask({
                 reset: seriesTaskReset,
-                progress: seriesTaskProgress,
                 count: seriesTaskCount
             }, {
                 model: seriesModel,
@@ -243,7 +242,7 @@ function createOverallStageTask(scheduler, stageHandler, stageHandlerRecord, ecM
     // Moreover, it is not necessary to add stub to pipeline in the case.
     var seriesType = stageHandler.seriesType;
     seriesType && ecModel.eachRawSeriesByType(seriesType, function (seriesModel) {
-        var stub = stubs[stubIndex] = stubs[stubIndex] || createTask({reset: emptyTaskReset});
+        var stub = stubs[stubIndex] = stubs[stubIndex] || createTask();
         stubIndex++;
         stub.agent = overallTask;
         stub.__block = true;
@@ -254,13 +253,8 @@ function createOverallStageTask(scheduler, stageHandler, stageHandlerRecord, ecM
     stubs.length = stubIndex;
 }
 
-function emptyTaskReset() {
-    return {noProgress: true};
-}
-
 function overallTaskReset(context) {
     context.overallReset(context.ecModel, context.api, context.payload);
-    return {noProgress: true};
 }
 
 function seriesTaskReset(context) {
@@ -270,11 +264,11 @@ function seriesTaskReset(context) {
     var resetDefine = context.reset(
         context.model, context.ecModel, context.api, context.payload
     );
-    if (!resetDefine) {
-        return {noProgress: true};
+    if (resetDefine) {
+        context.dataEach = resetDefine.dataEach;
+        context.progress = resetDefine.progress;
+        return seriesTaskProgress;
     }
-    context.dataEach = resetDefine.dataEach;
-    context.progress = resetDefine.progress;
 }
 
 function seriesTaskProgress(params, context) {

src/stream/task.js

-
-import {assert, extend, each} from 'zrender/src/core/util';
+import {assert, each} from 'zrender/src/core/util';
 import { __DEV__ } from '../config';
 
 /**
@@ -13,7 +12,6 @@ export function createTask(define, context) {
 /**
  * @constructor
  * @param {Object} define
- * @param {Function} define.progress Custom progress
  * @param {Function} define.reset Custom reset
  * @param {Function} [define.count] count is used to determin data task.
  * @param {Object} [context]
@@ -21,7 +19,6 @@ export function createTask(define, context) {
 function Task(define, context) {
     define = define || {};
 
-    this._progress = define.progress;
     this._reset = define.reset;
     this._count = define.count;
 
@@ -45,30 +42,26 @@ taskProto.perform = function (performArgs) {
 
     var step = performArgs && performArgs.step;
 
-    // This should always be performed so it can be passed to downstream.
     var upTask = this._upstream;
     if (upTask) {
-        var progressInfo = upTask.getProgressInfo();
         if (__DEV__) {
-            assert(progressInfo.outputDueEnd != null);
+            assert(upTask._outputDueEnd != null);
         }
-        this._dueEnd = Math.max(progressInfo.outputDueEnd, this._dueEnd);
-    }
-
-    // If noProgress, pass index from upstream to downstream each time plan called.
-    if (this._noProgress) {
-        this._dueIndex = this._outputDueEnd = this._dueEnd = count(this);
+        this._dueEnd = Math.max(upTask._outputDueEnd, this._dueEnd);
     }
     else {
         if (__DEV__) {
-            assert(upTask || this._count);
+            assert(!this._progress || this._count);
         }
+        this._dueEnd = this._count ? this._count(this.context) : Infinity;
+    }
 
+    // If no progress, pass index from upstream to downstream each time plan called.
+    if (this._progress) {
         var start = this._dueIndex;
         var end = Math.min(
             step != null ? this._dueIndex + step : Infinity,
-            upTask ? this._dueEnd : Infinity,
-            this._count ? this._count(this.context) : Infinity
+            this._dueEnd
         );
 
         var outputDueEnd;
@@ -88,6 +81,10 @@ taskProto.perform = function (performArgs) {
         }
         this._outputDueEnd = outputDueEnd;
     }
+    else {
+        // This should always be performed so it can be passed to downstream.
+        this._dueIndex = this._outputDueEnd = this._dueEnd;
+    }
 
     // Initialized in scheduler.
     each(this.agentStubs, function (agentStub) {
@@ -109,35 +106,20 @@ taskProto.dirty = function () {
  * @param {Object} [params]
  */
 function reset(taskIns) {
-    taskIns._dueIndex = taskIns._outputDueEnd = 0;
-    taskIns._dueEnd = count(taskIns);
+    taskIns._dueIndex = taskIns._outputDueEnd = taskIns._dueEnd = 0;
 
-    var result = taskIns._reset && taskIns._reset(taskIns.context) || {};
-
-    taskIns._noProgress = result.noProgress;
+    taskIns._progress = taskIns._reset && taskIns._reset(taskIns.context);
 
     taskIns._downstream && taskIns._downstream.dirty();
     // FIXME
     taskIns.agent && taskIns.agent.dirty();
 }
 
-function count(taskIns) {
-    return taskIns._count ? taskIns._count(taskIns.context) : 0;
-}
-
-taskProto.getProgressInfo = function () {
-    return {
-        dueIndex: this._dueIndex,
-        dueEnd: this._dueEnd,
-        outputDueEnd: this._outputDueEnd
-    };
-};
-
 /**
  * @return {boolean}
  */
 taskProto.unfinished = function () {
-    return !this._noProgress && this._dueIndex < this._dueEnd;
+    return this._progress && this._dueIndex < this._dueEnd;
 };
 
 /**

src/view/Chart.js

@@ -22,8 +22,7 @@ function Chart() {
     this.uid = componentUtil.getUID('viewChart');
 
     this.renderTask = createTask({
-        reset: renderTaskReset,
-        progress: renderTaskProgress
+        reset: renderTaskReset
     }, {view: this});
 }
 
@@ -200,8 +199,9 @@ function renderTaskReset(context) {
             ? updateMethod : 'render'
         );
 
-    return view[methodName](seriesModel, ecModel, api, payload)
-        || (!incremental && {noProgress: true});
+    view[methodName](seriesModel, ecModel, api, payload);
+
+    return incremental ? renderTaskProgress : null;
 }
 
 function renderTaskProgress(params, context) {

src/visual/symbol.js

@@ -50,52 +50,3 @@ export default function (seriesType, defaultSymbolType, legendSymbol) {
         }
     };
 }
-
-// export default function (seriesType, defaultSymbolType, legendSymbol, ecModel) {
-//     // Encoding visual for all series include which is filtered for legend drawing
-//     ecModel.eachRawSeriesByType(seriesType, function (seriesModel) {
-//         seriesModel.pipeTask(
-//             createTask(seriesModel, defaultSymbolType, legendSymbol, ecModel),
-//             'visual'
-//         );
-//     });
-// }
-
-// function createTask(seriesModel, defaultSymbolType, legendSymbol, ecModel) {
-//     var data = seriesModel.getData();
-
-//     var symbolType = seriesModel.get('symbol') || defaultSymbolType;
-//     var symbolSize = seriesModel.get('symbolSize');
-
-//     data.setVisual({
-//         legendSymbol: legendSymbol || symbolType,
-//         symbol: symbolType,
-//         symbolSize: symbolSize
-//     });
-
-//     // Only visible series has each data be visual encoded
-//     if (ecModel.isSeriesFiltered(seriesModel)) {
-//         return;
-//     }
-
-//     return data.createEachTask(function (idx) {
-//         if (typeof symbolSize === 'function') {
-//             var rawValue = seriesModel.getRawValue(idx);
-//             // FIXME
-//             var params = seriesModel.getDataParams(idx);
-//             data.setItemVisual(idx, 'symbolSize', symbolSize(rawValue, params));
-//         }
-
-//         var itemModel = data.getItemModel(idx);
-//         var itemSymbolType = itemModel.getShallow('symbol', true);
-//         var itemSymbolSize = itemModel.getShallow('symbolSize', true);
-//         // If has item symbol
-//         if (itemSymbolType != null) {
-//             data.setItemVisual(idx, 'symbol', itemSymbolType);
-//         }
-//         if (itemSymbolSize != null) {
-//             // PENDING Transform symbolSize ?
-//             data.setItemVisual(idx, 'symbolSize', itemSymbolSize);
-//         }
-//     });
-// }