eg-graph - npm Package Compare versions

Comparing version 0.0.6 to 0.0.7

lib/layouter/sugiyama/normalize.js

@@ -35,3 +35,5 @@ 'use strict';
             width: d.width + edgeMargin,
+            origWidth: d.width + edgeMargin,
             height: 0,
+            origHeight: 0,
             layer: i
@@ -38,0 +40,0 @@ });

lib/layouter/sugiyama/position-assignment/brandes/index.js

@@ -279,4 +279,4 @@ 'use strict';
       var uNode = g.vertex(u);
-      xMin = Math.min(xMin, uNode.x - uNode.width / 2);
-      yMin = Math.min(yMin, uNode.y - uNode.height / 2);
+      xMin = Math.min(xMin, uNode.x - uNode.origWidth / 2);
+      yMin = Math.min(yMin, uNode.y - uNode.origHeight / 2);
     }
@@ -283,0 +283,0 @@ } catch (err) {

lib/renderer/edge-function.js

@@ -18,3 +18,4 @@ 'use strict';
       vd: d.target.data,
-      d: d.data
+      d: d.data,
+      g: d.g
     };
@@ -21,0 +22,0 @@ return f.call(this, arg, i);

lib/renderer/index.js

@@ -11,6 +11,6 @@ 'use strict';
 
+var _Set = require('babel-runtime/core-js/set')['default'];
+
 var _getIterator = require('babel-runtime/core-js/get-iterator')['default'];
 
-var _Set = require('babel-runtime/core-js/set')['default'];
-
 var _WeakMap = require('babel-runtime/core-js/weak-map')['default'];
@@ -32,6 +32,10 @@
 
-var _layouter = require('../layouter');
+var _IdentityTransformer = require('../transformer/identity');
 
-var _layouter2 = _interopRequireDefault(_layouter);
+var _IdentityTransformer2 = _interopRequireDefault(_IdentityTransformer);
 
+var _SugiyamaLayouter = require('../layouter/sugiyama');
+
+var _SugiyamaLayouter2 = _interopRequireDefault(_SugiyamaLayouter);
+
 var _verticesRenderer = require('./vertices-renderer');
@@ -60,4 +64,3 @@
 var render = function render(_ref) {
-  var vertexVisibility = _ref.vertexVisibility;
-  var edgeVisibility = _ref.edgeVisibility;
+  var transformer = _ref.transformer;
   var layouter = _ref.layouter;
@@ -69,139 +72,6 @@ var vertexRenderer = _ref.vertexRenderer;
     selection.each(function (gOrig) {
-      var g = new _Graph2['default']();
-      var _iteratorNormalCompletion = true;
-      var _didIteratorError = false;
-      var _iteratorError = undefined;
+      var g = transformer.transform(gOrig),
+          positions = layouter.layout(g),
+          element = _d32['default'].select(this);
 
-      try {
-        for (var _iterator = _getIterator(gOrig.vertices()), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-          var u = _step.value;
-
-          g.addVertex(u, gOrig.vertex(u));
-        }
-      } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion && _iterator['return']) {
-            _iterator['return']();
-          }
-        } finally {
-          if (_didIteratorError) {
-            throw _iteratorError;
-          }
-        }
-      }
-
-      var _iteratorNormalCompletion2 = true;
-      var _didIteratorError2 = false;
-      var _iteratorError2 = undefined;
-
-      try {
-        for (var _iterator2 = _getIterator(gOrig.edges()), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-          var _step2$value = _slicedToArray(_step2.value, 2);
-
-          var u = _step2$value[0];
-          var v = _step2$value[1];
-
-          var ud = gOrig.vertex(u),
-              vd = gOrig.vertex(v),
-              d = gOrig.edge(u, v);
-          if (edgeVisibility({ u: u, v: v, ud: ud, vd: vd, d: d })) {
-            g.addEdge(u, v, gOrig.edge(u, v));
-          }
-        }
-      } catch (err) {
-        _didIteratorError2 = true;
-        _iteratorError2 = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion2 && _iterator2['return']) {
-            _iterator2['return']();
-          }
-        } finally {
-          if (_didIteratorError2) {
-            throw _iteratorError2;
-          }
-        }
-      }
-
-      var _iteratorNormalCompletion3 = true;
-      var _didIteratorError3 = false;
-      var _iteratorError3 = undefined;
-
-      try {
-        for (var _iterator3 = _getIterator(g.vertices()), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-          var u = _step3.value;
-
-          if (!vertexVisibility({ u: u, d: g.vertex(u) })) {
-            var _iteratorNormalCompletion6 = true;
-            var _didIteratorError6 = false;
-            var _iteratorError6 = undefined;
-
-            try {
-              for (var _iterator6 = _getIterator(g.inVertices(u)), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
-                var v = _step6.value;
-                var _iteratorNormalCompletion7 = true;
-                var _didIteratorError7 = false;
-                var _iteratorError7 = undefined;
-
-                try {
-                  for (var _iterator7 = _getIterator(g.outVertices(u)), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
-                    var w = _step7.value;
-
-                    g.addEdge(v, w);
-                  }
-                } catch (err) {
-                  _didIteratorError7 = true;
-                  _iteratorError7 = err;
-                } finally {
-                  try {
-                    if (!_iteratorNormalCompletion7 && _iterator7['return']) {
-                      _iterator7['return']();
-                    }
-                  } finally {
-                    if (_didIteratorError7) {
-                      throw _iteratorError7;
-                    }
-                  }
-                }
-              }
-            } catch (err) {
-              _didIteratorError6 = true;
-              _iteratorError6 = err;
-            } finally {
-              try {
-                if (!_iteratorNormalCompletion6 && _iterator6['return']) {
-                  _iterator6['return']();
-                }
-              } finally {
-                if (_didIteratorError6) {
-                  throw _iteratorError6;
-                }
-              }
-            }
-
-            g.removeVertex(u);
-          }
-        }
-      } catch (err) {
-        _didIteratorError3 = true;
-        _iteratorError3 = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion3 && _iterator3['return']) {
-            _iterator3['return']();
-          }
-        } finally {
-          if (_didIteratorError3) {
-            throw _iteratorError3;
-          }
-        }
-      }
-
-      var positions = layouter.layout(g);
-
-      var element = _d32['default'].select(this);
-
       var contentsSelection = element.selectAll('g.contents');
