Jelajahi Sumber

- added protection, not allowing the user to make a Paint job on a MultiGeo geometry (one that is converted in the Edit -> Conversion menu)) because it is not supported

Marius Stanciu 7 tahun lalu
induk
melakukan
568d97d899
2 mengubah file dengan 8 tambahan dan 0 penghapusan
  1. 1 0
      README.md
  2. 7 0
      flatcamTools/ToolPaint.py

+ 1 - 0
README.md

@@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing.
 - remade the SolderPaste geometry generation function in ToolSoderPaste to work in certain scenarios where the Gerber pads in the SolderPaste mask Gerber may be just pads outlines
 - remade the SolderPaste geometry generation function in ToolSoderPaste to work in certain scenarios where the Gerber pads in the SolderPaste mask Gerber may be just pads outlines
 - updated the Properties Tool to include more information's, also details if a Geometry is of type MultiGeo or SingleGeo
 - updated the Properties Tool to include more information's, also details if a Geometry is of type MultiGeo or SingleGeo
 - remade the Preferences GUI to include the Advanced Options in a separate way so it is obvious which are displayed when App Level is Advanced.
 - remade the Preferences GUI to include the Advanced Options in a separate way so it is obvious which are displayed when App Level is Advanced.
+- added protection, not allowing the user to make a Paint job on a MultiGeo geometry (one that is converted in the Edit -> Conversion menu)) because it is not supported
 
 
 22.02.2019
 22.02.2019
 
 

+ 7 - 0
flatcamTools/ToolPaint.py

@@ -734,6 +734,12 @@ class ToolPaint(FlatCAMTool, Gerber):
             self.app.inform.emit("[ERROR_NOTCL]Object not found: %s" % self.paint_obj)
             self.app.inform.emit("[ERROR_NOTCL]Object not found: %s" % self.paint_obj)
             return
             return
 
 
+        # test if the Geometry Object is multigeo and return Fail if True because
+        # for now Paint don't work on MultiGeo
+        if self.paint_obj.multigeo is True:
+            self.app.inform.emit("[ERROR_NOTCL] Can't do Paint on MultiGeo geometries ...")
+            return 'Fail'
+
         o_name = '%s_multitool_paint' % (self.obj_name)
         o_name = '%s_multitool_paint' % (self.obj_name)
 
 
         if select_method == "all":
         if select_method == "all":
@@ -787,6 +793,7 @@ class ToolPaint(FlatCAMTool, Gerber):
 
 
         # Which polygon.
         # Which polygon.
         # poly = find_polygon(self.solid_geometry, inside_pt)
         # poly = find_polygon(self.solid_geometry, inside_pt)
+
         poly = obj.find_polygon(inside_pt)
         poly = obj.find_polygon(inside_pt)
         paint_method = self.paintmethod_combo.get_value()
         paint_method = self.paintmethod_combo.get_value()