"dynamic" text size and not drawing vertices out of view

41a14b5d · Jona Dirks · c6c0a3f5 · 41a14b5d · 41a14b5d · 41a14b5d
Commit 41a14b5d authored 2 years ago by Jona Dirks
--- a/src/main/java/de/uni/bremen/grapa/library/gui/DirectedGraphJPanel.java
+++ b/src/main/java/de/uni/bremen/grapa/library/gui/DirectedGraphJPanel.java
@@ -89,7 +89,9 @@ public class DirectedGraphJPanel extends CustomGraphJPanel implements Runnable {
            int y = ((int) (((rawVertex.getPosition()[1] - windowStartY) / (windowEndY - windowStartY))
                    * (this.getHeight() - rectSize.getHeight() - 2 * offset))) + offset;
            vertexCoords.put(rawVertex.getId(), new Point(x, y));
-            this.add(new VertexLabel(rawVertex, rectSize, thickness, x, y));
+            if (!(x < 0 || y < 0 || x > this.getWidth() || y > this.getHeight())) {
+                this.add(new VertexLabel(rawVertex, rectSize, thickness, x, y));
+            }
        }

    }

--- a/src/main/java/de/uni/bremen/grapa/library/gui/VertexLabel.java
+++ b/src/main/java/de/uni/bremen/grapa/library/gui/VertexLabel.java
@@ -7,12 +7,30 @@ import javax.swing.JLabel;
 import javax.swing.SwingConstants;
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Font;

 /**
 * This class allows it to paint vertices on a JPanel.
 */
 public class VertexLabel extends JLabel {

+    private int getFontSize(int id) {
+        String nameId = Integer.toString(id);
+
+        switch (nameId.length()) {
+            case 1:
+            case 2:
+                return 12;
+            case 3:
+                return 10;
+            case 4:
+                return 8;
+            case 5:
+                return 7;
+        }
+        return 6;
+    }
+
    /**
     * Create a VertexLabel.
     *
@@ -26,6 +44,7 @@ public class VertexLabel extends JLabel {
                       final int x, final int y) {
        this.setOpaque(true);
        this.setForeground(Color.WHITE);
+        this.setFont(new Font("Serif", Font.PLAIN, getFontSize(vertex.getId())));
        this.setText("<html>[" + vertex.getId() + "] <br/>" + vertex.getData().toString() + "</html>");
        this.setBackground(vertex.getColor());
        this.setBounds(x, y, (int) size.getWidth(), (int) size.getHeight());

--- a/src/test/java/de/uni/bremen/grapa/library/gui/GraphVisualizerTest.java
+++ b/src/test/java/de/uni/bremen/grapa/library/gui/GraphVisualizerTest.java
@@ -33,6 +33,10 @@ class GraphVisualizerTest {
    2. diesen Graph an den Visualisierer übermitteln
     */
    Graph<Vertex, UndirectedEdge> graph = importerExporter.loadAndCreate(pfad);
+    graph.addVertex(new Vertex(123));
+    graph.addVertex(new Vertex(1234));
+    graph.addVertex(new Vertex(12345));
+    graph.addVertex(new Vertex(123456));
    graph.updateVertex(new VisualVertex(2, "Hey", Color.RED));
    graph.updateEdge(new VisualUndirectedEdge(1, 3, "Ho", Color.BLUE));
    new GraphVisualizer(graph);