Merge pull request vilemduha#69 from abosafia/master

Master
TurBoss · Aug 11, 2022 · cfbb49c · cfbb49c
2 parents d124463 + 715e4a9
commit cfbb49c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/scripts/addons/cam/__init__.py b/scripts/addons/cam/__init__.py
@@ -372,20 +372,20 @@ def updateExact(o, context):
     o.update_zbufferimage_tag = True
     o.update_offsetimage_tag = True
     if o.use_exact and (
-            o.strategy == 'WATERLINE' or o.strategy == 'POCKET' or o.strategy == 'MEDIAL_AXIS' or o.inverse):
+             o.strategy == 'POCKET' or o.strategy == 'MEDIAL_AXIS' or o.inverse):
         #    o.use_exact = False
         o.use_opencamlib = False
-        print('waterline and pocket cannot use opencamlib')
+        print(' pocket cannot use opencamlib')
 
 
 def updateOpencamlib(o, context):
     print('update opencamlib ')
     o.changed = True
     if o.use_opencamlib and (
-            o.strategy == 'WATERLINE' or o.strategy == 'POCKET' or o.strategy == 'MEDIAL_AXIS' or o.inverse):
+            o.strategy == 'POCKET' or o.strategy == 'MEDIAL_AXIS' or o.inverse):
         o.use_exact = False
         o.use_opencamlib = False
-        print('waterline and pocket cannot use opencamlib')
+        print('pocket cannot use opencamlib')
 
 
 def updateBridges(o, context):

diff --git a/scripts/addons/cam/gcodepath.py b/scripts/addons/cam/gcodepath.py
@@ -54,7 +54,7 @@
 
 from cam import image_utils
 from cam.image_utils import *
-
+from cam.opencamlib.opencamlib import *
 from cam.nc import iso
 
 

diff --git a/scripts/addons/cam/ui_panels/op_properties.py b/scripts/addons/cam/ui_panels/op_properties.py
@@ -89,13 +89,14 @@ def draw(self, context):
                     layout.prop(ao, 'dont_merge')
 
                 elif ao.strategy == 'WATERLINE':
+                    layout.label(text="Waterline roughing strategy")
+                    layout.label(text="needs a skin margin")
+                    layout.prop(ao, 'skin')
+                    layout.prop(ao, 'slice_detail')
+                    layout.prop(ao, 'waterline_fill')
                     if ao.waterline_fill:
-                        layout.label(text="Waterline roughing strategy")
-                        layout.label(text="needs a skin margin")
-                        layout.prop(ao, 'skin')
                         layout.prop(ao, 'dist_between_paths')
                         self.EngagementDisplay(ao, layout)
-                        layout.prop(ao, 'slice_detail')
                         layout.prop(ao, 'waterline_project')
                 elif ao.strategy == 'CARVE':
                     layout.prop(ao, 'carve_depth')

diff --git a/scripts/addons/cam/ui_panels/optimisation.py b/scripts/addons/cam/ui_panels/optimisation.py
@@ -21,7 +21,7 @@ def draw(self, context):
                 if ao.optimize:
                     layout.prop(ao, 'optimize_threshold')
                 if ao.geometry_source == 'OBJECT' or ao.geometry_source == 'COLLECTION':
-                    exclude_exact = ao.strategy in ['MEDIAL_AXIS', 'POCKET', 'WATERLINE', 'CUTOUT', 'DRILL', 'PENCIL',
+                    exclude_exact = ao.strategy in ['MEDIAL_AXIS', 'POCKET', 'CUTOUT', 'DRILL', 'PENCIL',
                                                     'CURVE']
                     if not exclude_exact:
                         if not ao.use_exact: