diff --git a/cypress/platform/current.html b/cypress/platform/current.html
index 457d6dafe..48844c537 100644
--- a/cypress/platform/current.html
+++ b/cypress/platform/current.html
@@ -19,17 +19,17 @@
info below
- stateDiagram-v2
-
- [*] --> S1
- state "Some long name" as S1: The
+ flowchart TD
+ db[(PostgreSQL
database)]
+ broker{RabbitMQ
broker}
+ db --> broker
+ box --> broker
-
- stateDiagram-v2
+ broker --> db
+ broker --> box
+ db --> broker
+ box --> broker
- [*] --> S1
- state "Some long name" as S1: The description\nwith multiple lines
-
flowchart LR
A{{A}}-- apa -->B{{B}};
@@ -59,11 +59,6 @@ graph LR
State4 --> [*]
}
-
- stateDiagram-v2
- [*] --> Still
- Still --> [*]
-
stateDiagram-v2
[*] --> Still
diff --git a/src/dagre-wrapper/edges.js b/src/dagre-wrapper/edges.js
index a069705dd..fd5443f3e 100644
--- a/src/dagre-wrapper/edges.js
+++ b/src/dagre-wrapper/edges.js
@@ -116,8 +116,13 @@ export const insertEdge = function(elem, e, edge, clusterDb, diagramType, graph)
if (head.intersect && tail.intersect) {
points = points.slice(1, edge.points.length - 1);
-
points.unshift(tail.intersect(points[0]));
+ logger.info(
+ 'Last point',
+ points[points.length - 1],
+ head,
+ head.intersect(points[points.length - 1])
+ );
points.push(head.intersect(points[points.length - 1]));
}
if (edge.toCluster) {
diff --git a/src/dagre-wrapper/index.js b/src/dagre-wrapper/index.js
index bcc121625..348f7b5b3 100644
--- a/src/dagre-wrapper/index.js
+++ b/src/dagre-wrapper/index.js
@@ -93,8 +93,8 @@ const recursiveRender = (_elem, graph, diagramtype, parentCluster) => {
// Move the nodes to the correct place
graph.nodes().forEach(function(v) {
const node = graph.node(v);
- // log.trace('Position ' + v + ': ' + JSON.stringify(graph.node(v)));
- log.trace(
+ log.trace('Position ' + v + ': ' + JSON.stringify(graph.node(v)));
+ log.info(
'Position ' + v + ': (' + node.x,
',' + node.y,
') width: ',
diff --git a/src/dagre-wrapper/intersect/intersect-node.js b/src/dagre-wrapper/intersect/intersect-node.js
index 6e452990a..8164f0f59 100644
--- a/src/dagre-wrapper/intersect/intersect-node.js
+++ b/src/dagre-wrapper/intersect/intersect-node.js
@@ -1,5 +1,6 @@
module.exports = intersectNode;
function intersectNode(node, point) {
+ console.info('Intersect Node');
return node.intersect(point);
}
diff --git a/src/dagre-wrapper/nodes.js b/src/dagre-wrapper/nodes.js
index dcb61c298..624dc5272 100644
--- a/src/dagre-wrapper/nodes.js
+++ b/src/dagre-wrapper/nodes.js
@@ -19,6 +19,8 @@ const question = (parent, node) => {
{ x: 0, y: -s / 2 }
];
+ logger.info('Question main (Circle)');
+
const questionElem = insertPolygonShape(shapeSvg, s, s, points);
updateNodeBounds(node, questionElem);
node.intersect = function(point) {
@@ -412,10 +414,13 @@ const circle = (parent, node) => {
.attr('width', bbox.width + node.padding)
.attr('height', bbox.height + node.padding);
+ logger.info('Circle main');
+
updateNodeBounds(node, circle);
node.intersect = function(point) {
- return intersect.circle(node, node.rx, point);
+ logger.info('Circle intersect', node, bbox.width / 2 + halfPadding, point);
+ return intersect.circle(node, bbox.width / 2 + halfPadding, point);
};
return shapeSvg;