From 00a1b72553946fa2cac7a06245208a496cbea11e Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sun, 17 Jan 2021 22:04:11 +0200 Subject: [PATCH] - some changes in the GUI elements and some updates in the Cutout Tool --- CHANGELOG.md | 4 ++++ appGUI/GUIElements.py | 8 +++++--- appTools/ToolCutOut.py | 2 ++ appTools/ToolMilling.py | 8 ++++---- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae3fb99e..a6e54fc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta ================================================= +17.01.2021 + +- some changes in the GUI elements and some updates in the Cutout Tool + 13.01.2021 - working on the Follow Tool and Milling Tool diff --git a/appGUI/GUIElements.py b/appGUI/GUIElements.py index cb8b9cd1..dbe42a77 100644 --- a/appGUI/GUIElements.py +++ b/appGUI/GUIElements.py @@ -52,6 +52,7 @@ class RadioSet(QtWidgets.QWidget): :type choices: list """ super(RadioSet, self).__init__(parent) + self.choices = copy(choices) if orientation == 'horizontal': layout = QtWidgets.QHBoxLayout() @@ -77,10 +78,11 @@ class RadioSet(QtWidgets.QWidget): self.group_toggle_fn = lambda: None - def on_toggle(self): + def on_toggle(self, checked): # log.debug("Radio toggled") - radio = self.sender() - if radio.isChecked(): + # radio = self.sender() + + if checked: self.group_toggle_fn() ret_val = str(self.get_value()) self.activated_custom.emit(ret_val) diff --git a/appTools/ToolCutOut.py b/appTools/ToolCutOut.py index fc735188..78951750 100644 --- a/appTools/ToolCutOut.py +++ b/appTools/ToolCutOut.py @@ -1062,6 +1062,7 @@ class CutOut(AppTool): geo_obj.tools[1]['solid_geometry'] = geo_obj.solid_geometry geo_obj.tools[1]['data']['name'] = outname + geo_obj.tools[1]['data']['tools_mill_tooldia'] = str(dia) geo_obj.tools[1]['data']['tools_mill_cutz'] = self.ui.cutz_entry.get_value() geo_obj.tools[1]['data']['tools_mill_multidepth'] = self.ui.mpass_cb.get_value() geo_obj.tools[1]['data']['tools_mill_depthperpass'] = self.ui.maxdepth_entry.get_value() @@ -1074,6 +1075,7 @@ class CutOut(AppTool): geo_obj.tools[9999]['solid_geometry'] = gaps_solid_geo geo_obj.tools[9999]['data']['name'] = outname + geo_obj.tools[9999]['data']['tools_mill_tooldia'] = str(dia) geo_obj.tools[9999]['data']['tools_mill_cutz'] = self.ui.thin_depth_entry.get_value() geo_obj.tools[9999]['data']['tools_mill_multidepth'] = self.ui.mpass_cb.get_value() geo_obj.tools[9999]['data']['tools_mill_depthperpass'] = self.ui.maxdepth_entry.get_value() diff --git a/appTools/ToolMilling.py b/appTools/ToolMilling.py index 21e5d083..56dcbbc4 100644 --- a/appTools/ToolMilling.py +++ b/appTools/ToolMilling.py @@ -1297,22 +1297,22 @@ class ToolMilling(AppTool, Excellon): if isinstance(current_widget, FCCheckBox): try: current_widget.stateChanged.disconnect(self.form_to_storage) - except (TypeError, ValueError): + except (TypeError, ValueError, RuntimeError): pass if isinstance(current_widget, RadioSet): try: current_widget.activated_custom.disconnect(self.form_to_storage) - except (TypeError, ValueError): + except (TypeError, ValueError, RuntimeError): pass elif isinstance(current_widget, FCDoubleSpinner) or isinstance(current_widget, FCSpinner): try: current_widget.returnPressed.disconnect(self.form_to_storage) - except (TypeError, ValueError): + except (TypeError, ValueError, RuntimeError): pass elif isinstance(current_widget, FCComboBox): try: current_widget.currentIndexChanged.disconnect(self.form_to_storage) - except (TypeError, ValueError): + except (TypeError, ValueError, RuntimeError): pass try: