You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2018/04/27 17:42:22 UTC
[incubator-echarts] branch master updated (332b086 -> 40949ae)
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
from 332b086 Merge branch 'master' of https://github.com/apache/incubator-echarts
new 33deb73 tweak.
new 40949ae update build
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dist/echarts-en.common.js | 90 +++++-----
dist/echarts-en.common.min.js | 2 +-
dist/echarts-en.js | 90 +++++-----
dist/echarts-en.js.map | 2 +-
dist/echarts-en.min.js | 2 +-
dist/echarts-en.simple.js | 90 +++++-----
dist/echarts-en.simple.min.js | 2 +-
dist/echarts.common.js | 90 +++++-----
dist/echarts.common.min.js | 2 +-
dist/echarts.js | 90 +++++-----
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 2 +-
dist/echarts.simple.js | 90 +++++-----
dist/echarts.simple.min.js | 2 +-
src/chart/line/poly.js | 46 ++---
test/smooth.html | 391 ++++++++++++++++++++++++++++++++++++++++--
16 files changed, 711 insertions(+), 282 deletions(-)
--
To stop receiving notification emails like this one, please contact
sushuang@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/02: tweak.
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 33deb730c54a4d6490b8c25855ddfbce9137e41d
Author: sushuang <su...@gmail.com>
AuthorDate: Fri Apr 27 22:42:44 2018 +0800
tweak.
---
src/chart/line/poly.js | 46 +++---
test/smooth.html | 391 ++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 397 insertions(+), 40 deletions(-)
diff --git a/src/chart/line/poly.js b/src/chart/line/poly.js
index a7e86b7..9a53ebc 100644
--- a/src/chart/line/poly.js
+++ b/src/chart/line/poly.js
@@ -80,29 +80,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
-
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
+
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/test/smooth.html b/test/smooth.html
index db2b041..74fcf46 100644
--- a/test/smooth.html
+++ b/test/smooth.html
@@ -1,33 +1,31 @@
<html>
<head>
<meta charset="utf-8">
- <script src="http://requirejs.org/docs/release/2.2.0/minified/require.js"></script>
+ <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" />
<meta name="viewport" content="user-scalable=no,width=device-width,height=device-height">
</head>
<body>
<style>
- html, body, #main {
- width: 100%;
- height: 100%;
- }
</style>
- <div id="main"></div>
+
+
+ <div id="main0"></div>
+ <div id="main1"></div>
+ <div id="main2"></div>
+ <div id="main3"></div>
+
+
<script>
require([
'echarts'
- // 'echarts/chart/line',
- // 'echarts/component/legend',
- // 'echarts/component/gridSimple',
- // 'echarts/component/tooltip',
- // 'zrender/vml/vml'
], function (echarts) {
- var chart = echarts.init(document.getElementById('main'), null, {
- // renderer: 'svg'
- });
-
var data = [
[0, 0]
[1, 1],
@@ -39,7 +37,7 @@
[7, 7]
];
- option = {
+ var option = {
color: ['#4ea397', '#d0648a', '#f5b841'],
animation: false,
title: {
@@ -102,10 +100,369 @@
}
}]
};
- chart.setOption(option);
+ testHelper.create(echarts, 'main0', {
+ option: option,
+ height: 550
+ });
+ })
+
+ </script>
+
+
+
+
+
+
+ <script>
+
+ require([
+ 'echarts'
+ ], function (echarts) {
+
+ var symbolSize = 20;
+ var data = [[15, 0], [-50, 10], [-56.5, 20], [-46.5, 30], [-22.1, 40]];
+ var points = [];
+
+ var option = {
+ title: {
+ text: 'Click to Add Points'
+ },
+ tooltip: {
+ formatter: function (params) {
+ var data = params.data || [0, 0];
+ return data[0].toFixed(2) + ', ' + data[1].toFixed(2);
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: {
+ min: -60,
+ max: 20,
+ type: 'value',
+ axisLine: {onZero: false}
+ },
+ yAxis: {
+ min: 0,
+ max: 40,
+ type: 'value',
+ axisLine: {onZero: false}
+ },
+ series: [
+ {
+ id: 'a',
+ type: 'line',
+ smooth: true,
+ symbolSize: symbolSize,
+ data: data
+ }
+ ]
+ };
+
+ var chart = testHelper.create(echarts, 'main1', {
+ title: 'click to add points, check smooth',
+ option: option,
+ height: 550
+ });
+
+ if (chart) {
+
+ var zr = chart.getZr();
+
+ zr.on('click', function (params) {
+ var pointInPixel = [params.offsetX, params.offsetY];
+ var pointInGrid = chart.convertFromPixel('grid', pointInPixel);
+
+ if (chart.containPixel('grid', pointInPixel)) {
+ data.push(pointInGrid);
+
+ chart.setOption({
+ series: [{
+ id: 'a',
+ data: data
+ }]
+ });
+ }
+ });
+
+ zr.on('mousemove', function (params) {
+ var pointInPixel = [params.offsetX, params.offsetY];
+ zr.setCursorStyle(chart.containPixel('grid', pointInPixel) ? 'copy' : 'default');
+ });
+ }
+ })
+
+ </script>
+
+
+
+
+
+
+
+
+
+ <script>
+
+ require([
+ 'echarts'
+ ], function (echarts) {
+ option = {
+ legend: {
+ },
+ tooltip: {
+ trigger: 'axis',
+ },
+ yAxis: {
+ type: 'value'
+ },
+ xAxis: {
+ type: 'category',
+ axisLine: {onZero: false},
+ boundaryGap: false,
+ data: ['0', '10', '20', '30', '40', '50', '60', '70', '80']
+ },
+ series: [
+ {
+ name: '高度(km)与气温(°C)变化关系',
+ type: 'line',
+ smooth: true,
+ smoothMonotone: 'x',
+ lineStyle: {
+ normal: {
+ width: 3,
+ shadowColor: 'rgba(0,0,0,0.4)',
+ shadowBlur: 10,
+ shadowOffsetY: 10
+ }
+ },
+ data: [15, -50, -56.5, -46.5, -22.1, -2.5, -27.7, -55.7, -76.5]
+ }
+ ]
+ };
+ var chart = testHelper.create(echarts, 'main', {
+ title: 'FIXME: bad case',
+ option: option,
+ height: 550
+ });
+
+ if (chart) {
+
+ var zr = chart.getZr();
+
+ zr.on('click', function (params) {
+ var pointInPixel = [params.offsetX, params.offsetY];
+ var pointInGrid = chart.convertFromPixel('grid', pointInPixel);
+
+ if (chart.containPixel('grid', pointInPixel)) {
+ data.push(pointInGrid);
+
+ chart.setOption({
+ series: [{
+ id: 'a',
+ data: data
+ }]
+ });
+ }
+ });
+
+ zr.on('mousemove', function (params) {
+ var pointInPixel = [params.offsetX, params.offsetY];
+ zr.setCursorStyle(chart.containPixel('grid', pointInPixel) ? 'copy' : 'default');
+ });
+ }
+ })
+
+ </script>
+
+
+
+
+
+
+ <script>
+
+ require([
+ 'echarts'
+ ], function (echarts) {
+ option = {
+ legend: {
+ },
+ tooltip: {
+ trigger: 'axis',
+ },
+ yAxis: {
+ type: 'value'
+ },
+ xAxis: {
+ type: 'category',
+ axisLine: {onZero: false},
+ boundaryGap: false,
+ data: ['0', '10', '20', '30', '40', '50', '60', '70', '80']
+ },
+ series: [
+ {
+ name: '高度(km)与气温(°C)变化关系',
+ type: 'line',
+ smooth: true,
+ smoothMonotone: 'x',
+ lineStyle: {
+ normal: {
+ width: 3,
+ shadowColor: 'rgba(0,0,0,0.4)',
+ shadowBlur: 10,
+ shadowOffsetY: 10
+ }
+ },
+ data: [15, -50, -56.5, -46.5, -22.1, -2.5, -27.7, -55.7, -76.5]
+ }
+ ]
+ };
+ var chart = testHelper.create(echarts, 'main2', {
+ title: 'FIXME: bad case',
+ option: option,
+ height: 550
+ });
+
+ if (chart) {
+
+ var zr = chart.getZr();
+
+ zr.on('click', function (params) {
+ var pointInPixel = [params.offsetX, params.offsetY];
+ var pointInGrid = chart.convertFromPixel('grid', pointInPixel);
+
+ if (chart.containPixel('grid', pointInPixel)) {
+ data.push(pointInGrid);
+
+ chart.setOption({
+ series: [{
+ id: 'a',
+ data: data
+ }]
+ });
+ }
+ });
+
+ zr.on('mousemove', function (params) {
+ var pointInPixel = [params.offsetX, params.offsetY];
+ zr.setCursorStyle(chart.containPixel('grid', pointInPixel) ? 'copy' : 'default');
+ });
+ }
+ })
+
+ </script>
+
+
+
+
+
+
+
+
+
+
+
+ <script>
+
+ require([
+ 'echarts'
+ ], function (echarts) {
+
+ var data = [[1, 4862.4],[2, 5294.7],[3, 5934.5],[4, 7171.0],[5, 8964.4],[6, 10202.2],[7, 11962.5],[8, 14928.3],[9, 16909.2],[10, 18547.9],[11, 21617.8],[12, 26638.1],[13, 34634.4],[14, 46759.4],[15, 58478.1],[16, 67884.6],[17, 74462.6],[18, 79395.7]];
+ var myRegression = {"points":[[1,4162.436774392433],[2,4982.540245685443],[3,5964.224478460412],[4,7139.324897630159],[5,8545.949297850559],[6,10229.71365621353],[7,12245.221430747537],[8,14657.834317479834],[9,17545.791890639037],[10,21002.74886464572],[11,25140.812259760092],[12,30094.176964828697],[13,36023.47759622737],[14,43120.997781149395],[15,51616.90579913977],[16,61786.7187999529],[17,73960.23765779613],[18,88532.24221386963]],"parameter":{"coefficient":3477.318 [...]
+
+ option = {
+ title: {
+ text: '1981 - 1998 gross domestic product GDP (trillion yuan)',
+ subtext: 'By ecStat.regression',
+ sublink: 'https://github.com/ecomfe/echarts-stat',
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'cross'
+ }
+ },
+ xAxis: {
+ type: 'value',
+ splitLine: {
+ lineStyle: {
+ type: 'dashed'
+ }
+ },
+ splitNumber: 20
+ },
+ yAxis: {
+ type: 'value',
+ splitLine: {
+ lineStyle: {
+ type: 'dashed'
+ }
+ }
+ },
+ series: [{
+ name: 'scatter',
+ type: 'scatter',
+ label: {
+ emphasis: {
+ show: true,
+ position: 'left',
+ textStyle: {
+ color: 'blue',
+ fontSize: 16
+ }
+ }
+ },
+ data: data
+ }, {
+ name: 'line',
+ type: 'line',
+ showSymbol: false,
+ smooth: true,
+ smoothMonotone: 'x',
+ data: myRegression.points,
+ markPoint: {
+ itemStyle: {
+ normal: {
+ color: 'transparent'
+ }
+ },
+ label: {
+ normal: {
+ show: true,
+ position: 'left',
+ formatter: myRegression.expression,
+ textStyle: {
+ color: '#333',
+ fontSize: 14
+ }
+ }
+ },
+ data: [{
+ coord: myRegression.points[myRegression.points.length - 1]
+ }]
+ }
+ }]
+ };
+
+ testHelper.create(echarts, 'main3', {
+ title: 'FIXME: bad case',
+ option: option,
+ height: 550
+ });
})
</script>
+
+
+
+
+
</body>
</html>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
sushuang@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 02/02: update build
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 40949ae5d19a6de64d4b5cd0fa109a4c04051e66
Author: sushuang <su...@gmail.com>
AuthorDate: Sat Apr 28 01:41:50 2018 +0800
update build
---
dist/echarts-en.common.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts-en.common.min.js | 2 +-
dist/echarts-en.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts-en.js.map | 2 +-
dist/echarts-en.min.js | 2 +-
dist/echarts-en.simple.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts-en.simple.min.js | 2 +-
dist/echarts.common.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts.common.min.js | 2 +-
dist/echarts.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 2 +-
dist/echarts.simple.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts.simple.min.js | 2 +-
14 files changed, 314 insertions(+), 242 deletions(-)
diff --git a/dist/echarts-en.common.js b/dist/echarts-en.common.js
index 96e2ddd..8a6b06a 100644
--- a/dist/echarts-en.common.js
+++ b/dist/echarts-en.common.js
@@ -29659,10 +29659,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -34491,24 +34497,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -34523,29 +34535,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts-en.common.min.js b/dist/echarts-en.common.min.js
index 8852a36..8034e1e 100644
--- a/dist/echarts-en.common.min.js
+++ b/dist/echarts-en.common.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Ep=null),Op[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Cp.call(t);if("[object Array]"===i){if(!z(t)){e=[];for(var r=0,o=t.length;r<o;r++)e[r]=n(t[r])}}else if(Ip[i]){if(!z(t)){var a=t.constructor;if(t.constructor.from)e=a.from(t);else{e=new a( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(zp=null),Lp[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Ip.call(t);if("[object Array]"===i){if(!z(t)){e=[];for(var r=0,o=t.length;r<o;r++)e[r]=n(t[r])}}else if(Mp[i]){if(!z(t)){var a=t.constructor;if(t.constructor.from)e=a.from(t);else{e=new a( [...]
diff --git a/dist/echarts-en.js b/dist/echarts-en.js
index d55c22c..938eeef 100644
--- a/dist/echarts-en.js
+++ b/dist/echarts-en.js
@@ -29725,10 +29725,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -34584,24 +34590,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -34616,29 +34628,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts-en.js.map b/dist/echarts-en.js.map
index c2b980b..efc4447 100644
--- a/dist/echarts-en.js.map
+++ b/dist/echarts-en.js.map
@@ -1 +1 @@
-{"version":3,"file":"echarts-en.js","sources":["../src/config.js","../../zrender/src/core/guid.js","../../zrender/src/core/env.js","../../zrender/src/core/util.js","../../zrender/src/core/vector.js","../../zrender/src/mixin/Draggable.js","../../zrender/src/mixin/Eventful.js","../../zrender/src/Handler.js","../../zrender/src/core/matrix.js","../../zrender/src/mixin/Transformable.js","../../zrender/src/animation/easing.js","../../zrender/src/animation/Clip.js","../../zrender/src/core/LRU.j [...]
\ No newline at end of file
+{"version":3,"file":"echarts-en.js","sources":["../src/config.js","../../zrender/src/core/guid.js","../../zrender/src/core/env.js","../../zrender/src/core/util.js","../../zrender/src/core/vector.js","../../zrender/src/mixin/Draggable.js","../../zrender/src/mixin/Eventful.js","../../zrender/src/Handler.js","../../zrender/src/core/matrix.js","../../zrender/src/mixin/Transformable.js","../../zrender/src/animation/easing.js","../../zrender/src/animation/Clip.js","../../zrender/src/core/LRU.j [...]
\ No newline at end of file
diff --git a/dist/echarts-en.min.js b/dist/echarts-en.min.js
index 0cc5f5b..4e559ee 100644
--- a/dist/echarts-en.min.js
+++ b/dist/echarts-en.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(y_=null),m_[t]=e}function i(t){if(null==t||"object"!=typeof t)return t;var e=t,n=u_.call(t);if("[object Array]"===n){if(!O(t)){e=[];for(var o=0,a=t.length;o<a;o++)e[o]=i(t[o])}}else if(l_[n]){if(!O(t)){var r=t.constructor;if(t.constructor.from)e=r.from(t);else{e=new r( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(v_=null),g_[t]=e}function i(t){if(null==t||"object"!=typeof t)return t;var e=t,n=l_.call(t);if("[object Array]"===n){if(!O(t)){e=[];for(var o=0,a=t.length;o<a;o++)e[o]=i(t[o])}}else if(s_[n]){if(!O(t)){var r=t.constructor;if(t.constructor.from)e=r.from(t);else{e=new r( [...]
diff --git a/dist/echarts-en.simple.js b/dist/echarts-en.simple.js
index e41af00..e44b515 100644
--- a/dist/echarts-en.simple.js
+++ b/dist/echarts-en.simple.js
@@ -29089,10 +29089,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -30734,24 +30740,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -30766,29 +30778,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts-en.simple.min.js b/dist/echarts-en.simple.min.js
index 9da1c58..3af9587 100644
--- a/dist/echarts-en.simple.min.js
+++ b/dist/echarts-en.simple.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Ph=null),Ah[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Sh.call(t);if("[object Array]"===i){if(!E(t)){e=[];for(var r=0,a=t.length;r<a;r++)e[r]=n(t[r])}}else if(bh[i]){if(!E(t)){var o=t.constructor;if(t.constructor.from)e=o.from(t);else{e=new o( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Lh=null),kh[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=bh.call(t);if("[object Array]"===i){if(!E(t)){e=[];for(var r=0,a=t.length;r<a;r++)e[r]=n(t[r])}}else if(wh[i]){if(!E(t)){var o=t.constructor;if(t.constructor.from)e=o.from(t);else{e=new o( [...]
diff --git a/dist/echarts.common.js b/dist/echarts.common.js
index 4a2fbf6..f0dcd7b 100644
--- a/dist/echarts.common.js
+++ b/dist/echarts.common.js
@@ -29717,10 +29717,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -34549,24 +34555,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -34581,29 +34593,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts.common.min.js b/dist/echarts.common.min.js
index c9d7323..8b6b6dd 100644
--- a/dist/echarts.common.min.js
+++ b/dist/echarts.common.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Ep=null),Op[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Cp.call(t);if("[object Array]"===i){if(!z(t)){e=[];for(var r=0,o=t.length;r<o;r++)e[r]=n(t[r])}}else if(Ip[i]){if(!z(t)){var a=t.constructor;if(t.constructor.from)e=a.from(t);else{e=new a( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(zp=null),Lp[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Ip.call(t);if("[object Array]"===i){if(!z(t)){e=[];for(var r=0,o=t.length;r<o;r++)e[r]=n(t[r])}}else if(Sp[i]){if(!z(t)){var a=t.constructor;if(t.constructor.from)e=a.from(t);else{e=new a( [...]
diff --git a/dist/echarts.js b/dist/echarts.js
index c307c36..4fa898f 100644
--- a/dist/echarts.js
+++ b/dist/echarts.js
@@ -29783,10 +29783,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -34642,24 +34648,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -34674,29 +34686,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts.js.map b/dist/echarts.js.map
index 2bef076..3f4bcd2 100644
--- a/dist/echarts.js.map
+++ b/dist/echarts.js.map
@@ -1 +1 @@
-{"version":3,"file":"echarts.js","sources":["../src/config.js","../../zrender/src/core/guid.js","../../zrender/src/core/env.js","../../zrender/src/core/util.js","../../zrender/src/core/vector.js","../../zrender/src/mixin/Draggable.js","../../zrender/src/mixin/Eventful.js","../../zrender/src/Handler.js","../../zrender/src/core/matrix.js","../../zrender/src/mixin/Transformable.js","../../zrender/src/animation/easing.js","../../zrender/src/animation/Clip.js","../../zrender/src/core/LRU.js", [...]
\ No newline at end of file
+{"version":3,"file":"echarts.js","sources":["../src/config.js","../../zrender/src/core/guid.js","../../zrender/src/core/env.js","../../zrender/src/core/util.js","../../zrender/src/core/vector.js","../../zrender/src/mixin/Draggable.js","../../zrender/src/mixin/Eventful.js","../../zrender/src/Handler.js","../../zrender/src/core/matrix.js","../../zrender/src/mixin/Transformable.js","../../zrender/src/animation/easing.js","../../zrender/src/animation/Clip.js","../../zrender/src/core/LRU.js", [...]
\ No newline at end of file
diff --git a/dist/echarts.min.js b/dist/echarts.min.js
index 5407fb0..6aefcf6 100644
--- a/dist/echarts.min.js
+++ b/dist/echarts.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(y_=null),m_[t]=e}function i(t){if(null==t||"object"!=typeof t)return t;var e=t,n=u_.call(t);if("[object Array]"===n){if(!O(t)){e=[];for(var o=0,a=t.length;o<a;o++)e[o]=i(t[o])}}else if(l_[n]){if(!O(t)){var r=t.constructor;if(t.constructor.from)e=r.from(t);else{e=new r( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(v_=null),g_[t]=e}function i(t){if(null==t||"object"!=typeof t)return t;var e=t,n=l_.call(t);if("[object Array]"===n){if(!O(t)){e=[];for(var o=0,a=t.length;o<a;o++)e[o]=i(t[o])}}else if(s_[n]){if(!O(t)){var r=t.constructor;if(t.constructor.from)e=r.from(t);else{e=new r( [...]
diff --git a/dist/echarts.simple.js b/dist/echarts.simple.js
index fd516b1..d749c4d 100644
--- a/dist/echarts.simple.js
+++ b/dist/echarts.simple.js
@@ -29147,10 +29147,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -30792,24 +30798,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -30824,29 +30836,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts.simple.min.js b/dist/echarts.simple.min.js
index 36cb2fa..dda62be 100644
--- a/dist/echarts.simple.min.js
+++ b/dist/echarts.simple.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Ph=null),Ah[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Mh.call(t);if("[object Array]"===i){if(!E(t)){e=[];for(var r=0,a=t.length;r<a;r++)e[r]=n(t[r])}}else if(bh[i]){if(!E(t)){var o=t.constructor;if(t.constructor.from)e=o.from(t);else{e=new o( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Lh=null),kh[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=bh.call(t);if("[object Array]"===i){if(!E(t)){e=[];for(var r=0,a=t.length;r<a;r++)e[r]=n(t[r])}}else if(wh[i]){if(!E(t)){var o=t.constructor;if(t.constructor.from)e=o.from(t);else{e=new o( [...]
--
To stop receiving notification emails like this one, please contact
sushuang@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org