If the previous probe settings contains lower values than allowed use…

… the lowest value instead of throwing an exception
winder · Aug 19, 2023 · 07d3848 · 07d3848
1 parent e95a518
commit 07d3848
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...latform/ProbeModule/src/main/java/com/willwinder/ugs/platform/probe/ui/SettingsPanel.java b/...latform/ProbeModule/src/main/java/com/willwinder/ugs/platform/probe/ui/SettingsPanel.java
@@ -43,10 +43,10 @@ public SettingsPanel() {
         settingsWorkCoordinate = new JComboBox<>(new WorkCoordinateSystem[]{G54, G55, G56, G57, G58, G59});
         settingsWorkCoordinate.setSelectedItem(ProbeSettings.getSettingsWorkCoordinate());
 
-        settingsProbeDiameter = new SpinnerNumberModel(ProbeSettings.getSettingsProbeDiameter(), 0.d, null, 0.1);
-        settingsFastFindRate = new SpinnerNumberModel(ProbeSettings.getSettingsFastFindRate(), 1d, null, 1.);
-        settingsSlowMeasureRate = new SpinnerNumberModel(ProbeSettings.getSettingsSlowMeasureRate(), 1d, null, 1.);
-        settingsRetractAmount = new SpinnerNumberModel(ProbeSettings.getSettingsRetractAmount(), 0.01d, null, 0.1);
+        settingsProbeDiameter = new SpinnerNumberModel(Math.max(ProbeSettings.getSettingsProbeDiameter(), 0), 0.d, null, 0.1);
+        settingsFastFindRate = new SpinnerNumberModel(Math.max(ProbeSettings.getSettingsFastFindRate(), 0.1), 0.1d, null, 1.);
+        settingsSlowMeasureRate = new SpinnerNumberModel(Math.max(ProbeSettings.getSettingsSlowMeasureRate(), 0.1), 0.1d, null, 1.);
+        settingsRetractAmount = new SpinnerNumberModel(Math.max(ProbeSettings.getSettingsRetractAmount(), 0.01), 0.01d, null, 0.1);
 
         createLayout();
         registerListeners();