[GitHub] [incubator-echarts] plainheart commented on a change in pull request #12590: feat(graph): graph support multiple edges, for #6811
plainheart commented on a change in pull request #12590:
URL:
https://github.com/apache/incubator-echarts/pull/12590#discussion_r447469958
##
File path: src/chart/helper/multipleGraphEdgeHelper.js
##
@@ -0,0 +1,229 @@
+/*
+* 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.
+*/
+
+import * as zrUtil from 'zrender/src/core/util';
+
+var KEY_DELIMITER = '-->';
+/**
+ * params handler
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ * @returns {*}
+ */
+var getAutoCurvenessParams = function (seriesModel) {
+return seriesModel.get('autoCurveness') || null;
+};
+
+/**
+ * Generate a list of edge curvatures, 20 is the default
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ * @param {number} appendLength
+ * @return 20 => [0, -0.2, 0.2, -0.4, 0.4, -0.6, 0.6, -0.8, 0.8, -1, 1, -1.2,
1.2, -1.4, 1.4, -1.6, 1.6, -1.8, 1.8, -2]
+ */
+var createCurveness = function (seriesModel, appendLength) {
+var autoCurvenessParmas = getAutoCurvenessParams(seriesModel);
+var length = 20;
+var curvenessList = [];
+
+// handler the function set
+if (typeof autoCurvenessParmas === 'number') {
+length = autoCurvenessParmas;
+}
+else if (zrUtil.isArray(autoCurvenessParmas)) {
+seriesModel.__curvenessList = autoCurvenessParmas;
+return;
+}
+
+// append length
+if (appendLength > length) {
+length = appendLength;
+}
+
+// make sure the length is even
+var len = length % 2 ? length + 2 : length + 3;
+curvenessList = [];
+
+for (var i = 0; i < len; i++) {
+curvenessList.push((i % 2 ? i + 1 : i) / 10 * (i % 2 ? -1 : 1));
+}
+seriesModel.__curvenessList = curvenessList;
+};
+
+/**
+ * Create different cache key data in the positive and negative directions, in
order to set the curvature later
+ * @param {number|string|module:echarts/data/Graph.Node} n1
+ * @param {number|string|module:echarts/data/Graph.Node} n2
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ * @returns {string} key
+ */
+var getKeyOfEdges = function (n1, n2, seriesModel) {
+var source = [n1.id, n1.dataIndex].join('.');
+var target = [n2.id, n2.dataIndex].join('.');
+return [seriesModel.uid, source, target].join(KEY_DELIMITER);
+};
+
+/**
+ * get opposite key
+ * @param {string} key
+ * @returns {string}
+ */
+var getOppositeKey = function (key) {
+var keys = key.split(KEY_DELIMITER);
+return [keys[0], keys[2], keys[1]].join(KEY_DELIMITER);
+};
+
+/**
+ * get edgeMap with key
+ * @param edge
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ */
+var getEdgeFromMap = function (edge, seriesModel) {
+var key = getKeyOfEdges(edge.node1, edge.node2, seriesModel);
+return seriesModel.__edgeMap[key];
+};
+
+/**
+ * calculate all cases total length
+ * @param edge
+ * @param seriesModel
+ * @returns {number}
+ */
+var getTotalLengthBetweenNodes = function (edge, seriesModel) {
+var len = getEdgeMapLengthWithKey(getKeyOfEdges(edge.node1, edge.node2,
seriesModel), seriesModel);
+var lenV = getEdgeMapLengthWithKey(getKeyOfEdges(edge.node2, edge.node1,
seriesModel), seriesModel);
+
+return len + lenV;
+};
+
+/**
+ *
+ * @param key
+ */
+var getEdgeMapLengthWithKey = function (key, seriesModel) {
+var edgeMap = seriesModel.__edgeMap;
+return edgeMap[key] ? edgeMap[key].length : 0;
+};
+
+/**
+ * Count the number of edges between the same two points, used to obtain the
curvature table and the parity of the edge
+ * @see /graph/GraphSeries.js@getInitialData
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ */
+export function initCurvenessList(seriesModel) {
+if (!getAutoCurvenessParams(seriesModel)) {
+return;
+}
+
+seriesModel.__curvenessList = [];
+seriesModel.__edgeMap = {};
+// calc the array of curveness List
+createCurveness(seriesModel);
+}
+
+/**
+ * set edgeMap with key
+ * @param {number|string|module:echarts/data/Graph.Node} n1
+ * @param {number|string|module:echarts/data/Graph.Node} n2
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ * @param {number} index
+ */
+export function createEdgeMapForCurveness(n1, n2, seriesModel, index) {
+if (!getAutoCurvenessParam
[GitHub] [incubator-echarts] plainheart commented on a change in pull request #12590: feat(graph): graph support multiple edges, for #6811
plainheart commented on a change in pull request #12590:
URL:
https://github.com/apache/incubator-echarts/pull/12590#discussion_r447469958
##
File path: src/chart/helper/multipleGraphEdgeHelper.js
##
@@ -0,0 +1,229 @@
+/*
+* 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.
+*/
+
+import * as zrUtil from 'zrender/src/core/util';
+
+var KEY_DELIMITER = '-->';
+/**
+ * params handler
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ * @returns {*}
+ */
+var getAutoCurvenessParams = function (seriesModel) {
+return seriesModel.get('autoCurveness') || null;
+};
+
+/**
+ * Generate a list of edge curvatures, 20 is the default
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ * @param {number} appendLength
+ * @return 20 => [0, -0.2, 0.2, -0.4, 0.4, -0.6, 0.6, -0.8, 0.8, -1, 1, -1.2,
1.2, -1.4, 1.4, -1.6, 1.6, -1.8, 1.8, -2]
+ */
+var createCurveness = function (seriesModel, appendLength) {
+var autoCurvenessParmas = getAutoCurvenessParams(seriesModel);
+var length = 20;
+var curvenessList = [];
+
+// handler the function set
+if (typeof autoCurvenessParmas === 'number') {
+length = autoCurvenessParmas;
+}
+else if (zrUtil.isArray(autoCurvenessParmas)) {
+seriesModel.__curvenessList = autoCurvenessParmas;
+return;
+}
+
+// append length
+if (appendLength > length) {
+length = appendLength;
+}
+
+// make sure the length is even
+var len = length % 2 ? length + 2 : length + 3;
+curvenessList = [];
+
+for (var i = 0; i < len; i++) {
+curvenessList.push((i % 2 ? i + 1 : i) / 10 * (i % 2 ? -1 : 1));
+}
+seriesModel.__curvenessList = curvenessList;
+};
+
+/**
+ * Create different cache key data in the positive and negative directions, in
order to set the curvature later
+ * @param {number|string|module:echarts/data/Graph.Node} n1
+ * @param {number|string|module:echarts/data/Graph.Node} n2
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ * @returns {string} key
+ */
+var getKeyOfEdges = function (n1, n2, seriesModel) {
+var source = [n1.id, n1.dataIndex].join('.');
+var target = [n2.id, n2.dataIndex].join('.');
+return [seriesModel.uid, source, target].join(KEY_DELIMITER);
+};
+
+/**
+ * get opposite key
+ * @param {string} key
+ * @returns {string}
+ */
+var getOppositeKey = function (key) {
+var keys = key.split(KEY_DELIMITER);
+return [keys[0], keys[2], keys[1]].join(KEY_DELIMITER);
+};
+
+/**
+ * get edgeMap with key
+ * @param edge
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ */
+var getEdgeFromMap = function (edge, seriesModel) {
+var key = getKeyOfEdges(edge.node1, edge.node2, seriesModel);
+return seriesModel.__edgeMap[key];
+};
+
+/**
+ * calculate all cases total length
+ * @param edge
+ * @param seriesModel
+ * @returns {number}
+ */
+var getTotalLengthBetweenNodes = function (edge, seriesModel) {
+var len = getEdgeMapLengthWithKey(getKeyOfEdges(edge.node1, edge.node2,
seriesModel), seriesModel);
+var lenV = getEdgeMapLengthWithKey(getKeyOfEdges(edge.node2, edge.node1,
seriesModel), seriesModel);
+
+return len + lenV;
+};
+
+/**
+ *
+ * @param key
+ */
+var getEdgeMapLengthWithKey = function (key, seriesModel) {
+var edgeMap = seriesModel.__edgeMap;
+return edgeMap[key] ? edgeMap[key].length : 0;
+};
+
+/**
+ * Count the number of edges between the same two points, used to obtain the
curvature table and the parity of the edge
+ * @see /graph/GraphSeries.js@getInitialData
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ */
+export function initCurvenessList(seriesModel) {
+if (!getAutoCurvenessParams(seriesModel)) {
+return;
+}
+
+seriesModel.__curvenessList = [];
+seriesModel.__edgeMap = {};
+// calc the array of curveness List
+createCurveness(seriesModel);
+}
+
+/**
+ * set edgeMap with key
+ * @param {number|string|module:echarts/data/Graph.Node} n1
+ * @param {number|string|module:echarts/data/Graph.Node} n2
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ * @param {number} index
+ */
+export function createEdgeMapForCurveness(n1, n2, seriesModel, index) {
+if (!getAutoCurvenessParam
[GitHub] [incubator-echarts] plainheart commented on a change in pull request #12590: feat(graph): graph support multiple edges, for #6811
plainheart commented on a change in pull request #12590:
URL:
https://github.com/apache/incubator-echarts/pull/12590#discussion_r447325330
##
File path: src/chart/graph/GraphSeries.js
##
@@ -25,6 +25,8 @@ import Model from '../../model/Model';
import {encodeHTML} from '../../util/format';
import createGraphFromNodeEdge from '../helper/createGraphFromNodeEdge';
import LegendVisualProvider from '../../visual/LegendVisualProvider';
+import {initCurvenessList} from '../helper/multipleGraphEdgeHelper';
+import {createEdgeMapForCurveness} from
'../../chart/helper/multipleGraphEdgeHelper';
Review comment:
Could be merged as following
```js
import {initCurvenessList, createEdgeMapForCurveness} from
'../helper/multipleGraphEdgeHelper';
```
##
File path: src/data/Graph.js
##
@@ -137,9 +137,10 @@ graphProto.getNodeById = function (id) {
* @param {number|string|module:echarts/data/Graph.Node} n1
* @param {number|string|module:echarts/data/Graph.Node} n2
* @param {number} [dataIndex=-1]
+ * @param {module:echarts/model/SeriesModel} seriesModel
* @return {module:echarts/data/Graph.Edge}
*/
-graphProto.addEdge = function (n1, n2, dataIndex) {
+graphProto.addEdge = function (n1, n2, dataIndex, seriesModel) {
Review comment:
The parameter `seriesModel` looks unused, consider removing it.
##
File path: src/chart/graph/forceLayout.js
##
@@ -84,11 +85,16 @@ export default function (ecModel) {
d = (edgeLength[0] + edgeLength[1]) / 2;
}
var edgeModel = edge.getModel();
+var curveness = zrUtil.retrieve3(
+edge.getModel().get('lineStyle.curveness'),
Review comment:
`edge.getModel()` could be replaced by the variable `edgeModel` declared
in previous code line.
##
File path: src/chart/helper/createGraphFromNodeEdge.js
##
@@ -39,12 +39,14 @@ export default function (nodes, edges, seriesModel,
directed, beforeLink) {
var linkNameList = [];
var validEdges = [];
var linkCount = 0;
+
for (var i = 0; i < edges.length; i++) {
var link = edges[i];
var source = link.source;
var target = link.target;
+
// addEdge may fail when source or target not exists
-if (graph.addEdge(source, target, linkCount)) {
+if (graph.addEdge(source, target, linkCount, seriesModel)) {
Review comment:
The parameter `seriesModel` looks unused, consider removing it.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart commented on a change in pull request #12590: feat(graph): graph support multiple edges, for #6811
plainheart commented on a change in pull request #12590:
URL:
https://github.com/apache/incubator-echarts/pull/12590#discussion_r439301136
##
File path: src/chart/graph/simpleLayoutHelper.js
##
@@ -31,12 +34,16 @@ export function simpleLayout(seriesModel) {
node.setLayout([+model.get('x'), +model.get('y')]);
});
-simpleLayoutEdge(graph);
+simpleLayoutEdge(graph, seriesModel);
}
-export function simpleLayoutEdge(graph) {
-graph.eachEdge(function (edge) {
-var curveness = edge.getModel().get('lineStyle.curveness') || 0;
+export function simpleLayoutEdge(graph, seriesModel) {
+graph.eachEdge(function (edge, index) {
+var curveness = zrUtil.retrieve3(
+edge.getModel().get('lineStyle.curveness') || null,
Review comment:
Is it necessary to add `|| null`?
If failed to get `lineStyle.curveness` from model, it will return
`undefined`, and as we known, `undefined == null`.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart commented on a change in pull request #12590: feat(graph): graph support multiple edges, for #6811
plainheart commented on a change in pull request #12590:
URL:
https://github.com/apache/incubator-echarts/pull/12590#discussion_r439342427
##
File path: src/chart/graph/simpleLayoutHelper.js
##
@@ -31,12 +34,16 @@ export function simpleLayout(seriesModel) {
node.setLayout([+model.get('x'), +model.get('y')]);
});
-simpleLayoutEdge(graph);
+simpleLayoutEdge(graph, seriesModel);
}
-export function simpleLayoutEdge(graph) {
-graph.eachEdge(function (edge) {
-var curveness = edge.getModel().get('lineStyle.curveness') || 0;
+export function simpleLayoutEdge(graph, seriesModel) {
+graph.eachEdge(function (edge, index) {
+var curveness = zrUtil.retrieve3(
+edge.getModel().get('lineStyle.curveness') || null,
Review comment:
Just `!=` but not `!==`.
`undefined != null` is `false`, so I think there is no need to worry about
it.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart commented on a change in pull request #12590: feat(graph): graph support multiple edges, for #6811
plainheart commented on a change in pull request #12590:
URL:
https://github.com/apache/incubator-echarts/pull/12590#discussion_r439301136
##
File path: src/chart/graph/simpleLayoutHelper.js
##
@@ -31,12 +34,16 @@ export function simpleLayout(seriesModel) {
node.setLayout([+model.get('x'), +model.get('y')]);
});
-simpleLayoutEdge(graph);
+simpleLayoutEdge(graph, seriesModel);
}
-export function simpleLayoutEdge(graph) {
-graph.eachEdge(function (edge) {
-var curveness = edge.getModel().get('lineStyle.curveness') || 0;
+export function simpleLayoutEdge(graph, seriesModel) {
+graph.eachEdge(function (edge, index) {
+var curveness = zrUtil.retrieve3(
+edge.getModel().get('lineStyle.curveness') || null,
Review comment:
Is there necessay to add `|| null`?
If failed to get `lineStyle.curveness` from model, it will return
`undefined`, and as we known, `undefined == null`.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart commented on a change in pull request #12590: feat(graph): graph support multiple edges, for #6811
plainheart commented on a change in pull request #12590:
URL:
https://github.com/apache/incubator-echarts/pull/12590#discussion_r439297000
##
File path: src/chart/helper/multipleGraphEdgeHelper.js
##
@@ -0,0 +1,236 @@
+/*
+* 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.
+*/
+
+var KEY_DELIMITER = '-->';
+/**
+ * params handler
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ * @returns {*}
+ */
+var getAutoCurvenessParams = function (seriesModel) {
+return seriesModel.get('autoCurveness') || null;
+};
+
+/**
+ * Generate a list of edge curvatures, 20 is the default
+ * @param {module:echarts/model/SeriesModel} seriesModel
+ * @param {number} appendLength
+ * @return 20 => [0, -0.2, 0.2, -0.4, 0.4, -0.6, 0.6, -0.8, 0.8, -1, 1, -1.2,
1.2, -1.4, 1.4, -1.6, 1.6, -1.8, 1.8, -2]
+ */
+var createCurveness = function (seriesModel, appendLength) {
+var autoCurvenessParmas = getAutoCurvenessParams(seriesModel);
+var length = 20;
+var curvenessList = [];
+
+// handler the function set
+if (typeof autoCurvenessParmas === 'number') {
+length = autoCurvenessParmas;
+}
+else if (Object.prototype.toString.call(autoCurvenessParmas) === '[object
Array]') {
Review comment:
This feature looks great!
And here is a tip for this code line:
We can use the common function `zrUtil.isArray` to judge if it is an array.
Sure, it needs to be imported from 'zrender/src/core/util' like this
`import * as zrUtil from 'zrender/src/core/util'`
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
