#446 font creator editing inflight, commit to work on urgent patch

Author: davetcc

.idea/runConfigurations/TcMenu_Designer_UI.xml

@@ -4,7 +4,7 @@ A menu library and designer UI for Arduino and mbed that is modular enough to su
 
 Initially, you can use the menu designer UI that is packaged with every release, and available for Windows, macOS, and Linux. The designer UI takes care of building the core menu code and putting any callback functions into your sketch file. Think of the designer like a form designer in the desktop domain. Furthermore, It's non destructive on the sketch file, so can be round tripped during development. 
 
-TheCodersCorner.com invest a lot of time and resources into making this open source product which is used by literally thousands of users. We don't presently sell hardware or have any other income streams from it, we ask that especially commercial users consider making a voluntary contribution to help keep us going using the sponsor button. 
+TheCodersCorner.com invest a lot of time and resources into making this open source product which is used by literally thousands of users. We offer both [commercial support]() and [C++/Java/Dart consultancy](), or if you just want to say thanks, you can also make a donation via [GitHub](https://github.com/davetcc/tcMenu) (this repository). 
 
 In any fork, please ensure all text up to here is left unaltered.
 
@@ -18,7 +18,9 @@ In any fork, please ensure all text up to here is left unaltered.
 
 ## Questions, community forum and support
 
-You can ask questions either in the discussions section of this repo, or using the Arduino forum. We generally answer most questions, but the rules of engagement are: **this is my hobby, I make it available because it helps others**. Don't expect immediate answers, make sure you've recreated the problem in a simple sketch that you can send to me. Please consider making at least a one time donation using the sponsor link if we do help you out.
+Community questions can be asked in the discussions section of this repo, or using the Arduino forum. We generally answer most community questions but the responses will not be timely, for commercial use we recommend you purchase support.
+
+Before posting into the community make sure you've recreated the problem in a simple sketch, and please consider making at least a one time donation using the sponsor link if we do help you out.
 
 * Discussions section of this git repo (available from top menu of github page).
 * [Arduino discussion forum](https://forum.arduino.cc/) where questions can be asked, please tag me using `@davetcc`.

README.md

@@ -96,7 +96,7 @@ private void refreshGridComponents() {
             var imageView = new SimpleImagePane(img.bmpData(), img.pixelFormat(),false, img.palette(), buttons);
 
             editButton.setOnAction(_ -> {
-                var editor = new SimpleImageEditor(img.bmpData(), img.pixelFormat(), img.palette());
+                var editor = new SimpleImageEditor(img.bmpData(), img.pixelFormat(), img.palette(), true);
                 if(editor.presentUI(editorUI)) {
                     imageView.invalidate();
                 }

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateBitmapWidgetController.java

@@ -6,6 +6,7 @@
 import com.thecoderscorner.menu.editorui.dialog.SelectUnicodeRangesDialog;
 import com.thecoderscorner.menu.editorui.generator.core.VariableNameGenerator;
 import com.thecoderscorner.menu.editorui.gfxui.TcUnicodeFontExporter.TcUnicodeFontBlock;
+import com.thecoderscorner.menu.editorui.gfxui.imgedit.SimpleImageEditor;
 import com.thecoderscorner.menu.editorui.gfxui.imgedit.SimpleImagePane;
 import com.thecoderscorner.menu.editorui.gfxui.pixmgr.BmpDataManager;
 import com.thecoderscorner.menu.editorui.gfxui.pixmgr.NativeBmpBitPacker;
@@ -21,8 +22,10 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TextField;
 import javafx.scene.control.*;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
@@ -347,8 +350,23 @@ public FontGlyphDataControl(int code, BmpDataManager data) {
 
         public Pane getUI() {
             BorderPane pane = new BorderPane();
-            pane.setCenter(new SimpleImagePane(data, NativePixelFormat.MONO_BITMAP, false, FONT_PALETTE, List.of()));
+            SimpleImagePane imgView = new SimpleImagePane(data, NativePixelFormat.MONO_BITMAP, false, FONT_PALETTE, List.of());
+            pane.setCenter(imgView);
             pane.setBottom(new Label(STR."U\{code} : \{new String(Character.toChars(code))}"));
+
+            var box = new HBox(2);
+            var editButton = new Button();
+            editButton.setGraphic(new ImageView(getClass().getResource("/img/edit-pencil.png").toString()));
+            editButton.setOnAction(_ -> {
+                var editor = new SimpleImageEditor(data, NativePixelFormat.MONO_BITMAP, FONT_PALETTE, false);
+                if(editor.presentUI(editorUI)) {
+                    imgView.invalidate();
+                }
+            });
+            var selectCheck = new CheckBox();
+            selectCheck.setOnAction(event -> selected = selectCheck.isSelected());
+            box.getChildren().addAll(selectCheck, editButton);
+            pane.setTop(box);
             return pane;
         }
 

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/CreateFontUtilityController.java

@@ -7,7 +7,11 @@
 import java.util.Optional;
 import java.util.Set;
 
+import static java.lang.System.Logger.Level.*;
+
 public class NativeFreeFontLoadedFont implements LoadedFont {
+    public final System.Logger logger = System.getLogger(getClass().getSimpleName());
+
     private final Path fontPath;
     private final MethodHandle fontClose;
     private final MethodHandle fontGetGlyph;
@@ -19,6 +23,8 @@ public class NativeFreeFontLoadedFont implements LoadedFont {
     private int fontHandle;
 
     public NativeFreeFontLoadedFont(Path path, int dpi) {
+        logger.log(INFO, "Loading the freetype library and finding methods");
+
         fontPath = path;
         fontHandle = 0;
         System.loadLibrary("fontGlyphGenerator");
@@ -54,30 +60,36 @@ public NativeFreeFontLoadedFont(Path path, int dpi) {
         );
 
         try (Arena arena = Arena.ofConfined()) {
+            logger.log(INFO, "Trying to initialise the library");
             int retCode = (int)fontLibInit.invoke();
-            if(retCode != 0) throw new IllegalArgumentException("Font Library not loaded");
+            if(retCode != 0) throw new IllegalArgumentException("Font Library init failed");
             setPixelsPerInch.invoke(dpi);
+            logger.log(INFO, "All initialisation complete");
         } catch (Throwable e) {
+            logger.log(ERROR, "Unable to load font library", e);
         }
     }
 
     public void dispose() {
         try {
+            logger.log(INFO, "Closing the freetype library");
             fontLibDestroy.invokeExact();
         } catch (Throwable e) {
+            logger.log(ERROR, "Unable to close font library", e);
         }
     }
 
     @Override
     public Optional<ConvertedFontGlyph> getConvertedGlyph(int code) {
         try(Arena arena = Arena.ofConfined()) {
+            logger.log(DEBUG, "Get Glyph from library for {}",  code);
             var data = arena.allocate(2200);
             var result = (int) fontGetGlyph.invoke(fontHandle, code, data);
             if(result == 0) {
                 return Optional.of(parseDataBlock(data));
             }
         } catch (Throwable e) {
-            throw new RuntimeException(e);
+            logger.log(ERROR, "Unable to get glyph, will return empty", e);
         }
         return Optional.empty();
     }
@@ -116,20 +128,22 @@ public boolean canDisplay(int code) {
         try {
             return (boolean) canDisplayFn.invoke(fontHandle, code);
         } catch (Throwable e) {
+            logger.log(ERROR, "Unable to check if code is displayable", e);
             return false;
         }
     }
 
     @Override
     public void deriveFont(FontStyle fontStyle, int size, Set<UnicodeBlockMapping> newMappings, AntiAliasMode aliasMode) {
         try(Arena arena = Arena.ofConfined()) {
+            logger.log(INFO, "Derive font size {} mappings {} path {}", size, newMappings.size(), fontPath);
             if(fontHandle != 0) {
                 fontClose.invoke(fontHandle);
             }
             var cstrName = arena.allocateUtf8String(fontPath.toString());
             fontHandle = (int) fontLibCreateFont.invoke(cstrName, 0, size);
         } catch (Throwable ex) {
-
+            logger.log(ERROR, "Unable to derive font", ex);
         }
     }
 }

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/gfxui/NativeFreeFontLoadedFont.java

@@ -15,17 +15,18 @@
  * 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, OUTLINE_CIRCLE, FLOOD_FILL }
+    public enum DrawingMode { NONE, DOT, LINE, OUTLINE_RECT, FILLED_RECT, OUTLINE_CIRCLE, FLOOD_FILL, SELECTION }
     private final BmpDataManager bitmap;
     private final PortablePalette palette;
     private final boolean editMode;
     private BiConsumer<Integer, Integer> positionConsumer;
     private DrawingMode mode = DrawingMode.NONE;
-    private DrawingMode currentShape = DrawingMode.LINE;
+    private DrawingMode currentShape = DrawingMode.DOT;
     private int colorIndex = 0;
     private double fitWidth;
     private double fitHeight;
     private int xStart, yStart;
+    private OrderedRect imageSelection = null;
     private int xNow, yNow;
     private boolean dirty = false;
 
@@ -36,6 +37,7 @@ public ImageDrawingGrid(BmpDataManager bitmap, PortablePalette palette, boolean
 
         if(editMode) {
             setOnMousePressed(event -> {
+                imageSelection = null;
                 xStart = (int) (event.getX() / fitWidth * bitmap.getPixelWidth());
                 yStart = (int) (event.getY() / fitHeight * bitmap.getPixelHeight());
                 mode = currentShape == DrawingMode.FLOOD_FILL ? DrawingMode.FLOOD_FILL : DrawingMode.DOT;
@@ -47,13 +49,19 @@ public ImageDrawingGrid(BmpDataManager bitmap, PortablePalette palette, boolean
                 xNow = (int) (event.getX() / fitWidth * bitmap.getPixelWidth());
                 yNow = (int) (event.getY() / fitHeight * bitmap.getPixelHeight());
                 if (xNow  >= bitmap.getPixelWidth() || yNow >= bitmap.getPixelHeight()) return;
+                if(mode == DrawingMode.SELECTION) {
+                    imageSelection = new OrderedRect(xStart, yStart, xNow, yNow);
+                }
+
                 onPaintSurface(getGraphicsContext2D());
             });
 
             setOnMouseMoved(event -> {
                 int xEnd = (int) (event.getX() / fitWidth * bitmap.getPixelWidth());
                 int yEnd = (int) (event.getY() / fitHeight * bitmap.getPixelHeight());
-                if(positionConsumer != null) positionConsumer.accept(xEnd, yEnd);
+                if(positionConsumer != null) {
+                    positionConsumer.accept(xEnd, yEnd);
+                }
             });
 
             setOnMouseReleased(event -> {
@@ -66,7 +74,7 @@ public ImageDrawingGrid(BmpDataManager bitmap, PortablePalette palette, boolean
                     onPaintSurface(getGraphicsContext2D());
                 } else if(mode == DrawingMode.FILLED_RECT) {
                     recordChange();
-                    filledRectangle(bitmap, xEnd, yEnd);
+                    filledRectangle(bitmap, xStart, yStart, xEnd, yEnd);
                 } else if(mode == DrawingMode.OUTLINE_CIRCLE) {
                     recordChange();
                     int halfX = (xEnd - xStart) / 2;
@@ -87,7 +95,7 @@ public ImageDrawingGrid(BmpDataManager bitmap, PortablePalette palette, boolean
         }
     }
 
-    private void floodFill(int x, int y, int startingCol) {
+    public 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;
@@ -99,14 +107,14 @@ private void floodFill(int x, int y, int startingCol) {
         floodFill(x  + 1, y, startingCol);
     }
 
-    private void drawBoxOutline(int xEnd, int yEnd) {
+    public 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) {
+    public void drawCircle(int x0, int y0, int r) {
         int f = 1 - r;
         int ddF_x = 1;
         int ddF_y = -2 * r;
@@ -143,23 +151,20 @@ private void recordChange() {
         dirty = true;
     }
 
-    void setCurrentShape(DrawingMode shape) {
+    public void setCurrentShape(DrawingMode shape) {
         currentShape = shape;
     }
 
-    private void filledRectangle(BmpDataManager bitmap, int xEnd, int yEnd) {
-        int xMin = Math.min(xStart, xEnd);
-        int yMin = Math.min(yStart, yEnd);
-        int xMax = Math.max(xStart, xEnd);
-        int yMax = Math.max(yStart, yEnd);
-        for (int x = xMin; x <= xMax; x++) {
-            for (int y = yMin; y <= yMax; y++) {
+    public void filledRectangle(BmpDataManager bitmap, int xStart, int yStart, int xEnd, int yEnd) {
+        OrderedRect r = new OrderedRect(xStart, yStart, xEnd, yEnd);
+        for (int x = r.getXMin(); x <= r.getXMax(); x++) {
+            for (int y = r.getYMin(); y <= r.getYMax(); y++) {
                 bitmap.setDataAt(x, y, colorIndex);
             }
         }
     }
 
-    private void drawLine(int x0, int y0, int x1, int y1) {
+    public void drawLine(int x0, int y0, int x1, int y1) {
         // roughly copied from Adafruit_GFX, Thanks!
         boolean steep = Math.abs(y1 - y0) > Math.abs(x1 - x0);
         if (steep) {
@@ -255,6 +260,12 @@ protected void onPaintSurface(GraphicsContext gc) {
             gc.strokeRect(xStart * perSquareX, yStart * perSquareY, wid, hei);
         } else if(mode == DrawingMode.LINE) {
             gc.strokeLine(xStart * perSquareX, yStart * perSquareY, xNow * perSquareX, yNow * perSquareY);
+        } else if(currentShape == DrawingMode.SELECTION && imageSelection != null) {
+            gc.setStroke(Color.GREENYELLOW);
+            gc.setLineWidth(4);
+            gc.setLineDashes(10, 10);
+            gc.strokeRect(imageSelection.getXMin() * perSquareX, imageSelection.getYMin() * perSquareY,
+                    imageSelection.width() * perSquareX, imageSelection.height() * perSquareY);
         }
 
         // only use grid squares if the magnification is sufficient.
@@ -282,4 +293,41 @@ public boolean isModified() {
     public void setPositionUpdateListener(BiConsumer<Integer, Integer> consumer) {
         positionConsumer = consumer;
     }
+
+    public OrderedRect getImageSelection() {
+        return imageSelection;
+    }
+
+    public class OrderedRect {
+        private final int xMin;
+        private final int yMin;
+        private final int xMax;
+        private final int yMax;
+
+        public OrderedRect(int xStart, int yStart, int xEnd, int yEnd) {
+            xMin = Math.min(xStart, xEnd);
+            yMin = Math.min(yStart, yEnd);
+            xMax = Math.max(xStart, xEnd);
+            yMax = Math.max(yStart, yEnd);
+        }
+
+        public int getXMin() {
+            return xMin;
+        }
+
+        public int getYMin() {
+            return yMin;
+        }
+
+        public int getXMax() {
+            return xMax;
+        }
+
+        public int getYMax() {
+            return yMax;
+        }
+
+        int width() { return xMax - xMin; }
+        int height() { return yMax - yMin; }
+    }
 }