提交 869cd6f3 编写于 作者: S sushuang

tweak.

上级 87807822
此差异已折叠。
此差异已折叠。
......@@ -14,7 +14,7 @@ import {updateCenterAndZoom} from './roamHelper';
echarts.registerAction({
type: 'geoRoam',
event: 'geoRoam',
update: 'updateLayout'
update: 'updateView'
}, function (payload, ecModel) {
var componentType = payload.componentType || 'series';
......
......@@ -4,8 +4,8 @@ import * as zrUtil from 'zrender/src/core/util';
import './scatter/ScatterSeries';
import './scatter/ScatterView';
import './scatter/StreamScatterSeries';
import './scatter/StreamScatterView';
// import './scatter/StreamScatterSeries';
// import './scatter/StreamScatterView';
import visualSymbol from '../visual/symbol';
import layoutPoints from '../layout/points';
......@@ -16,5 +16,5 @@ import '../component/gridSimple';
echarts.registerVisual(zrUtil.curry(visualSymbol, 'scatter', 'circle', null));
echarts.registerLayout(zrUtil.curry(layoutPoints, 'scatter'));
echarts.registerVisual(zrUtil.curry(visualSymbol, 'streamScatter', 'circle', null));
echarts.registerLayout(zrUtil.curry(layoutPoints, 'streamScatter'));
// echarts.registerVisual(zrUtil.curry(visualSymbol, 'streamScatter', 'circle', null));
// echarts.registerLayout(zrUtil.curry(layoutPoints, 'streamScatter'));
......@@ -13,7 +13,7 @@ export default SeriesModel.extend({
brushSelector: 'point',
progressiveEnabled: true,
streamEnabled: true,
defaultOption: {
coordinateSystem: 'cartesian2d',
......
import * as echarts from '../../echarts';
import SymbolDraw from '../helper/SymbolDraw';
import LargeSymbolDraw from '../helper/LargeSymbolDraw';
import StreamSymbolDraw from '../helper/StreamSymbolDraw';
echarts.extendChartView({
......@@ -9,35 +10,36 @@ echarts.extendChartView({
init: function () {
this._normalSymbolDraw = new SymbolDraw();
this._largeSymbolDraw = new LargeSymbolDraw();
},
resetRender: function () {
this._streamSymbolDraw = new StreamSymbolDraw();
},
render: function (seriesModel, ecModel, api) {
var data = seriesModel.getData();
var largeSymbolDraw = this._largeSymbolDraw;
var normalSymbolDraw = this._normalSymbolDraw;
var group = this.group;
var symbolDraw = seriesModel.get('large') && data.count() > seriesModel.get('largeThreshold')
? largeSymbolDraw : normalSymbolDraw;
var symbolDraw = seriesModel.useStream()
? this._streamSymbolDraw
: seriesModel.get('large') && data.count() > seriesModel.get('largeThreshold')
? this._largeSymbolDraw
: this._normalSymbolDraw;
this._symbolDraw = symbolDraw;
symbolDraw.updateData(data);
group.add(symbolDraw.group);
group.add(symbolDraw.group || symbolDraw.root);
group.remove(
symbolDraw === largeSymbolDraw
? normalSymbolDraw.group : largeSymbolDraw.group
);
this._lasySymbolDrawGroup && group.remove(this._lasySymbolDrawGroup);
this._lasySymbolDrawGroup = symbolDraw.group;
},
updateLayout: function (seriesModel) {
this._symbolDraw.updateLayout(seriesModel);
},
updateView: function (seriesModel) {
this._symbolDraw.updateView(seriesModel);
},
remove: function (ecModel, api) {
this._symbolDraw && this._symbolDraw.remove(api, true);
},
......
此差异已折叠。
import * as echarts from '../../echarts';
import SymbolDrawStream from '../helper/SymbolDrawStream';
echarts.extendChartView({
type: 'streamScatter',
init: function () {
this._symbolDraw = new SymbolDrawStream();
// this._largeSymbolDraw = new LargeSymbolDraw();
},
// ??? back compatibal
render: function (seriesModel, ecModel, api) {
this.group.removeAll();
// var symbolDraw = this._symbolDraw;
var task = this._symbolDraw.resetData(seriesModel);
this.group.add(this._symbolDraw.group);
return task;
},
updateLayout: function (seriesModel) {
return this._symbolDraw.updateLayout(seriesModel);
},
remove: function (ecModel, api) {
this._symbolDraw && this._symbolDraw.remove(api, true);
},
dispose: function () {}
});
\ No newline at end of file
此差异已折叠。
......@@ -371,7 +371,7 @@ var SeriesModel = ComponentModel.extend({
*/
useStream: function () {
// ???
return this.streamEnabled;
return this.streamEnabled && this.get('stream');
}
});
......
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册