#446 Flood fill, circles, font editor fixes.

davetcc · davetcc · commit 5cb1b48e7dfe · 2024-02-10T18:13:29.000Z
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateFontUtilityController.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateFontUtilityController.java
@@ -126,7 +126,7 @@ private void recalcFont() {
                     for(var item : allItems) {
                         item.setSelected(selAllCheck.isSelected());
                     }
-                    for(int i=blockRange.getStartingCode(); i<=blockRange.getEndingCode();i++) {
+                    for(int i=minimumStartingCode(blockRange); i<=blockRange.getEndingCode();i++) {
                         currentlySelected.put(i, selAllCheck.isSelected());
                     }
                 }
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/NativeFreeFontLoadedFont.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/NativeFreeFontLoadedFont.java
@@ -41,11 +41,11 @@ public NativeFreeFontLoadedFont(Path path, int dpi) {
                 FunctionDescriptor.of(ValueLayout.JAVA_INT, ValueLayout.ADDRESS, ValueLayout.JAVA_INT, ValueLayout.JAVA_INT)
         );
         fontGetGlyph = linker.downcallHandle(
-                fontLib.find("canDisplay").orElseThrow(),
+                fontLib.find("getFontGlyph").orElseThrow(),
                 FunctionDescriptor.of(ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.ADDRESS)
         );
         canDisplayFn = linker.downcallHandle(
-                fontLib.find("getFontGlyph").orElseThrow(),
+                fontLib.find("canDisplay").orElseThrow(),
                 FunctionDescriptor.of(ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.JAVA_INT)
         );
         setPixelsPerInch = linker.downcallHandle(
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/ImageDrawingGrid.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/ImageDrawingGrid.java
@@ -9,8 +9,13 @@
 
 import java.util.function.BiConsumer;
 
+/**
+ * Heavily based on Adafruit_GFX code, this edits a bitmap in a way similar to how Adafruit GFX draws onto native
+ * displays. It is done this way as we must avoid any aliasing whatsoever in graphics libraries given these bitmaps
+ * are going to be used later potentially on native displays.
+ */
 public class ImageDrawingGrid extends Canvas {
-    public enum DrawingMode { NONE, DOT, LINE, OUTLINE_RECT, FILLED_RECT }
+    public enum DrawingMode { NONE, DOT, LINE, OUTLINE_RECT, FILLED_RECT, OUTLINE_CIRCLE, FLOOD_FILL }
     private final BmpDataManager bitmap;
     private final PortablePalette palette;
     private final boolean editMode;
@@ -33,7 +38,7 @@ public ImageDrawingGrid(BmpDataManager bitmap, PortablePalette palette, boolean
             setOnMousePressed(event -> {
                 xStart = (int) (event.getX() / fitWidth * bitmap.getPixelWidth());
                 yStart = (int) (event.getY() / fitHeight * bitmap.getPixelHeight());
-                mode = DrawingMode.DOT;
+                mode = currentShape == DrawingMode.FLOOD_FILL ? DrawingMode.FLOOD_FILL : DrawingMode.DOT;
             });
 
             setOnMouseDragged(event -> {
@@ -56,28 +61,84 @@ public ImageDrawingGrid(BmpDataManager bitmap, PortablePalette palette, boolean
                 int yEnd = (int) (event.getY() / fitHeight * bitmap.getPixelHeight());
                 if (xEnd >= bitmap.getPixelWidth() || yEnd >= bitmap.getPixelHeight()) return;
                 if(mode == DrawingMode.DOT) {
-                    bitmap.setDataAt(xEnd, yEnd, colorIndex);
                     recordChange();
+                    bitmap.setDataAt(xEnd, yEnd, colorIndex);
                     onPaintSurface(getGraphicsContext2D());
                 } else if(mode == DrawingMode.FILLED_RECT) {
                     recordChange();
                     filledRectangle(bitmap, xEnd, yEnd);
+                } else if(mode == DrawingMode.OUTLINE_CIRCLE) {
+                    recordChange();
+                    int halfX = (xEnd - xStart) / 2;
+                    drawCircle(xStart + halfX, yStart + halfX, halfX);
                 } else if(mode == DrawingMode.OUTLINE_RECT) {
                     recordChange();
-                    drawLine(xStart, yStart, xEnd, yStart);
-                    drawLine(xEnd, yStart, xEnd, yEnd);
-                    drawLine(xStart, yEnd, xEnd, yEnd);
-                    drawLine(xStart, yStart, xStart, yEnd);
+                    drawBoxOutline(xEnd, yEnd);
                 } else if(mode == DrawingMode.LINE) {
                     recordChange();
                     drawLine(xStart, yStart, xEnd, yEnd);
+                } else if(mode == DrawingMode.FLOOD_FILL) {
+                    recordChange();
+                    floodFill(xEnd, yEnd, bitmap.getDataAt(xEnd, yEnd));
                 }
                 mode = DrawingMode.NONE;
                 onPaintSurface(getGraphicsContext2D());
             });
         }
     }
 
+    private void floodFill(int x, int y, int startingCol) {
+        // make sure we are inside bounds, and still able to fill, IE colour is still the starting colour
+        if(x < 0 || y < 0 || x >= bitmap.getPixelWidth() || y >= bitmap.getPixelHeight()) return;
+        if(bitmap.getDataAt(x, y) != startingCol) return;
+
+        bitmap.setDataAt(x, y, colorIndex);
+        floodFill(x, y + 1, startingCol);
+        floodFill(x, y - 1, startingCol);
+        floodFill(x  - 1, y, startingCol);
+        floodFill(x  + 1, y, startingCol);
+    }
+
+    private void drawBoxOutline(int xEnd, int yEnd) {
+        drawLine(xStart, yStart, xEnd, yStart);
+        drawLine(xEnd, yStart, xEnd, yEnd);
+        drawLine(xStart, yEnd, xEnd, yEnd);
+        drawLine(xStart, yStart, xStart, yEnd);
+    }
+
+    private void drawCircle(int x0, int y0, int r) {
+        int f = 1 - r;
+        int ddF_x = 1;
+        int ddF_y = -2 * r;
+        int x = 0;
+        int y = r;
+
+        bitmap.setDataAt(x0, y0 + r, colorIndex);
+        bitmap.setDataAt(x0, y0 - r, colorIndex);
+        bitmap.setDataAt(x0 + r, y0, colorIndex);
+        bitmap.setDataAt(x0 - r, y0, colorIndex);
+
+        while (x < y) {
+            if (f >= 0) {
+                y--;
+                ddF_y += 2;
+                f += ddF_y;
+            }
+            x++;
+            ddF_x += 2;
+            f += ddF_x;
+
+            bitmap.setDataAt(x0 + x, y0 + y, colorIndex);
+            bitmap.setDataAt(x0 - x, y0 + y, colorIndex);
+            bitmap.setDataAt(x0 + x, y0 - y, colorIndex);
+            bitmap.setDataAt(x0 - x, y0 - y, colorIndex);
+            bitmap.setDataAt(x0 + y, y0 + x, colorIndex);
+            bitmap.setDataAt(x0 - y, y0 + x, colorIndex);
+            bitmap.setDataAt(x0 + y, y0 - x, colorIndex);
+            bitmap.setDataAt(x0 - y, y0 - x, colorIndex);
+        }
+    }
+
     private void recordChange() {
         dirty = true;
     }
@@ -190,7 +251,7 @@ protected void onPaintSurface(GraphicsContext gc) {
 
         double wid = ((xNow - xStart) + 1) * perSquareX;
         double hei = ((yNow - yStart) + 1) * perSquareY;
-        if(mode == DrawingMode.FILLED_RECT || mode == DrawingMode.OUTLINE_RECT) {
+        if(mode == DrawingMode.FILLED_RECT || mode == DrawingMode.OUTLINE_RECT || mode == DrawingMode.OUTLINE_CIRCLE) {
             gc.strokeRect(xStart * perSquareX, yStart * perSquareY, wid, hei);
         } else if(mode == DrawingMode.LINE) {
             gc.strokeLine(xStart * perSquareX, yStart * perSquareY, xNow * perSquareX, yNow * perSquareY);
@@ -218,7 +279,7 @@ public boolean isModified() {
         return dirty;
     }
 
-    public void onPositionUpdate(BiConsumer<Integer, Integer> consumer) {
+    public void setPositionUpdateListener(BiConsumer<Integer, Integer> consumer) {
         positionConsumer = consumer;
     }
 }
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/SimpleImageEditor.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/imgedit/SimpleImageEditor.java
@@ -1,5 +1,6 @@
 package com.thecoderscorner.menu.editorui.gfxui.imgedit;
 
+import com.thecoderscorner.embedcontrol.core.service.GlobalSettings;
 import com.thecoderscorner.menu.domain.util.PortablePalette;
 import com.thecoderscorner.menu.editorui.dialog.BaseDialogSupport;
 import com.thecoderscorner.menu.editorui.gfxui.pixmgr.BmpDataManager;
@@ -14,6 +15,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
+import javafx.scene.input.*;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.stage.Stage;
@@ -23,13 +25,15 @@
 import java.nio.file.Paths;
 import java.util.Optional;
 
-import static com.thecoderscorner.menu.editorui.gfxui.imgedit.ImageDrawingGrid.DrawingMode;
+import static com.thecoderscorner.menu.editorui.gfxui.imgedit.ImageDrawingGrid.DrawingMode.*;
 import static com.thecoderscorner.menu.editorui.gfxui.imgedit.SimpleImagePane.shortFmtText;
 
 public class SimpleImageEditor {
     private final BmpDataManager bitmap;
     private final PortablePalette palette;
     private final NativePixelFormat format;
+    private CurrentProjectEditorUI editorUI;
+    private ComboBox<TextDrawingMode> modeComboBox;
 
     public SimpleImageEditor(BmpDataManager bitmap, NativePixelFormat format, PortablePalette palette) {
         this.bitmap = bitmap;
@@ -40,38 +44,36 @@ public SimpleImageEditor(BmpDataManager bitmap, NativePixelFormat format, Portab
     public boolean presentUI(CurrentProjectEditorUI editorUI) {
         BorderPane pane = new BorderPane();
         pane.setOpaqueInsets(new Insets(10));
+        this.editorUI = editorUI;
 
         HBox hbox = new HBox(4);
         hbox.setAlignment(Pos.CENTER_LEFT);
         hbox.getChildren().add(new Label("Function"));
         pane.setTop(hbox);
         ImageDrawingGrid canvas = new ImageDrawingGrid(bitmap, palette, true);
-        var modeComboBox = new ComboBox<>(FXCollections.observableArrayList(
-                DrawingMode.LINE, DrawingMode.OUTLINE_RECT, DrawingMode.FILLED_RECT
+        modeComboBox = new ComboBox<>(FXCollections.observableArrayList(
+                new TextDrawingMode("Pixel - D", DOT),
+                new TextDrawingMode("Line - L", LINE),
+                new TextDrawingMode("Box Outline - R", OUTLINE_RECT),
+                new TextDrawingMode("Box Filled - B", FILLED_RECT),
+                new TextDrawingMode("Circle - I", OUTLINE_CIRCLE),
+                new TextDrawingMode("Flood Fill - F", FLOOD_FILL)
         ));
         modeComboBox.getSelectionModel().select(0);
-        modeComboBox.setOnAction(_ -> canvas.setCurrentShape(modeComboBox.getValue()));
+        modeComboBox.setOnAction(_ -> canvas.setCurrentShape(modeComboBox.getValue().mode()));
         hbox.getChildren().add(modeComboBox);
 
         hbox.getChildren().add(new Label("Palette"));
         UIColorPaletteControl paletteControl = new UIColorPaletteControl();
         hbox.getChildren().add(paletteControl.swatchControl(palette, canvas::setCurrentColor));
 
+        var copyButton = new Button("Copy");
+        copyButton.setOnAction(_ -> copyContents());
         var saveButton = new Button("Save");
-        saveButton.setOnAction(_ -> {
-            var file = editorUI.findFileNameFromUser(Optional.empty(), false, "*.png");
-            if(file.isEmpty()) return;
-            try {
-                var img = bitmap.createImageFromBitmap(palette);
-                ImageIO.write(SwingFXUtils.fromFXImage(img, null), "png", Paths.get(file.get()).toFile());
-            } catch (IOException e) {
-                editorUI.alertOnError("Error Saving Image", "An error occurred while saving the image.");
-            }
-        });
-        hbox.getChildren().add(saveButton);
+        saveButton.setOnAction(_ -> saveContents());
         var xyLabel = new Label("");
-        canvas.onPositionUpdate((x, y) -> xyLabel.setText(STR."X=\{x}, Y=\{y}"));
-        hbox.getChildren().add(xyLabel);
+        canvas.setPositionUpdateListener((x, y) -> xyLabel.setText(STR."X=\{x}, Y=\{y}"));
+        hbox.getChildren().addAll(copyButton, saveButton, xyLabel);
 
         canvas.widthProperty().bind(pane.widthProperty());
         canvas.heightProperty().bind(pane.heightProperty().multiply(0.9));
@@ -81,8 +83,32 @@ public boolean presentUI(CurrentProjectEditorUI editorUI) {
 
         pane.setCenter(canvas);
         pane.getStyleClass().add("background");
+        pane.setStyle(STR."-fx-font-size: \{GlobalSettings.defaultFontSize()}");
 
         Scene scene = new Scene(pane);
+
+        KeyCombination copyPressed = new KeyCodeCombination(KeyCode.C, KeyCombination.SHORTCUT_DOWN);
+        KeyCombination savePressed = new KeyCodeCombination(KeyCode.S, KeyCombination.SHORTCUT_DOWN);
+        KeyCombination dotPressed = new KeyCodeCombination(KeyCode.D);
+        KeyCombination linePressed = new KeyCodeCombination(KeyCode.L);
+        KeyCombination circlePressed = new KeyCodeCombination(KeyCode.I);
+        KeyCombination boxPressed = new KeyCodeCombination(KeyCode.B);
+        KeyCombination rectPressed = new KeyCodeCombination(KeyCode.R);
+        KeyCombination fillPressed = new KeyCodeCombination(KeyCode.F);
+        scene.addEventFilter(KeyEvent.KEY_PRESSED, ke -> {
+            if (copyPressed.match(ke)) {
+                copyContents();
+                ke.consume(); // <-- stops passing the event to next node
+            } else if(savePressed.match(ke)) {
+                saveContents();
+                ke.consume(); // <-- stops passing the event to next node
+            } else if(dotPressed.match(ke)) changeShape(DOT);
+            else if(linePressed.match(ke)) changeShape(LINE);
+            else if(circlePressed.match(ke)) changeShape(OUTLINE_CIRCLE);
+            else if(boxPressed.match(ke)) changeShape(FILLED_RECT);
+            else if(rectPressed.match(ke)) changeShape(OUTLINE_RECT);
+            else if(fillPressed.match(ke)) changeShape(FLOOD_FILL);
+        });
         Stage stage = new Stage();
         stage.setMaximized(true);
         stage.setWidth(800);
@@ -93,4 +119,38 @@ public boolean presentUI(CurrentProjectEditorUI editorUI) {
         stage.showAndWait();
         return canvas.isModified();
     }
+
+    private void changeShape(ImageDrawingGrid.DrawingMode drawingMode) {
+        for(int i=0;i<modeComboBox.getItems().size(); i++) {
+            if (modeComboBox.getItems().get(i).mode() == drawingMode) {
+                modeComboBox.getSelectionModel().select(i);
+                break;
+            }
+        }
+    }
+
+    private void saveContents() {
+        var file = editorUI.findFileNameFromUser(Optional.empty(), false, "*.png");
+        if(file.isEmpty()) return;
+        try {
+            var img = bitmap.createImageFromBitmap(palette);
+            ImageIO.write(SwingFXUtils.fromFXImage(img, null), "png", Paths.get(file.get()).toFile());
+        } catch (IOException e) {
+            editorUI.alertOnError("Error Saving Image", "An error occurred while saving the image.");
+        }
+    }
+
+    private void copyContents() {
+        Clipboard clipboard = Clipboard.getSystemClipboard();
+        ClipboardContent content = new ClipboardContent();
+        content.putImage(bitmap.createImageFromBitmap(palette));
+        clipboard.setContent(content);
+    }
+
+    record TextDrawingMode(String name, ImageDrawingGrid.DrawingMode mode) {
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
 }
diff --git a/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/pixmgr/UIColorPaletteControl.java b/tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/pixmgr/UIColorPaletteControl.java
@@ -92,7 +92,8 @@ private static void populateColorsIntoBox(PortablePalette pal, ArrayList<Rectang
         hBox.getChildren().clear();
         listOfSwatches.clear();
         for(var col : pal.getColorArray()) {
-            var r = new Rectangle(20, 20, ControlColor.asFxColor(col));
+            int size = GlobalSettings.defaultFontSize() * 2;
+            var r = new Rectangle(size, size, ControlColor.asFxColor(col));
             listOfSwatches.add(r);
             hBox.getChildren().add(r);
         }
diff --git a/tcMenuGenerator/src/main/resources/ui/createFontPanel.fxml b/tcMenuGenerator/src/main/resources/ui/createFontPanel.fxml
@@ -51,19 +51,19 @@
     </Label>
     <ComboBox fx:id="fontStyleCombo" onAction="#onFontStyleChanged" maxWidth="99999"
               GridPane.columnIndex="3" GridPane.rowIndex="3"/>
-    <ScrollPane prefHeight="200.0" prefWidth="200.0" GridPane.columnSpan="4" GridPane.rowIndex="5">
+    <ScrollPane prefHeight="200.0" prefWidth="200.0" maxWidth="9999" fitToWidth="true" GridPane.columnSpan="4" GridPane.rowIndex="5">
         <GridPane fx:id="fontRenderArea">
             <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" />
-                <ColumnConstraints hgrow="SOMETIMES" />
-                <ColumnConstraints hgrow="SOMETIMES" />
-                <ColumnConstraints hgrow="SOMETIMES" />
-                <ColumnConstraints hgrow="SOMETIMES" />
-                <ColumnConstraints hgrow="SOMETIMES" />
-                <ColumnConstraints hgrow="SOMETIMES" />
-                <ColumnConstraints hgrow="SOMETIMES" />
-                <ColumnConstraints hgrow="SOMETIMES" />
-                <ColumnConstraints hgrow="SOMETIMES" />
+                <ColumnConstraints hgrow="SOMETIMES" percentWidth="9.8"/>
+                <ColumnConstraints hgrow="SOMETIMES" percentWidth="9.8"/>
+                <ColumnConstraints hgrow="SOMETIMES" percentWidth="9.8"/>
+                <ColumnConstraints hgrow="SOMETIMES" percentWidth="9.8"/>
+                <ColumnConstraints hgrow="SOMETIMES" percentWidth="9.8"/>
+                <ColumnConstraints hgrow="SOMETIMES" percentWidth="9.8"/>
+                <ColumnConstraints hgrow="SOMETIMES" percentWidth="9.8"/>
+                <ColumnConstraints hgrow="SOMETIMES" percentWidth="9.8"/>
+                <ColumnConstraints hgrow="SOMETIMES" percentWidth="9.8"/>
+                <ColumnConstraints hgrow="SOMETIMES" percentWidth="9.8"/>
             </columnConstraints>
             <rowConstraints>
                 <RowConstraints vgrow="SOMETIMES"/>

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private void recalcFont() {`
`126`	`126`	`for(var item : allItems) {`
`127`	`127`	`item.setSelected(selAllCheck.isSelected());`
`128`	`128`	`}`
`129`		`- for(int i=blockRange.getStartingCode(); i<=blockRange.getEndingCode();i++) {`
	`129`	`+ for(int i=minimumStartingCode(blockRange); i<=blockRange.getEndingCode();i++) {`
`130`	`130`	`currentlySelected.put(i, selAllCheck.isSelected());`
`131`	`131`	`}`
`132`	`132`	`}`