Merge remote-tracking branch 'origin/master'

README.md

@@ -0,0 +1,3 @@
+# Readme
+
+Under construction

src/bk/BlockCalc.java

@@ -422,6 +422,14 @@ public class BlockCalc implements AlgorithmStage {
     @Override
     public String getDebugString()
     {
+        if( inside )
+        {
+            String info = "Subgraph of " + graph.getContainedLayers().get( calcLayerIndex() ).get( calcNodeIndex( nodeIndex ) ).getName() + ":\n";
+            String tmp = subgraphAlgs.get( calcLayerIndex() ).get( calcNodeIndex( nodeIndex ) ).getDebugString();
+            tmp = tmp.replaceAll( "\n", "\n " );
+            info += " " + tmp;
+            return info;
+        }
         return "";
     }
 }

src/bk/ExtremalLayoutCalc.java

@@ -147,6 +147,8 @@ public class ExtremalLayoutCalc implements AlgorithmStage {
                     "|" + TextLayoutHelper.strToLen( n.getX( type ) + "", 5 ) + 
                     "|" + TextLayoutHelper.strToLen( !n.isXUndefined( type ) + "", 8 ) + "|\n";
         }
+        if( inside && status == LayoutState.BLOCK_CALCULATION )
+            info += bc.getDebugString();
         return info;
     }