Modify examples to illustrate different instantiations.

Author: brunomnsilva

src/main/java/com/brunomnsilva/smartgraph/examples/cities/Main.java

@@ -30,7 +30,6 @@
 import com.brunomnsilva.smartgraph.graph.Vertex;
 import com.brunomnsilva.smartgraph.graphview.SmartCircularSortedPlacementStrategy;
 import com.brunomnsilva.smartgraph.graphview.SmartGraphPanel;
-import com.brunomnsilva.smartgraph.graphview.SmartGraphProperties;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
@@ -46,7 +45,8 @@ public class Main extends Application {
     public void start(Stage ignored) {
 
         Graph<City, Distance> distances = new GraphEdgeList<>();
-        
+
+        /* Vertex radius will be derived from the city's population */
         Vertex<City> prague = distances.insertVertex(new City("Prague", 1.3f));
         Vertex<City> tokyo = distances.insertVertex(new City("Tokyo", 37.5f));
         Vertex<City> beijing = distances.insertVertex(new City("Beijing", 21.5f));
@@ -63,37 +63,25 @@ public void start(Stage ignored) {
         distances.insertEdge(prague, helsinky, new Distance(1845));
         distances.insertEdge(beijing, london, new Distance(8132));
 
-        /* Only Java 15 allows for multi-line strings. */
-        String customProps = "edge.label = true" + "\n" + "edge.arrow = true";
-                
-        SmartGraphProperties properties = new SmartGraphProperties(customProps);
-        
-        SmartGraphPanel<City, Distance> graphView = new SmartGraphPanel<>(distances, properties, new SmartCircularSortedPlacementStrategy());
-        
+        SmartGraphPanel<City, Distance> graphView = new SmartGraphPanel<>(distances, new SmartCircularSortedPlacementStrategy());
+
         Scene scene = new Scene(new SmartGraphDemoContainer(graphView), 1024, 768);
 
         Stage stage = new Stage(StageStyle.DECORATED);
         stage.setTitle("JavaFX SmartGraph City Distances");
-        stage.setMinHeight(500);
         stage.setMinWidth(800);
+        stage.setMinHeight(400);
         stage.setScene(scene);
         stage.show();
 
         graphView.init();
-        
-        //graphView.setAutomaticLayout(true);
-        
-        /* You can manually place vertices at any time. However, these are
-        absolute coordinates inside the container panel.
-        Careful choice of a panel's background image can allow you to overlay
-        the vertices over a, e.g., world map.
-        */
-        graphView.setVertexPosition(beijing, 100, 100);
-        graphView.setVertexPosition(helsinky, 924, 100);
-        graphView.setVertexPosition(london, 200, 668);
-        graphView.setVertexPosition(prague, 824, 668);
-        graphView.setVertexPosition(tokyo, 512, 200);
-        graphView.setVertexPosition(newYork, 512, 400);
+
+        graphView.setVertexPosition(beijing, 520, 284);      // Center-ish
+        graphView.setVertexPosition(tokyo,   820, 250);      // Far right-top
+        graphView.setVertexPosition(newYork, 150, 600);      // Far left-bottom
+        graphView.setVertexPosition(london,  250, 200);      // Left-top
+        graphView.setVertexPosition(prague,  450, 600);      // Center-bottom
+        graphView.setVertexPosition(helsinky,650, 120);      // Right-top
 
         /*
         * This illustrates setting an image to the background of a node.

src/main/java/com/brunomnsilva/smartgraph/examples/dynamic/Main.java

@@ -51,11 +51,13 @@ public class Main extends Application {
     public void start(Stage ignored) {
 
         Graph<String, String> g = build_sample_graph();
-        
+
+        String customProps = "edge.label = false" + "\n" + "vertex.label = false";
+        SmartGraphProperties properties = new SmartGraphProperties(customProps);
+
         SmartPlacementStrategy initialPlacement = new SmartCircularSortedPlacementStrategy();
-        ForceDirectedLayoutStrategy<String> automaticPlacementStrategy = new ForceDirectedSpringGravityLayoutStrategy<>();
 
-        SmartGraphPanel<String, String> graphView = new SmartGraphPanel<>(g, initialPlacement, automaticPlacementStrategy);
+        SmartGraphPanel<String, String> graphView = new SmartGraphPanel<>(g, properties, initialPlacement);
         graphView.setAutomaticLayout(true);
 
         Scene scene = new Scene(new SmartGraphDemoContainer(graphView), 1024, 768);
@@ -67,8 +69,9 @@ public void start(Stage ignored) {
         stage.setScene(scene);
         stage.show();
 
+
         // Programmatically define the radius of a vertex. In this case the vertex size will increase with its connectivity
-        graphView.setVertexRadiusProvider(vertexElement -> 10 + getIncidentEdgeCount(g, vertexElement) * 1.5);
+        graphView.setVertexRadiusProvider(vertexElement -> properties.getVertexRadius() + getIncidentEdgeCount(g, vertexElement) * 1.5);
 
         /* Double click will remove a vertex */
         graphView.setVertexDoubleClickAction((SmartGraphVertex<String> graphVertex) -> {
@@ -127,14 +130,14 @@ private Graph<String, String> build_sample_graph() {
     private void continuously_test_adding_elements(Graph<String, String> g, SmartGraphPanel<String, String> graphView) {
         //update graph
         running = true;
-        final long ITERATION_WAIT = 3000; //milliseconds
+        final long ITERATION_WAIT = 500; //milliseconds
 
         Runnable r;
         r = () -> {
             int count = 0;
 
             try {
-                Thread.sleep(5000);
+                Thread.sleep(1000);
             } catch (InterruptedException ex) {
                 Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
             }