Add some more FX features (#2766)

Author: breiler

.idea/runConfigurations/UGS_FX.xml

@@ -27,7 +27,7 @@ This file is part of Universal Gcode Sender (UGS).
  * @author Joacim Breiler
  */
 public enum ConnectionDriver {
-    JSERIALCOMM("JSerialComm", "jserialcomm://"),
+    JSERIALCOMM("Serial", "jserialcomm://"),
     TCP("TCP", "tcp://"),
     WS("WebSocket", "ws://");
 

ugs-core/src/com/willwinder/universalgcodesender/connection/ConnectionDriver.java

@@ -24,6 +24,7 @@ This file is part of Universal Gcode Sender (UGS).
 import com.willwinder.universalgcodesender.gcode.util.Code;
 import com.willwinder.universalgcodesender.gcode.util.GcodeParserException;
 import com.willwinder.universalgcodesender.gcode.util.GcodeParserUtils;
+import com.willwinder.universalgcodesender.model.Position;
 import com.willwinder.universalgcodesender.types.PointSegment;
 
 import java.util.ArrayList;
@@ -119,6 +120,7 @@ public void clearCommandProcessors() {
     public void reset() {
         this.statsProcessor = new Stats();
         this.state = new GcodeState();
+        this.state.currentPoint = Position.INVALID;
         this.state.commandNumber = -1;
 
         for (CommandProcessor processor : processors) {

ugs-core/src/com/willwinder/universalgcodesender/gcode/GcodeParser.java

@@ -19,12 +19,13 @@ This file is part of Universal Gcode Sender (UGS).
 package com.willwinder.universalgcodesender.gcode.processors;
 
 import com.willwinder.universalgcodesender.gcode.GcodeState;
+import com.willwinder.universalgcodesender.gcode.GcodeStats;
 import com.willwinder.universalgcodesender.gcode.util.GcodeParserException;
 import com.willwinder.universalgcodesender.model.Position;
 import com.willwinder.universalgcodesender.model.UnitUtils.Units;
+
 import java.util.Collections;
 import java.util.List;
-import com.willwinder.universalgcodesender.gcode.GcodeStats;
 
 /**
  *
@@ -46,14 +47,14 @@ public List<String> processCommand(String command, GcodeState state) throws Gcod
                             .getPositionIn(defaultUnits);
 
             // Update min
-            min.x = Math.min(min.x, p.x);
-            min.y = Math.min(min.y, p.y);
-            min.z = Math.min(min.z, p.z);
+            min.x = getMin(min.x, p.x);
+            min.y = getMin(min.y, p.y);
+            min.z = getMin(min.z, p.z);
 
             // Update max
-            max.x = Math.max(max.x, p.x);
-            max.y = Math.max(max.y, p.y);
-            max.z = Math.max(max.z, p.z);
+            max.x = getMax(max.x, p.x);
+            max.y = getMax(max.y, p.y);
+            max.z = getMax(max.z, p.z);
 
             // Num commands
             commandCount++;
@@ -62,6 +63,24 @@ public List<String> processCommand(String command, GcodeState state) throws Gcod
         return Collections.singletonList(command);
     }
 
+    private double getMin(double value1, double value2) {
+        if (Double.isNaN(value1)) {
+            return value2;
+        } else if(Double.isNaN(value2)) {
+            return value1;
+        }
+        return Math.min(value1, value2);
+    }
+
+    private double getMax(double value1, double value2) {
+        if (Double.isNaN(value1)) {
+            return value2;
+        } else if(Double.isNaN(value2)) {
+            return value1;
+        }
+        return Math.max(value1, value2);
+    }
+
     @Override
     public String getHelp() {
         return "Caches program metrics, shouldn't be enabled or disabled.";

ugs-core/src/com/willwinder/universalgcodesender/gcode/processors/Stats.java

@@ -21,6 +21,7 @@ This file is part of Universal Gcode Sender (UGS).
 
 import com.willwinder.universalgcodesender.IController;
 import com.willwinder.universalgcodesender.gcode.GcodeParser;
+import com.willwinder.universalgcodesender.gcode.GcodeStats;
 import com.willwinder.universalgcodesender.gcode.ICommandCreator;
 import com.willwinder.universalgcodesender.gcode.processors.CommandProcessor;
 import com.willwinder.universalgcodesender.listeners.ControllerState;
@@ -114,6 +115,7 @@ public interface BackendAPI extends BackendAPIReadOnly {
     void sendGcodeCommand(String commandText) throws Exception;
     void sendGcodeCommand(boolean restoreParserState, String commandText) throws Exception;
     void sendGcodeCommand(GcodeCommand command) throws Exception;
+    GcodeStats getGcodeStats();
 
     /**
      * Jogs the machine by a specified direction given by the partial position.

ugs-core/src/com/willwinder/universalgcodesender/model/BackendAPI.java

@@ -799,4 +799,8 @@ private void initializeProcessedLines(boolean forceReprocess, File startFile, Gc
             logger.info("Took " + (end - start) + "ms to preprocess");
         }
     }
+
+    public GcodeStats getGcodeStats() {
+        return gcp.getCurrentStats();
+    }
 }

ugs-core/src/com/willwinder/universalgcodesender/model/GUIBackend.java

@@ -1,12 +1,44 @@
+/*
+    Copyright 2025 Will Winder
+
+    This file is part of Universal Gcode Sender (UGS).
+
+    UGS is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    UGS is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with UGS.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.willwinder.universalgcodesender.types;
 
+/**
+ * Settings for FX window
+ *
+ * @author Joacim Breiler
+ */
 public class FxSettings {
+
+    private int windowWidth;
+    private int windowHeight;
+    private int windowPositionX;
+    private int windowPositionY;
+    private double dividerContentPercent;
+    private double dividerLeftPercent;
+
     public FxSettings() {
-        windowWidth = 640;
-        windowHeight = 520;
+        windowWidth = 1024;
+        windowHeight = 768;
         windowPositionX = 0;
         windowPositionY = 0;
         dividerContentPercent = 0.3;
+        dividerLeftPercent = 0.5;
     }
 
     public int getWindowWidth() {
@@ -49,9 +81,11 @@ public void setDividerContentPercent(double dividerContentPercent) {
         this.dividerContentPercent = dividerContentPercent;
     }
 
-    private int windowWidth;
-    private int windowHeight;
-    private int windowPositionX;
-    private int windowPositionY;
-    private double dividerContentPercent;
+    public double getDividerLeftPercent() {
+        return dividerLeftPercent;
+    }
+
+    public void setDividerLeftPercent(double dividerLeftPercent) {
+        this.dividerLeftPercent = dividerLeftPercent;
+    }
 }

ugs-core/src/com/willwinder/universalgcodesender/types/FxSettings.java

@@ -34,12 +34,13 @@ public RefreshThread(Runnable refreshFunction, long refreshInterval) {
 
     @Override
     public void run() {
-        while (!Thread.interrupted()) {
+        while (!Thread.currentThread().isInterrupted()) {
             refreshFunction.run();
             try {
                 Thread.sleep(refreshInterval);
             } catch (InterruptedException e) {
                 // Never mind
+                return;
             }
         }
     }

ugs-core/src/com/willwinder/universalgcodesender/utils/RefreshThread.java

@@ -765,3 +765,10 @@ platform.plugin.designer.clipart.weather=Weather
 platform.plugin.console.title=Console
 platform.plugin.console.action.verbose.disable = Disable verbose logging
 platform.plugin.console.action.verbose.enable = Enable verbose logging
+settings.general = General settings
+settings.machineStatus = Machine status
+settings.gamepad = Gamepad
+settings.firmware = Firmware
+settings.metric = Metric
+settings.imperial = Imperial
+settings.probe = Probe

ugs-core/src/resources/MessagesBundle_en_US.properties

@@ -100,6 +100,12 @@
             <artifactId>nashorn-core</artifactId>
             <version>${ugs.nashorn-core.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.willwinder</groupId>
+            <artifactId>ugs-platform-plugin-designer</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>