disable the lower z boundary for contour models

improve the model type detection for toolpath generation


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@1007 bbaffbd6-741e-11dd-a85d-61de82d9cad9

src/pycam/Gui/Project.py

@@ -1195,6 +1195,9 @@ class ProjectGui:
         is_projectable = (not self.model is None) \
                 and hasattr(self.model, "get_waterline_contour")
         self.gui.get_object("Projection2D").set_sensitive(is_projectable)
+        # disable the lower boundary for contour models
+        is_contour = isinstance(self.model, pycam.Geometry.Model.ContourModel)
+        self.gui.get_object("boundary_z_low").set_sensitive(not is_contour)
 
     def update_ode_settings(self, widget=None):
         if pycam.Utils.threading.is_multiprocessing_enabled() \

src/pycam/Toolpath/Generator.py

@@ -137,14 +137,14 @@ def generate_toolpath(model, tool_settings=None,
         minx, miny, minz = [number(value) for value in bounds_low]
         maxx, maxy, maxz = [number(value) for value in bounds_high]
     # trimesh model or contour model?
-    if isinstance(model, pycam.Geometry.Model.Model):
-        # trimesh model
-        trimesh_models = [model]
-        contour_model = None
-    else:
+    if isinstance(model, pycam.Geometry.Model.ContourModel):
         # contour model
         trimesh_models = []
         contour_model = model
+    else:
+        # trimesh model
+        trimesh_models = [model]
+        contour_model = None
     # Due to some weirdness the height of the drill must be bigger than the
     # object's size. Otherwise some collisions are not detected.
     cutter_height = 4 * abs(maxz - minz)