- finished the UI for adding a new parameter that is used in conjunction with the laser preprocessors: laser minimum power parameter which should help in doing a full power up/down cycle (should prolong the lifetime for the laser diode)

- fixed some UI issues for the Milling and Drilling plugins when using a `laser` preprocessor

appGUI/preferences/PreferencesUIManager.py

@@ -355,6 +355,7 @@ class PreferencesUIManager:
             "tools_mill_z_pdepth": self.ui.plugin_pref_form.tools_mill_group.pdepth_entry,
             "tools_mill_feedrate_probe": self.ui.plugin_pref_form.tools_mill_group.feedrate_probe_entry,
             "tools_mill_spindledir": self.ui.plugin_pref_form.tools_mill_group.spindledir_radio,
+            "tools_mill_min_power": self.ui.plugin_pref_form.tools_mill_group.las_min_pwr_entry,
             "tools_mill_f_plunge": self.ui.plugin_pref_form.tools_mill_group.fplunge_cb,
 
             "tools_mill_area_exclusion": self.ui.plugin_pref_form.tools_mill_group.exclusion_cb,
@@ -418,6 +419,7 @@ class PreferencesUIManager:
             "tools_drill_z_pdepth":         self.ui.plugin_pref_form.tools_drill_group.pdepth_entry,
             "tools_drill_feedrate_probe":   self.ui.plugin_pref_form.tools_drill_group.feedrate_probe_entry,
             "tools_drill_spindledir":       self.ui.plugin_pref_form.tools_drill_group.spindledir_radio,
+            "tools_drill_min_power":        self.ui.plugin_pref_form.tools_drill_group.las_min_pwr_entry,
             "tools_drill_f_plunge":         self.ui.plugin_pref_form.tools_drill_group.fplunge_cb,
             "tools_drill_f_retract":        self.ui.plugin_pref_form.tools_drill_group.fretract_cb,
 

appGUI/preferences/tools/ToolsDrillPrefGroupUI.py

@@ -373,6 +373,20 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
         adv_grid.addWidget(spindle_dir_label, 12, 0)
         adv_grid.addWidget(self.spindledir_radio, 12, 1, 1, 2)
 
+        # Laser power minimum
+        self.las_min_pwr_label = FCLabel('%s:' % _('Min Power'))
+        self.las_min_pwr_label.setToolTip(
+            _("The laser power when the laser is travelling.")
+        )
+
+        self.las_min_pwr_entry = FCSpinner()
+        self.las_min_pwr_entry.set_range(0, 1000000)
+        self.las_min_pwr_entry.set_step(100)
+
+        adv_grid.addWidget(self.las_min_pwr_label, 14, 0)
+        adv_grid.addWidget(self.las_min_pwr_entry, 14, 1)
+
+        # Fast Plunge
         self.fplunge_cb = FCCheckBox('%s' % _('Fast Plunge'))
         self.fplunge_cb.setToolTip(
             _("By checking this, the vertical move from\n"
@@ -380,8 +394,9 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
               "meaning the fastest speed available.\n"
               "WARNING: the move is done at Toolchange X,Y coords.")
         )
-        adv_grid.addWidget(self.fplunge_cb, 14, 0)
+        adv_grid.addWidget(self.fplunge_cb, 16, 0)
 
+        # Fast retract
         self.fretract_cb = FCCheckBox('%s' % _('Fast Retract'))
         self.fretract_cb.setToolTip(
             _("Exit hole strategy.\n"
@@ -392,7 +407,7 @@ class ToolsDrillPrefGroupUI(OptionsGroupUI):
               "(travel height) is done as fast as possible (G0) in one move.")
         )
 
-        adv_grid.addWidget(self.fretract_cb, 14, 1, 1, 2)
+        adv_grid.addWidget(self.fretract_cb, 16, 1, 1, 2)
 
         # separator_line = QtWidgets.QFrame()
         # separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)

appGUI/preferences/tools/ToolsMillPrefGroupUI.py

@@ -278,8 +278,8 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
             self.pp_geometry_name_cb.setItemData(it, self.pp_geometry_name_cb.itemText(it),
                                                  QtCore.Qt.ItemDataRole.ToolTipRole)
 
-        param_grid.addWidget(pp_label, 28, 0)
-        param_grid.addWidget(self.pp_geometry_name_cb, 28, 1)
+        param_grid.addWidget(pp_label, 30, 0)
+        param_grid.addWidget(self.pp_geometry_name_cb, 30, 1)
 
         # separator_line = QtWidgets.QFrame()
         # separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
@@ -406,6 +406,19 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
         adv_grid.addWidget(spindle_dir_label, 12, 0)
         adv_grid.addWidget(self.spindledir_radio, 12, 1)
 
+        # Laser power minimum
+        self.las_min_pwr_label = FCLabel('%s:' % _('Min Power'))
+        self.las_min_pwr_label.setToolTip(
+            _("The laser power when the laser is travelling.")
+        )
+
+        self.las_min_pwr_entry = FCSpinner()
+        self.las_min_pwr_entry.set_range(0, 1000000)
+        self.las_min_pwr_entry.set_step(100)
+
+        adv_grid.addWidget(self.las_min_pwr_label, 14, 0)
+        adv_grid.addWidget(self.las_min_pwr_entry, 14, 1)
+
         # Fast Move from Z Toolchange
         self.fplunge_cb = FCCheckBox('%s' % _('Fast Plunge'))
         self.fplunge_cb.setToolTip(
@@ -414,7 +427,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
               "meaning the fastest speed available.\n"
               "WARNING: the move is done at Toolchange X,Y coords.")
         )
-        adv_grid.addWidget(self.fplunge_cb, 14, 0, 1, 2)
+        adv_grid.addWidget(self.fplunge_cb, 16, 0, 1, 2)
 
         # separator_line = QtWidgets.QFrame()
         # separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
@@ -606,7 +619,7 @@ class ToolsMillPrefGroupUI(OptionsGroupUI):
               "Higher values = slow processing and slow execution on CNC\n"
               "due of too many paths.")
         )
-        self.overlap_entry = FCDoubleSpinner( suffix='%')
+        self.overlap_entry = FCDoubleSpinner(suffix='%')
         self.overlap_entry.set_precision(3)
         self.overlap_entry.setWrapping(True)
         self.overlap_entry.setRange(0.0000, 99.9999)