Adding more methods to the Drawer Tool

Author: jesuino

src/main/java/org/fxapps/llmfx/tools/graphics/JFXDrawerTool.java

@@ -44,7 +44,12 @@ You can draw using the following commands separated by line break (\n):
             fillRect x y w h
             circle cx cy r
             fillCircle cx cy r
+            ellipse cx cy rw rh
+            fillEllipse cx cy rw rh
             line x1 y1 x2 y2
+            polyline x1 y1 x2 y2 … xn yn
+            polygon x1 y1 x2 y2 … xn yn
+            fillPolygon x1 y1 x2 y2 … xn yn
             text x y text
             color r g b
             width w
@@ -66,13 +71,27 @@ public void draw(String dsl) {
                     .mapToObj(i -> tokens[i])
                     .filter(v -> v != null && !v.isBlank())
                     .mapToDouble(Double::parseDouble)
-                    .toArray();
+                    .toArray();                    
             switch (command) {
                 case "rect" -> gc.strokeRect(params[0], params[1], params[2], params[3]);
                 case "circle" -> gc.strokeOval(params[0], params[1], params[2], params[2]);
                 case "fillRect" -> gc.fillRect(params[0], params[1], params[2], params[3]);
                 case "fillCircle" -> gc.fillOval(params[0], params[1], params[2], params[2]);
+                case "ellipse" -> gc.strokeOval(params[0], params[1], params[2], params[3]);
+                case "fillEllipse" -> gc.fillOval(params[0], params[1], params[2], params[3]);
                 case "line" -> gc.strokeLine(params[0], params[1], params[2], params[3]);
+                case "polyline" -> {
+                    var points = extractPoints(params);
+                    gc.strokePolyline(points[0], points[1], points[0].length);
+                }
+                case "polygon" -> {
+                    var points = extractPoints(params);
+                    gc.strokePolygon(points[0], points[1], points[0].length);                    
+                }
+                case "fillPolygon" -> {
+                    var points = extractPoints(params);
+                    gc.fillPolygon(points[0], points[1], points[0].length);                    
+                }   
                 case "width" -> gc.setLineWidth(params[0]);
                 case "text" -> gc.fillText(text, params[0], params[1]);
                 case "background" -> {
@@ -91,4 +110,14 @@ public void draw(String dsl) {
         }
     }
 
+   double [][] extractPoints(double[] params) {
+        double[] xPoints = new double[params.length / 2];
+        double[] yPoints = new double[params.length / 2];
+        for (int i = 0; i < params.length; i += 2) {
+            xPoints[i / 2] = params[i];
+            yPoints[i / 2] = params[i + 1];
+        }
+        return new double[][] { xPoints, yPoints };
+    }
+
 }

src/test/java/org/fxapps/llmfx/tools/graphics/JFXDrawerToolTest.java

@@ -32,6 +32,9 @@ public void testDSL() {
                 width 1
                 line 1 2 3 4
                 text 1 2 "abc"
+                polyline 1 2 3 4 5 6
+                polygon 1 2 3 4 5 6
+                fillPolygon 1 2 3 4 5 6
                 """);
         var color = Color.rgb(255, 200, 10);
         var bg = Color.rgb(0, 10, 20);
@@ -51,6 +54,9 @@ public void testDSL() {
         verify(tool.gc).setLineWidth(eq(1.0d));
         verify(tool.gc).strokeLine(eq(1.0d), eq(2.0d), eq(3.0d), eq(4.0d));
         verify(tool.gc).fillText(eq("abc"), eq(1.0d), eq(2.0d));
+        verify(tool.gc).strokePolyline(any(double[].class), any(double[].class), eq(3));
+        verify(tool.gc).strokePolygon(any(double[].class), any(double[].class), eq(3));
+        verify(tool.gc).fillPolygon(any(double[].class), any(double[].class), eq(3));
     }
 
 }