Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cluster Fix #293

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Cluster Fix #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e684d1
Cluster Fix
Apr 3, 2020
5340adc
cluster fix
Apr 6, 2020
68806a1
cluster fix
Apr 7, 2020
5c8d815
cluster fix
Apr 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dagre",
"version": "0.8.5",
"version": "0.9.0",
"main": [
"dist/dagre.core.js"
],
Expand Down
23 changes: 20 additions & 3 deletions dist/dagre.core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ function debugOrdering(g) {
}

},{"./graphlib":7,"./lodash":10,"./util":29}],7:[function(require,module,exports){
// eslint-disable-next-line no-redeclare
/* global window */

var graphlib;
Expand Down Expand Up @@ -844,6 +845,7 @@ function canonicalize(attrs) {
}

},{"./acyclic":2,"./add-border-segments":3,"./coordinate-system":4,"./graphlib":7,"./lodash":10,"./nesting-graph":11,"./normalize":12,"./order":17,"./parent-dummy-chains":22,"./position":24,"./rank":26,"./util":29}],10:[function(require,module,exports){
// eslint-disable-next-line no-redeclare
/* global window */

var lodash;
Expand Down Expand Up @@ -958,8 +960,10 @@ function dfs(g, root, nodeSep, weight, height, depths, v) {
var bottom = util.addBorderNode(g, "_bb");
var label = g.node(v);

g.node(top).height = label.height / 2 || 0;
g.setParent(top, v);
label.borderTop = top;
g.node(bottom).height = label.height / 2 || 0;
g.setParent(bottom, v);
label.borderBottom = bottom;

Expand All @@ -985,6 +989,12 @@ function dfs(g, root, nodeSep, weight, height, depths, v) {
});
});

_.forEach(g.edges(), function (edge) {
if(edge.v === v || edge.w === v) {
g.setEdge(edge.v === v ? bottom : edge.v, edge.w === v ? top : edge.w, g.edge(edge));
}
});

if (!g.parent(v)) {
g.setEdge(root, top, { weight: 0, minlen: height + depths[v] });
}
Expand Down Expand Up @@ -1098,6 +1108,9 @@ function undo(g) {
var node = g.node(v);
var origLabel = node.edgeLabel;
var w;
if (!g.node(node.edgeObj.v) || !g.node(node.edgeObj.w)) {
return;
}
g.setEdge(node.edgeObj, origLabel);
while (node.dummy) {
w = g.successors(v)[0];
Expand Down Expand Up @@ -1456,7 +1469,9 @@ function initOrder(g) {
visited[v] = true;
var node = g.node(v);
layers[node.rank].push(v);
_.forEach(g.successors(v), dfs);
_.forEach(_.filter(g.successors(v), function(s) {
return !g.children(s).length;
}), dfs);
}

var orderedVs = _.sortBy(simpleNodes, function(v) { return g.node(v).rank; });
Expand Down Expand Up @@ -2774,7 +2789,9 @@ function asNonCompoundGraph(g) {
}
});
_.forEach(g.edges(), function(e) {
simplified.setEdge(e, g.edge(e));
if (simplified.node(e.v) && simplified.node(e.w)) {
simplified.setEdge(e, g.edge(e));
}
});
return simplified;
}
Expand Down Expand Up @@ -2950,7 +2967,7 @@ function notime(name, fn) {
}

},{"./graphlib":7,"./lodash":10}],30:[function(require,module,exports){
module.exports = "0.8.5";
module.exports = "0.9.0";

},{}]},{},[1])(1)
});
12 changes: 7 additions & 5 deletions dist/dagre.core.min.js
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 20 additions & 3 deletions dist/dagre.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ function debugOrdering(g) {
}

},{"./graphlib":7,"./lodash":10,"./util":29}],7:[function(require,module,exports){
// eslint-disable-next-line no-redeclare
/* global window */

var graphlib;
Expand Down Expand Up @@ -844,6 +845,7 @@ function canonicalize(attrs) {
}

},{"./acyclic":2,"./add-border-segments":3,"./coordinate-system":4,"./graphlib":7,"./lodash":10,"./nesting-graph":11,"./normalize":12,"./order":17,"./parent-dummy-chains":22,"./position":24,"./rank":26,"./util":29}],10:[function(require,module,exports){
// eslint-disable-next-line no-redeclare
/* global window */

var lodash;
Expand Down Expand Up @@ -958,8 +960,10 @@ function dfs(g, root, nodeSep, weight, height, depths, v) {
var bottom = util.addBorderNode(g, "_bb");
var label = g.node(v);

g.node(top).height = label.height / 2 || 0;
g.setParent(top, v);
label.borderTop = top;
g.node(bottom).height = label.height / 2 || 0;
g.setParent(bottom, v);
label.borderBottom = bottom;

Expand All @@ -985,6 +989,12 @@ function dfs(g, root, nodeSep, weight, height, depths, v) {
});
});

_.forEach(g.edges(), function (edge) {
if(edge.v === v || edge.w === v) {
g.setEdge(edge.v === v ? bottom : edge.v, edge.w === v ? top : edge.w, g.edge(edge));
}
});

if (!g.parent(v)) {
g.setEdge(root, top, { weight: 0, minlen: height + depths[v] });
}
Expand Down Expand Up @@ -1098,6 +1108,9 @@ function undo(g) {
var node = g.node(v);
var origLabel = node.edgeLabel;
var w;
if (!g.node(node.edgeObj.v) || !g.node(node.edgeObj.w)) {
return;
}
g.setEdge(node.edgeObj, origLabel);
while (node.dummy) {
w = g.successors(v)[0];
Expand Down Expand Up @@ -1456,7 +1469,9 @@ function initOrder(g) {
visited[v] = true;
var node = g.node(v);
layers[node.rank].push(v);
_.forEach(g.successors(v), dfs);
_.forEach(_.filter(g.successors(v), function(s) {
return !g.children(s).length;
}), dfs);
}

var orderedVs = _.sortBy(simpleNodes, function(v) { return g.node(v).rank; });
Expand Down Expand Up @@ -2774,7 +2789,9 @@ function asNonCompoundGraph(g) {
}
});
_.forEach(g.edges(), function(e) {
simplified.setEdge(e, g.edge(e));
if (simplified.node(e.v) && simplified.node(e.w)) {
simplified.setEdge(e, g.edge(e));
}
});
return simplified;
}
Expand Down Expand Up @@ -2950,7 +2967,7 @@ function notime(name, fn) {
}

},{"./graphlib":7,"./lodash":10}],30:[function(require,module,exports){
module.exports = "0.8.5";
module.exports = "0.9.0";

},{}],31:[function(require,module,exports){
/**
Expand Down
Loading