Browse Source

fixed an issue that the horizontalCompaction method was not called for subgraphs

Kolja Strohm 6 years ago
parent
commit
59d54a5d61
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/bk/BlockCalc.java
  2. 1 1
      src/main/Main.java

+ 1 - 1
src/bk/BlockCalc.java

@@ -108,7 +108,7 @@ public class BlockCalc {
             }
             }
         } );
         } );
         nodeLoop.add( ifNode );
         nodeLoop.add( ifNode );
-        ifNode.add( new PseudoCodeNode( "call calcLayout( layout, n );", vars, tree, new FunctionCall( root, new String[]{ "layout", "n" } ) ) );
+        ifNode.add( new PseudoCodeNode( "call calcLayout( layout, n );", vars, tree, new FunctionCall( claclLayout, new String[]{ "layout", "n" } ) ) );
         nodeLoop.add( new PseudoCodeNode( "neighbors = layout.contains('DOWN') ? predecessors(n) : successors(n)", vars, tree, new DeclareVariable<ArrayList<LayeredGraphNode>>( "neighbors" ) {
         nodeLoop.add( new PseudoCodeNode( "neighbors = layout.contains('DOWN') ? predecessors(n) : successors(n)", vars, tree, new DeclareVariable<ArrayList<LayeredGraphNode>>( "neighbors" ) {
             @Override
             @Override
             protected ArrayList<LayeredGraphNode> value(ReadOnlyMemory m) {
             protected ArrayList<LayeredGraphNode> value(ReadOnlyMemory m) {

+ 1 - 1
src/main/Main.java

@@ -17,7 +17,7 @@ public class Main {
      * @param args the command line arguments, currently not in use
      * @param args the command line arguments, currently not in use
      */
      */
     public static void main(String[] args) {
     public static void main(String[] args) {
-        Reader r = new Reader( "papergraph.json" );
+        Reader r = new Reader( "logo.json" );
         LayeredGraphNode graph = r.readInputGraph();
         LayeredGraphNode graph = r.readInputGraph();
         InitializeNodePositions.placeNodes( graph );
         InitializeNodePositions.placeNodes( graph );
         new MainView( graph );
         new MainView( graph );