capdag 0.188.482 → 0.190.488

package/cap-fab-renderer.js

@@ -382,9 +382,11 @@ function layoutForMode(mode) {
       'elk.layered.spacing.nodeNodeBetweenLayers': 220,
       'elk.layered.spacing.edgeEdgeBetweenLayers': 44,
       'elk.layered.spacing.edgeNodeBetweenLayers': 52,
+      'elk.layered.spacing.baseValue': 40,
+      'elk.layered.nodePlacement.favorStraightEdges': true,
       'elk.spacing.edgeEdge': 34,
       'elk.spacing.edgeNode': 42,
-      'elk.spacing.nodeNode': 118,
+      'elk.spacing.nodeNode': 168,
     });
   }
   if (mode === 'strand') {
@@ -540,10 +542,8 @@ function buildStylesheet() {
         // text no longer reads as floating metadata.
         'text-rotation': 'autorotate',
         'text-margin-y': -6,
-        'curve-style': 'data(curveStyle)',
-        'control-point-step-size': 'data(controlPointStepSize)',
-        'control-point-distances': 'data(controlPointDistances)',
-        'control-point-weights': 'data(controlPointWeights)',
+        'curve-style': 'bezier',
+        'control-point-step-size': 40,
         'width': 1.5,
         'line-color': 'data(color)',
         'target-arrow-color': 'data(color)',
@@ -553,6 +553,15 @@ function buildStylesheet() {
         'transition-duration': '0.2s',
       },
     },
+    {
+      selector: 'edge.crowded-edge',
+      style: {
+        'curve-style': 'unbundled-bezier',
+        'control-point-step-size': 'data(controlPointStepSize)',
+        'control-point-distances': 'data(controlPointDistances)',
+        'control-point-weights': 'data(controlPointWeights)',
+      },
+    },
     {
       selector: 'edge.highlighted',
       style: { 'width': 2.5, 'z-index': 999 },
@@ -1033,15 +1042,14 @@ function annotateCrowdedBrowseEdges(edges) {
     const crowdCount = Math.max(sourceCount, targetCount);
 
     if (crowdCount <= 2) {
-      edge.curveStyle = 'bezier';
-      edge.controlPointStepSize = 40;
+      edge.crowdedClass = '';
       continue;
     }
 
     const sourceOffset = crowdOffsets(sourceIndex.get(edge.id), sourceCount, 18, 64);
     const targetOffset = crowdOffsets(targetIndex.get(edge.id), targetCount, 18, 64);
 
-    edge.curveStyle = 'unbundled-bezier';
+    edge.crowdedClass = 'crowded-edge';
     edge.controlPointDistances = `${sourceOffset} ${targetOffset}`;
     edge.controlPointWeights = '0.22 0.78';
     edge.controlPointStepSize = 56;
@@ -1149,11 +1157,11 @@ function browseCytoscapeElements(built) {
         fullUrn: edge.capability.urn,
         capFabEdgeIndex: edge.capFabEdgeIndex,
         color: edge.color,
-        curveStyle: edge.curveStyle || 'bezier',
-        controlPointStepSize: edge.controlPointStepSize || 40,
-        controlPointDistances: edge.controlPointDistances || '',
-        controlPointWeights: edge.controlPointWeights || '',
+        controlPointStepSize: edge.controlPointStepSize || 56,
+        controlPointDistances: edge.controlPointDistances || '0 0',
+        controlPointWeights: edge.controlPointWeights || '0.22 0.78',
       },
+      classes: edge.crowdedClass || '',
     };
   });
   return nodeElements.concat(edgeElements);

package/package.json

@@ -40,5 +40,5 @@
     "pretest": "npm run build:parser",
     "test": "node capdag.test.js"
   },
-  "version": "0.188.482"
+  "version": "0.190.488"
 }