Skip to content

Commit

Permalink
Merge pull request #444 from cliffsun91/fix-futpiborder-options-merge
Browse files Browse the repository at this point in the history
Add `customOrder` and `disableOptimalOrderHeuristic` - fix #263 merge issues
  • Loading branch information
rustedgrail committed Jun 28, 2024
2 parents e6d4c7f + 148f78a commit b33942c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ function layout(g, opts) {
time("layout", () => {
let layoutGraph =
time(" buildLayoutGraph", () => buildLayoutGraph(g));
time(" runLayout", () => runLayout(layoutGraph, time));
time(" runLayout", () => runLayout(layoutGraph, time, opts));
time(" updateInputGraph", () => updateInputGraph(g, layoutGraph));
});
}

function runLayout(g, time) {
function runLayout(g, time, opts) {
time(" makeSpaceForEdgeLabels", () => makeSpaceForEdgeLabels(g));
time(" removeSelfEdges", () => removeSelfEdges(g));
time(" acyclic", () => acyclic.run(g));
Expand All @@ -41,7 +41,7 @@ function runLayout(g, time) {
time(" normalize.run", () => normalize.run(g));
time(" parentDummyChains", () => parentDummyChains(g));
time(" addBorderSegments", () => addBorderSegments(g));
time(" order", () => order(g));
time(" order", () => order(g, opts));
time(" insertSelfEdges", () => insertSelfEdges(g));
time(" adjustCoordinateSystem", () => coordinateSystem.adjust(g));
time(" position", () => position(g));
Expand Down

0 comments on commit b33942c

Please sign in to comment.