loopback edge control points further out noflo/noflo-ui#53 (comment)

flowhub · May 25, 2014 · 2d372c2 · 2d372c2
1 parent ce2b2cb
commit 2d372c2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -1,11 +1,12 @@
 {
   "name": "the-graph",
+  "version": "0.2.3",
   "keywords": [
     "graph",
     "flow",
     "noflo"
   ],
-  "description": "Polymer elements for graph editing",
+  "description": "HTML custom elements for dataflow graph editing",
   "dependencies": {
     "polymer": "Polymer/polymer#0.2.4",
     "hammerjs": "~1.1.2",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "the-graph",
-  "version": "0.0.0",
+  "version": "0.2.3",
   "description": "polymer components for flow-based programming graph editing",
   "main": "the-graph-editor/index.html",
   "dependencies": {

diff --git a/the-graph/the-graph-edge.js b/the-graph/the-graph-edge.js
@@ -133,18 +133,19 @@
       // Organic / curved edge
       var c1X, c1Y, c2X, c2Y;
       if (targetX-5 < sourceX) {
+        var curveFactor = (sourceX - targetX) * CURVE / 200;
         if (Math.abs(targetY-sourceY) < TheGraph.nodeSize/2) {
           // Loopback
-          c1X = sourceX + CURVE;
-          c1Y = sourceY - CURVE;
-          c2X = targetX - CURVE;
-          c2Y = targetY - CURVE;
+          c1X = sourceX + curveFactor;
+          c1Y = sourceY - curveFactor;
+          c2X = targetX - curveFactor;
+          c2Y = targetY - curveFactor;
         } else {
           // Stick out some
-          c1X = sourceX + CURVE;
-          c1Y = sourceY + (targetY > sourceY ? CURVE : -CURVE);
-          c2X = targetX - CURVE;
-          c2Y = targetY + (targetY > sourceY ? -CURVE : CURVE);
+          c1X = sourceX + curveFactor;
+          c1Y = sourceY + (targetY > sourceY ? curveFactor : -curveFactor);
+          c2X = targetX - curveFactor;
+          c2Y = targetY + (targetY > sourceY ? -curveFactor : curveFactor);
         }
       } else {
         // Controls halfway between