You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by de...@apache.org on 2018/09/04 09:46:22 UTC
[incubator-echarts] branch master updated (ba7a530 -> 2cc14b4)
This is an automated email from the ASF dual-hosted git repository.
deqingli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
from ba7a530 tweak example.
new 698e319 fix(sankey): fix in the vertical orient the leaf nodes align in the view
new b66fd1b Merge branch 'master' of https://github.com/apache/incubator-echarts
new f1194b0 test(sankey): test sankey vertical layout with big data
new 2cc14b4 test(sankey): text sankey diagram with new vertical layout
The 4 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:
src/chart/sankey/sankeyLayout.js | 2 +-
test/{sankey.html => sankey-vertical-energy.html} | 11 ++++++++++-
test/sankey-vertical.html | 8 +++-----
3 files changed, 14 insertions(+), 7 deletions(-)
copy test/{sankey.html => sankey-vertical-energy.html} (85%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 02/04: Merge branch 'master' of
https://github.com/apache/incubator-echarts
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deqingli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit b66fd1b7e93c3210de71426ec6d2593afd90b951
Merge: 698e319 ba7a530
Author: deqingli <an...@gmail.com>
AuthorDate: Tue Sep 4 17:41:11 2018 +0800
Merge branch 'master' of https://github.com/apache/incubator-echarts
test/axis-multiple.html | 38 +-------------------------------------
1 file changed, 1 insertion(+), 37 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 04/04: test(sankey): text sankey diagram with
new vertical layout
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deqingli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 2cc14b4d5ba2181291375b2636b6339d844f3f8f
Author: deqingli <an...@gmail.com>
AuthorDate: Tue Sep 4 17:45:50 2018 +0800
test(sankey): text sankey diagram with new vertical layout
---
test/sankey-vertical.html | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/test/sankey-vertical.html b/test/sankey-vertical.html
index e2f7c26..8735118 100644
--- a/test/sankey-vertical.html
+++ b/test/sankey-vertical.html
@@ -44,6 +44,7 @@ under the License.
chart.resize();
};
+ // Data used to test the circle
// var data = {
// nodes: [
// {name: 'Brazil'},
@@ -180,16 +181,13 @@ under the License.
type: 'sankey',
layout:'none',
bottom: '10%',
- // focusNodeAdjacency: 'allEdges',
+ focusNodeAdjacency: 'allEdges',
data: testData.nodes,
links: testData.links,
orient: 'vertical',
label: {
- position: 'left'
+ position: 'top'
},
- // Used to test when the data is null whether it is work well.
- // data: [],
- // links: [],
lineStyle: {
normal: {
color: 'source',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/04: fix(sankey): fix in the vertical orient
the leaf nodes align in the view
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deqingli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 698e3190750cf3947b94f57d4d84a8fc61c43a0a
Author: deqingli <an...@gmail.com>
AuthorDate: Tue Sep 4 17:40:59 2018 +0800
fix(sankey): fix in the vertical orient the leaf nodes align in the view
---
src/chart/sankey/sankeyLayout.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/chart/sankey/sankeyLayout.js b/src/chart/sankey/sankeyLayout.js
index f37fb84..05add6d 100644
--- a/src/chart/sankey/sankeyLayout.js
+++ b/src/chart/sankey/sankeyLayout.js
@@ -166,7 +166,7 @@ function computeNodeBreadths(nodes, edges, nodeWidth, width, height, orient) {
}
}
- moveSinksRight(nodes, x);
+ moveSinksRight(nodes, x, orient);
if (orient === 'vertical') {
kx = (height - nodeWidth) / (x - 1);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 03/04: test(sankey): test sankey vertical
layout with big data
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deqingli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit f1194b09315640ef7785bbf60af4960447118c7a
Author: deqingli <an...@gmail.com>
AuthorDate: Tue Sep 4 17:44:36 2018 +0800
test(sankey): test sankey vertical layout with big data
---
test/sankey-vertical-energy.html | 101 +++++++++++++++++++++++++++++++++++++++
1 file changed, 101 insertions(+)
diff --git a/test/sankey-vertical-energy.html b/test/sankey-vertical-energy.html
new file mode 100644
index 0000000..183d886
--- /dev/null
+++ b/test/sankey-vertical-energy.html
@@ -0,0 +1,101 @@
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<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>
+ </head>
+ <body>
+ <style>
+ html, body, #main {
+ width: 100%;
+ height: 100%;
+ /*border: 1px solid #000;*/
+ }
+ </style>
+ <div id="main"><div>
+ <script>
+ require([
+ 'echarts'
+ // 'echarts/chart/sankey',
+ // 'echarts/component/tooltip'
+ ], function (echarts) {
+
+ var chart = echarts.init(document.getElementById('main'), null, {
+
+ });
+
+ window.onresize = function () {
+ chart.resize();
+ };
+
+ chart.on('click', function (params) {
+ console.log(params, params.data);
+ });
+
+
+ $.getJSON('./data/energy.json')
+ .done(function(data) {
+
+ data.nodes[0].itemStyle = {
+ normal: {
+ color: 'red'
+ }
+ };
+ chart.setOption({
+ tooltip: {
+ trigger: 'item',
+ triggerOn: 'mousemove'
+ },
+ animation: false,
+ series: [
+ {
+ type: 'sankey',
+ bottom: '18%',
+ left: '10%',
+ layout:'none',
+ focusNodeAdjacency: 'inEdges',
+ orient: 'vertical',
+ label: {
+ position: 'bottom',
+ rotate: -90,
+ verticalAlign: 'middle',
+ align: 'left'
+ },
+ data: data.nodes,
+ links: data.links,
+ lineStyle: {
+ normal: {
+ color: 'source',
+ curveness: 0.5
+ }
+ }
+ }
+ ]
+ });
+ });
+ });
+ </script>
+ </body>
+</html>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org