Bladeren bron

fix minimum width and height

Eren Yilmaz 6 jaren geleden
bovenliggende
commit
345baeed2b
3 gewijzigde bestanden met toevoegingen van 5 en 3 verwijderingen
  1. 1 1
      src/Main.java
  2. 0 2
      src/algorithms/InitializeNodePositions.java
  3. 4 0
      src/io/Reader.java

+ 1 - 1
src/Main.java

@@ -17,7 +17,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( "test3.json" );
 		LayeredGraphNode graph = r.readInputGraph();
 	    //RandomGraphGenerator r = new RandomGraphGenerator( 0.1, 0.2, 5,5, 5, 5, 1 );
 	    //LayeredGraphNode graph = r.createRandomNode( null, 0 );

+ 0 - 2
src/algorithms/InitializeNodePositions.java

@@ -22,8 +22,6 @@ public class InitializeNodePositions {
     	RandomColorGenerator cGen = new RandomColorGenerator();
         for( LayeredGraphNode n : graph.getContainedNodes() )
         {
-            n.setWidth( 40, null );
-            n.setHeight( 40, null );
             n.setColor( cGen.generateColor(), null );
             placeNodes( n );
         }

+ 4 - 0
src/io/Reader.java

@@ -69,8 +69,12 @@ public class Reader {
         }
         if( node.has( "width" ) )
             newNode.setWidth( node.getInt( "width" ), null );
+        else
+            newNode.setWidth( 40, null );
         if( node.has( "height" ) )
             newNode.setHeight( node.getInt( "height" ), null );
+        else
+            newNode.setHeight( 40, null );
 		if( node.has( "layers" ) )
 		{
 			JSONArray layers = node.getJSONArray( "layers" );