From e0e58ae8ccc5d6aaab78fa22ce3883a7d649caa2 Mon Sep 17 00:00:00 2001 From: lang Date: Wed, 11 Mar 2015 10:42:42 +0800 Subject: [PATCH] =?UTF-8?q?markLine=20=E8=BE=B9=E6=8D=86=E7=BB=91=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/doc-en.html | 32 +++++++++++++++++++++++++++++--- doc/doc.html | 28 ++++++++++++++++++++++++++-- doc/example/webkit-dep.html | 3 ++- doc/example/webkit-dep2.html | 1 + src/echarts.js | 2 +- 5 files changed, 59 insertions(+), 7 deletions(-) diff --git a/doc/doc-en.html b/doc/doc-en.html index 13de63b47..ec728b296 100644 --- a/doc/doc-en.html +++ b/doc/doc-en.html @@ -1646,7 +1646,7 @@ require(['echarts'], function (ec){
  • force, chord :
    • @@ -3884,21 +3884,46 @@ geoCoord : { null angles by which the start and end markLine symbols rotate, same as series' symbolRotate. + + boolean large + false + + If enable optimization for large scale markline. Large scale means line number >= 2k. +
    Optimization will batch lines drawing. Lines of series will force to have same style. And symbols of two end of line will be ignore. + + {boolean} smooth false smoothed line, while smooth is true, lineStyle.type can not be dashed. - {number} smoothRadian + {number} smoothness 0.2 - radian of the smoothed line. + Line smoothness. Only available when smooth is true {number} precision 2 precision, use for the average markLine. + + {Object} bundling + +
    {
+    enable: false,
+    maxTurningAngle: 45
+}
    + + + Edge Bundling +
    +
    enable: If enable edge bundling. +
    maxTurningAngle: Max turning angle of bundled edge, ranges from 0 degree to 90 degree. +
    +
    Tip：Edge bundling use algorithm from "Multilevel Agglomerative Edge Bundling for Visualizing Large Graphs" + + {Object} effect 
    {
@@ -3911,6 +3936,7 @@ geoCoord : {
     shadowBlur : null
 }
    glow effect for markLine symbol: +

    show: specifies whether to show. Defaults to false.
    loop: specifies whether to play the animation in a loop. Defaults to true.
    period: animation period. No units. The larger the value, the slower. Defaults to 15. diff --git a/doc/doc.html b/doc/doc.html index cca8b3216..8b8063dd7 100644 --- a/doc/doc.html +++ b/doc/doc.html @@ -1646,7 +1646,7 @@ require(['echarts'], function (ec){
  • 力导向图, 和弦图 :
    • @@ -3884,13 +3884,21 @@ geoCoord : { null 标线起始和结束的symbol旋转控制，同series中的symbolRotate + + boolean large + false + + 是否启用大规模标线模式，默认关闭。 +
    大规模标线模式下会优化标线绘制，同个系列的的所有标线都会使用同一种样式，并且忽略标线两端 symbol 的绘制。 + + {boolean} smooth false 平滑曲线显示，smooth为true时lineStyle不支持虚线 - {number} smoothRadian + {number} smoothness 0.2 平滑曲线弧度，smooth为true时有效，指定平滑曲线弧度 @@ -3899,6 +3907,22 @@ geoCoord : { 2 小数精度，使用开箱即用的均线markLine时有效 + + {Object} bundling + +
    {
+    enable: false,
+    maxTurningAngle: 45
+}
    + + + 边捆绑： +
    enable 是否使用边捆绑，默认关闭 +
    maxTurningAngle 边捆绑算法参数，可选 [0, 90] 的角度，配置捆绑后的边最大拐角, 默认为 45 度 +
    +
    注：捆绑算法使用 Multilevel Agglomerative Edge Bundling for Visualizing Large Graphs + + {Object} effect 
    {
diff --git a/doc/example/webkit-dep.html b/doc/example/webkit-dep.html
index ae072d427..7954fcdf8 100644
--- a/doc/example/webkit-dep.html
+++ b/doc/example/webkit-dep.html
@@ -135,10 +135,11 @@ $.ajax({
             large: true,
             useWorker: true,
             coolDown: 0.995,
-            ribbonType: false,
+            ribbonType: false
         };
 
         myChart.setOption(option);
+        myChart.hideLoading();
     }
 });
                     
diff --git a/doc/example/webkit-dep2.html b/doc/example/webkit-dep2.html
index f621e33dd..28326e501 100644
--- a/doc/example/webkit-dep2.html
+++ b/doc/example/webkit-dep2.html
@@ -142,6 +142,7 @@ $.ajax({
         };
 
         myChart.setOption(option);
+        myChart.hideLoading();
     }
 });
                     
diff --git a/src/echarts.js b/src/echarts.js
index de2c01d98..a92ad61c6 100644
--- a/src/echarts.js
+++ b/src/echarts.js
@@ -613,7 +613,7 @@ define(function (require) {
 
         _noDataCheck: function(magicOption) {
             var series = magicOption.series;
-            this._zr.hideLoading();
+
             for (var i = 0, l = series.length; i < l; i++) {
                 if (series[i].type == ecConfig.CHART_TYPE_MAP
                     || (series[i].data && series[i].data.length > 0)
-- 
GitLab