Procházet zdrojové kódy

- added some protections for the FlatCAM Tools run after an object was loaded

Marius Stanciu před 7 roky
rodič
revize
ee23a31d50

+ 1 - 0
README.md

@@ -16,6 +16,7 @@ CAD program, and create G-Code for Isolation routing.
 - added toggle effect for the tools in the toolbar.
 - enhanced the toggle effect for the tools in the Tools Toolbar and also for Notebook Tab selection: if the current tool is activated it will toggle the notebook side but only if the installed widget is itself. If coming from another tool, the notebook will stay visible
 - upgraded the Tool Cutout when done from Gerber file to create a convex_hull around the Gerber file rather than trying to isolate it
+- added some protections for the FlatCAM Tools run after an object was loaded
 
 26.02.2019
 

+ 5 - 2
flatcamTools/ToolCalculators.py

@@ -229,8 +229,11 @@ class ToolCalculator(FlatCAMTool):
         if self.app.ui.splitter.sizes()[0] == 0:
             self.app.ui.splitter.setSizes([1, 1])
         else:
-            if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
-                self.app.ui.splitter.setSizes([0, 1])
+            try:
+                if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
+                    self.app.ui.splitter.setSizes([0, 1])
+            except AttributeError:
+                pass
 
         FlatCAMTool.run(self)
         self.set_tool_ui()

+ 5 - 2
flatcamTools/ToolDblSided.py

@@ -268,8 +268,11 @@ class DblSidedTool(FlatCAMTool):
         if self.app.ui.splitter.sizes()[0] == 0:
             self.app.ui.splitter.setSizes([1, 1])
         else:
-            if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
-                self.app.ui.splitter.setSizes([0, 1])
+            try:
+                if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
+                    self.app.ui.splitter.setSizes([0, 1])
+            except AttributeError:
+                pass
 
         FlatCAMTool.run(self)
         self.set_tool_ui()

+ 5 - 2
flatcamTools/ToolFilm.py

@@ -170,8 +170,11 @@ class Film(FlatCAMTool):
         if self.app.ui.splitter.sizes()[0] == 0:
             self.app.ui.splitter.setSizes([1, 1])
         else:
-            if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
-                self.app.ui.splitter.setSizes([0, 1])
+            try:
+                if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
+                    self.app.ui.splitter.setSizes([0, 1])
+            except AttributeError:
+                pass
 
         FlatCAMTool.run(self)
         self.set_tool_ui()

+ 5 - 2
flatcamTools/ToolImage.py

@@ -138,8 +138,11 @@ class ToolImage(FlatCAMTool):
         if self.app.ui.splitter.sizes()[0] == 0:
             self.app.ui.splitter.setSizes([1, 1])
         else:
-            if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
-                self.app.ui.splitter.setSizes([0, 1])
+            try:
+                if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
+                    self.app.ui.splitter.setSizes([0, 1])
+            except AttributeError:
+                pass
 
         FlatCAMTool.run(self)
         self.set_tool_ui()

+ 5 - 2
flatcamTools/ToolNonCopperClear.py

@@ -250,8 +250,11 @@ class NonCopperClear(FlatCAMTool, Gerber):
         if self.app.ui.splitter.sizes()[0] == 0:
             self.app.ui.splitter.setSizes([1, 1])
         else:
-            if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
-                self.app.ui.splitter.setSizes([0, 1])
+            try:
+                if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
+                    self.app.ui.splitter.setSizes([0, 1])
+            except AttributeError:
+                pass
 
         FlatCAMTool.run(self)
         self.set_tool_ui()

+ 5 - 2
flatcamTools/ToolPaint.py

@@ -308,8 +308,11 @@ class ToolPaint(FlatCAMTool, Gerber):
         if self.app.ui.splitter.sizes()[0] == 0:
             self.app.ui.splitter.setSizes([1, 1])
         else:
-            if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
-                self.app.ui.splitter.setSizes([0, 1])
+            try:
+                if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
+                    self.app.ui.splitter.setSizes([0, 1])
+            except AttributeError:
+                pass
 
         FlatCAMTool.run(self)
         self.set_tool_ui()

+ 5 - 2
flatcamTools/ToolPanelize.py

@@ -204,8 +204,11 @@ class Panelize(FlatCAMTool):
         if self.app.ui.splitter.sizes()[0] == 0:
             self.app.ui.splitter.setSizes([1, 1])
         else:
-            if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
-                self.app.ui.splitter.setSizes([0, 1])
+            try:
+                if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
+                    self.app.ui.splitter.setSizes([0, 1])
+            except AttributeError:
+                pass
 
         FlatCAMTool.run(self)
         self.set_tool_ui()

+ 5 - 2
flatcamTools/ToolProperties.py

@@ -59,8 +59,11 @@ class Properties(FlatCAMTool):
         if self.app.ui.splitter.sizes()[0] == 0:
             self.app.ui.splitter.setSizes([1, 1])
         else:
-            if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
-                self.app.ui.splitter.setSizes([0, 1])
+            try:
+                if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
+                    self.app.ui.splitter.setSizes([0, 1])
+            except AttributeError:
+                pass
 
         FlatCAMTool.run(self)
         self.properties()

+ 5 - 2
flatcamTools/ToolSolderPaste.py

@@ -418,8 +418,11 @@ class SolderPaste(FlatCAMTool):
         if self.app.ui.splitter.sizes()[0] == 0:
             self.app.ui.splitter.setSizes([1, 1])
         else:
-            if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
-                self.app.ui.splitter.setSizes([0, 1])
+            try:
+                if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
+                    self.app.ui.splitter.setSizes([0, 1])
+            except AttributeError:
+                pass
 
         FlatCAMTool.run(self)
         self.set_tool_ui()

+ 5 - 2
flatcamTools/ToolTransform.py

@@ -369,8 +369,11 @@ class ToolTransform(FlatCAMTool):
         if self.app.ui.splitter.sizes()[0] == 0:
             self.app.ui.splitter.setSizes([1, 1])
         else:
-            if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
-                self.app.ui.splitter.setSizes([0, 1])
+            try:
+                if self.app.ui.tool_scroll_area.widget().objectName() == self.toolName:
+                    self.app.ui.splitter.setSizes([0, 1])
+            except AttributeError:
+                pass
                 
         FlatCAMTool.run(self)
         self.set_tool_ui()