bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- some refactoring

Browse Source 
- working on Milling Tool and Drilling Tool: made sure that the plugin UI is initialized only when the plugin (Tool) is run in order to avoid errors like (wrapped C++ objects was deleted)
This commit is contained in:
Marius Stanciu
2021-01-29 02:08:34 +02:00
committed by Marius
parent 6c3a99d876
commit 04649622eb
54 changed files with 581 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
appTools/ToolProperties.py
View File

@@ -28,7 +28,7 @@ log = logging.getLogger('base')
class Properties(AppTool):
toolName = _("Properties")
pluginName = _("Properties")
calculations_finished = QtCore.pyqtSignal(float, float, float, float, float, object)
@@ -49,7 +49,7 @@ class Properties(AppTool):
self.properties_frame.setLayout(self.properties_box)
# ## Title
# title_label = QtWidgets.QLabel("%s" % self.toolName)
# title_label = QtWidgets.QLabel("%s" % self.pluginName)
# title_label.setStyleSheet("""
# QLabel
# {
@@ -71,7 +71,7 @@ class Properties(AppTool):
def run(self, toggle=True):
self.app.defaults.report_usage("ToolProperties()")
if self.app.tool_tab_locked is True:
if self.app.plugin_tab_locked is True:
return
if toggle:
@@ -82,21 +82,21 @@ class Properties(AppTool):
# if the Tool Tab is hidden display it, else hide it but only if the objectName is the same
found_idx = None
for idx in range(self.app.ui.notebook.count()):
if self.app.ui.notebook.widget(idx).objectName() == "tool_tab":
if self.app.ui.notebook.widget(idx).objectName() == "plugin_tab":
found_idx = idx
break
# show the Tab
if not found_idx:
self.app.ui.notebook.addTab(self.app.ui.tool_tab, _("Plugin"))
self.app.ui.notebook.addTab(self.app.ui.plugin_tab, _("Plugin"))
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
self.app.ui.notebook.setCurrentWidget(self.app.ui.plugin_tab)
try:
if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName and found_idx:
if self.app.ui.plugin_scroll_area.widget().objectName() == self.pluginName and found_idx:
# if the Tool Tab is not focused, focus on it
if not self.app.ui.notebook.currentWidget() is self.app.ui.tool_tab:
if not self.app.ui.notebook.currentWidget() is self.app.ui.plugin_tab:
# focus on Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab)
self.app.ui.notebook.setCurrentWidget(self.app.ui.plugin_tab)
else:
# else remove the Tool Tab
self.app.ui.notebook.setCurrentWidget(self.app.ui.properties_tab)