浏览代码

fehler bei subgraphen behoben (experimentell)

Kolja Strohm 6 年之前
父节点
当前提交
4cb7d163c6
共有 4 个文件被更改,包括 12 次插入2 次删除
  1. 5 0
      src/animation/PseudoCodeNode.java
  2. 5 1
      src/bk/BlockCalc.java
  3. 1 1
      src/main/Main.java
  4. 1 0
      src/view/MainView.java

+ 5 - 0
src/animation/PseudoCodeNode.java

@@ -21,6 +21,11 @@ public class PseudoCodeNode extends DefaultMutableTreeNode {
         this.tree = tree;
     }
     
+    public JTree getTree()
+    {
+        return tree;
+    }
+    
     public boolean isSelected()
     {
         return selected;

+ 5 - 1
src/bk/BlockCalc.java

@@ -92,7 +92,11 @@ public class BlockCalc implements AlgorithmStage {
 		if( current.getContainedNodes().size() > 0 )
 		{
 			if( subgraphAlgs.get( calcLayerIndex() ).get( calcNodeIndex( nodeIndex ) ) == null )
-				subgraphAlgs.get( calcLayerIndex() ).set( calcNodeIndex( nodeIndex ), new ExtremalLayoutCalc( layout, current ) );
+			{
+			    ExtremalLayoutCalc extcalc = new ExtremalLayoutCalc( layout, current );
+			    loopNode.add( extcalc.createPseudocodeTree( loopNode.getTree() ) );
+				subgraphAlgs.get( calcLayerIndex() ).set( calcNodeIndex( nodeIndex ), extcalc );
+			}
 			if( subgraphAlgs.get( calcLayerIndex() ).get( calcNodeIndex( nodeIndex ) ).forwardStep() == StageStatus.UNFINISHED )
 				return StageStatus.UNFINISHED;
 		}

+ 1 - 1
src/main/Main.java

@@ -19,7 +19,7 @@ public class Main {
      * @param args the command line arguments, currently not in use
      */
 	public static void main(String[] args) {
-		Reader r = new Reader( "papergraph.json" );
+		Reader r = new Reader( "logo.json" );
 		LayeredGraphNode graph = r.readInputGraph();
 	    //RandomGraphGenerator r = new RandomGraphGenerator( 0.1, 0.2, 5,5, 5, 5, 1 );
 	    //LayeredGraphNode graph = r.createRandomNode( null, 0 );

+ 1 - 0
src/view/MainView.java

@@ -616,6 +616,7 @@ public class MainView {
             @Override
             public void actionPerformed(ActionEvent e) {
                 
+                
             }
             
         });