@@ -225,9 +95,9 @@ if (contentsSelection.empty()) {
 
-      var _iteratorNormalCompletion4 = true;
-      var _didIteratorError4 = false;
-      var _iteratorError4 = undefined;
+      var _iteratorNormalCompletion = true;
+      var _didIteratorError = false;
+      var _iteratorError = undefined;
 
       try {
-        for (var _iterator4 = _getIterator(g.vertices()), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-          var u = _step4.value;
+        for (var _iterator = _getIterator(g.vertices()), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var u = _step.value;
 
@@ -243,2 +113,3 @@ var d = g.vertex(u);
           }
+          vertices[u].g = g;
           vertices[u].px = vertices[u].x;
@@ -253,12 +124,12 @@ vertices[u].py = vertices[u].y;
       } catch (err) {
-        _didIteratorError4 = true;
-        _iteratorError4 = err;
+        _didIteratorError = true;
+        _iteratorError = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion4 && _iterator4['return']) {
-            _iterator4['return']();
+          if (!_iteratorNormalCompletion && _iterator['return']) {
+            _iterator['return']();
           }
         } finally {
-          if (_didIteratorError4) {
-            throw _iteratorError4;
+          if (_didIteratorError) {
+            throw _iteratorError;
           }
@@ -268,12 +139,12 @@ }
 
-      var _iteratorNormalCompletion5 = true;
-      var _didIteratorError5 = false;
-      var _iteratorError5 = undefined;
+      var _iteratorNormalCompletion2 = true;
+      var _didIteratorError2 = false;
+      var _iteratorError2 = undefined;
 
       try {
-        for (var _iterator5 = _getIterator(g.edges()), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-          var _step5$value = _slicedToArray(_step5.value, 2);
+        for (var _iterator2 = _getIterator(g.edges()), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+          var _step2$value = _slicedToArray(_step2.value, 2);
 
-          var u = _step5$value[0];
-          var v = _step5$value[1];
+          var u = _step2$value[0];
+          var v = _step2$value[1];
 
@@ -290,2 +161,3 @@ var key = '' + u + ':' + v;
           }
+          edges[key].g = g;
           edges[key].ppoints = edges[key].points;
@@ -297,12 +169,12 @@ edges[key].points = positions.edges[u][v].points;
       } catch (err) {
-        _didIteratorError5 = true;
-        _iteratorError5 = err;
+        _didIteratorError2 = true;
+        _iteratorError2 = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion5 && _iterator5['return']) {
-            _iterator5['return']();
+          if (!_iteratorNormalCompletion2 && _iterator2['return']) {
+            _iterator2['return']();
           }
         } finally {
-          if (_didIteratorError5) {
-            throw _iteratorError5;
+          if (_didIteratorError2) {
+            throw _iteratorError2;
           }
@@ -336,9 +208,4 @@ }
     privates.set(this, {
-      vertexVisibility: function vertexVisibility() {
-        return true;
-      },
-      edgeVisibility: function edgeVisibility() {
-        return true;
-      },
-      layouter: new _layouter2['default'].SugiyamaLayouter().layerMargin(200).vertexMargin(3).edgeMargin(3),
+      transformer: new _IdentityTransformer2['default'](),
+      layouter: new _SugiyamaLayouter2['default']().layerMargin(200).vertexMargin(3).edgeMargin(3),
       vertexRenderer: new _TextVertexRenderer2['default'](),
@@ -363,4 +230,3 @@ edgeRenderer: new _CurvedEdgeRenderer2['default']()
       return render({
-        vertexVisibility: this.vertexVisibility(),
-        edgeVisibility: this.edgeVisibility(),
+        transformer: this.transformer(),
         layouter: this.layouter(),
@@ -372,12 +238,7 @@ vertexRenderer: this.vertexRenderer(),
   }, {
-    key: 'vertexVisibility',
-    value: function vertexVisibility(arg) {
-      return _accessor2['default'](this, privates, 'vertexVisibility', arguments);
+    key: 'transformer',
+    value: function transformer(arg) {
+      return _accessor2['default'](this, privates, 'transformer', arguments);
     }
   }, {
-    key: 'edgeVisibility',
-    value: function edgeVisibility(arg) {
-      return _accessor2['default'](this, privates, 'edgeVisibility', arguments);
-    }
-  }, {
     key: 'layouter',
@@ -384,0 +245,0 @@ value: function layouter(arg) {

lib/renderer/vertex-function.js

@@ -15,3 +15,4 @@ 'use strict';
       u: d.key,
-      d: d.data
+      d: d.data,
+      g: d.g
     };
@@ -18,0 +19,0 @@ return f.call(this, arg, i);

package.json

 {
   "name": "eg-graph",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Graph drawig tool",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Worsened metrics

Total package byte prevSize

172327

-27.46%

Number of package files

55

-27.63%

Lines of code

5214

-28.05%

No dependency changes