Merge pull request #277 from pppalain/master

december ui patches

scripts/addons/cam/blender_manifest.toml

@@ -1,7 +1,7 @@
-schema_version = "1.0.59"
+schema_version = "1.0.60"
 
 id = "fabex"
-version = "1.0.59"
+version = "1.0.60"
 name = "Fabex CNC (formerly BlenderCAM)"
 tagline = "G-code Generation Tools"
 maintainer = "Alain Pelletier and Contributors"

scripts/addons/cam/cam_chunk.py

@@ -1962,8 +1962,8 @@ async def connect_chunks_low(chunks, o):
     if o.movement.parallel_step_back:
         mergedist *= 2
 
-    if o.movement.merge_dist > 0:
-        mergedist = o.movement.merge_dist
+    if o.movement.merge_distance > 0:
+        mergedist = o.movement.merge_distance
     # mergedist=10
     lastch = None
     i = len(chunks)

scripts/addons/cam/properties/movement_props.py

@@ -196,7 +196,7 @@ class CAM_MOVEMENT_Properties(PropertyGroup):
         update=update_operation,
     )
 
-    merge_dist: FloatProperty(
+    merge_distance: FloatProperty(
         name="Merge Distance - EXPERIMENTAL",
         default=0.0,
         min=0.0000,

scripts/addons/cam/ui/panels/area_panel.py

@@ -69,7 +69,7 @@ class CAM_AREA_Panel(CAMParentPanel, Panel):
                     icon = "USER"
                 col.prop(self.op, "min_z_from", text="Max", icon=icon)
                 if self.op.min_z_from == "CUSTOM":
-                    col.prop(self.op, "minz")
+                    col.prop(self.op, "min_z")
 
             else:
                 col.prop(self.op, "source_image_scale_z")

scripts/addons/cam/ui/panels/movement_panel.py

@@ -64,6 +64,7 @@ class CAM_MOVEMENT_Panel(CAMParentPanel, Panel):
         row = layout.row()
         row.use_property_split = False
         row.prop(self.op.movement, "stay_low", text="Stay Low (if possible)")
+        row.prop(self.op.movement, "merge_distance")
 
         # Parallel Stepback
         if self.level >= 1:
@@ -121,7 +122,7 @@ class CAM_MOVEMENT_Panel(CAMParentPanel, Panel):
                 if self.op.movement.stay_low:
                     row = col.row()
                     row.use_property_split = True
-                    row.prop(self.op.movement, "merge_dist", text="Merge Distance")
+                    row.prop(self.op.movement, "merge_distance", text="Merge Distance")
 
                 # Helix Enter
                 if self.op.strategy in ["POCKET"]:

scripts/addons/cam/ui/panels/op_properties_panel.py

@@ -21,7 +21,6 @@ class CAM_OPERATION_PROPERTIES_Panel(CAMParentPanel, Panel):
     panel_interface_level = 0
 
     def draw_overshoot(self, col):
-        # layout = self.layout
         # Overshoot
         row = col.row()
         row.use_property_split = False
@@ -60,7 +59,6 @@ class CAM_OPERATION_PROPERTIES_Panel(CAMParentPanel, Panel):
 
         # Cutout Options
         if self.op.strategy in ["CUTOUT"]:
-            # box = layout.box()
             col = box.column(align=True)
             # Cutout Type
             col.prop(self.op, "cut_type")
@@ -79,9 +77,7 @@ class CAM_OPERATION_PROPERTIES_Panel(CAMParentPanel, Panel):
 
         if self.op.strategy in ["CUTOUT", "CURVE"]:
             if self.op.strategy == "CURVE":
-                # box = layout.box()
                 col = box.column(align=True)
-            # self.draw_enable_A_B_axis(col=col)
             # Outlines Box
             box = col.box()
             subcol = box.column(align=True)
@@ -98,11 +94,9 @@ class CAM_OPERATION_PROPERTIES_Panel(CAMParentPanel, Panel):
                 sub = box.column(align=True)
                 sub.label(text="Toolpath Distance")
                 sub.prop(self.op, "distance_between_paths", text="Between")
-                # self.draw_cutter_engagement(col=col)
 
         # Waterline Options
         if self.op.strategy in ["WATERLINE"]:
-            # box = layout.box()
             col = box.column(align=True)
             if self.op.optimisation.use_opencamlib:
                 box = col.box()
@@ -129,7 +123,6 @@ class CAM_OPERATION_PROPERTIES_Panel(CAMParentPanel, Panel):
 
         # Carve Options
         if self.op.strategy in ["CARVE"]:
-            # box = layout.box()
             col = box.column(align=True)
             col.prop(self.op, "carve_depth", text="Depth")
             box = col.box()
@@ -139,7 +132,6 @@ class CAM_OPERATION_PROPERTIES_Panel(CAMParentPanel, Panel):
 
         # Medial Axis Options
         if self.op.strategy in ["MEDIAL_AXIS"]:
-            # box = layout.box()
             col = box.column(align=True)
             col.prop(self.op, "medial_axis_threshold", text="Threshold")
             col.prop(self.op, "medial_axis_subdivision", text="Detail Size")
@@ -152,14 +144,12 @@ class CAM_OPERATION_PROPERTIES_Panel(CAMParentPanel, Panel):
 
         # Drill Options
         if self.op.strategy in ["DRILL"]:
-            # box = layout.box()
             col = box.column(align=True)
             col.prop(self.op, "drill_type")
             # self.draw_enable_A_B_axis(col=col)
 
         # Pocket Options
         if self.op.strategy in ["POCKET"]:
-            # box = layout.box()
             col = box.column(align=True)
             if self.op.pocket_type == "PARALLEL":
                 warnbox = col.box()
@@ -201,7 +191,6 @@ class CAM_OPERATION_PROPERTIES_Panel(CAMParentPanel, Panel):
             row.prop(self.op, "inverse")
             if self.op.strategy in ["PARALLEL", "CROSS"]:
                 col.prop(self.op, "parallel_angle")
-                # self.draw_enable_A_B_axis(col=col)
             box = col.box()
             col = box.column(align=True)
             col.label(text="Toolpath Distance")

scripts/addons/cam/version.py

@@ -1 +1 @@
-__version__=(1,0,59)
+__version__=(1,0,60)