Moved first_down to area panel

scripts/addons/cam/__init__.py

@@ -746,6 +746,11 @@ class camOperation(bpy.types.PropertyGroup):
                                   min=-3, max=10, precision=cam.constants.PRECISION, unit="LENGTH",
                                   update=updateRest)  # EXPERIMENTAL
 
+    first_down: bpy.props.BoolProperty(name="First down",
+        description="First go down on a contour, then go to the next one",
+        default=False, update=cam.utils.update_operation)
+
+
     #######################################################
     # Image related
     ####################################################

scripts/addons/cam/chunk.py

@@ -318,7 +318,7 @@ class camPathChunk:
                 if i == len(ch.points):
                     i = 0
         # ramp out
-        if o.movement.ramp_out and (not o.use_layers or not o.movement.first_down or (o.movement.first_down and endpoint is not None)):
+        if o.movement.ramp_out and (not o.use_layers or not o.first_down or (o.first_down and endpoint is not None)):
             z = zend
             # i=endpoint
 

scripts/addons/cam/strategy.py

@@ -131,7 +131,7 @@ def cutout(o):
     layers = getLayers(o, o.maxz, checkminz(o))
     extendorder = []
 
-    if o.movement.first_down:  # each shape gets either cut all the way to bottom,
+    if o.first_down:  # each shape gets either cut all the way to bottom,
         # or every shape gets cut 1 layer, then all again. has to create copies,
         # because same chunks are worked with on more layers usually
         for chunk in chunksFromCurve:
@@ -470,7 +470,7 @@ def pocket(o):
         for ch in chunks:
             ch.rampZigZag(ch.zstart, ch.points[0][2], o)
 
-    if o.movement.first_down:
+    if o.first_down:
         chunks = utils.sortChunks(chunks, o)
 
     if o.pocketToCurve:  # make curve instead of a path
@@ -747,7 +747,7 @@ def medial_axis(o):
                 newchunk.clampZ(layer[1])
                 chunklayers.append(newchunk)
 
-    if o.movement.first_down:
+    if o.first_down:
         chunklayers = utils.sortChunks(chunklayers, o)
 
     if o.add_mesh_for_medial:  # make curve instead of a path

scripts/addons/cam/ui_panels/area.py

@@ -13,15 +13,26 @@ class CAM_AREA_Panel(CAMButtonsPanel, bpy.types.Panel):
         'draw_maxz': 1,
         'draw_minz': 1,
         'draw_ambient': 1,
-        'draw_limit_curve': 1
+        'draw_limit_curve': 1,
+        'draw_first_down': 1
+
     }
 
     def draw_use_layers(self):
         if not self.has_correct_level(): return
-        row = self.layout.row(align=True)
+        col = self.layout.column(align=True)
+        row = col.row(align=True)
         row.prop(self.op, 'use_layers')
         if self.op.use_layers:
             row.prop(self.op, 'stepdown')
+            self.draw_first_down(col)
+
+    def draw_first_down(self, col):
+        if not self.has_correct_level(): return
+        if self.op.strategy in ['CUTOUT','POCKET','MEDIAL_AXIS']:
+            row = col.row(align=True)
+            row.label(text="")
+            row.prop(self.op, 'first_down')
 
     def draw_maxz(self):
         if not self.has_correct_level(): return

scripts/addons/cam/ui_panels/movement.py

@@ -44,10 +44,6 @@ class CAM_MOVEMENT_Properties(bpy.types.PropertyGroup):
         description='For roughing and finishing in one pass: mills material in climb mode, then steps back and goes between 2 last chunks back',
         default=False, update=cam.utils.update_operation)
 
-    first_down: bpy.props.BoolProperty(name="First down",
-        description="First go down on a contour, then go to the next one",
-        default=False, update=cam.utils.update_operation)
-
     helix_enter: bpy.props.BoolProperty(name="Helix enter - EXPERIMENTAL",
         description="Enter material in helix",
         default=False, update=cam.utils.update_operation)
@@ -116,7 +112,6 @@ class CAM_MOVEMENT_Panel(CAMButtonsPanel, bpy.types.Panel):
         'draw_free_height': 0,
         'draw_use_g64': 2,
         'draw_parallel_stepback': 1,
-        'draw_first_down': 1,
         'draw_helix_enter': 2,
         'draw_ramp': 1,
         'draw_retract_tangential': 2,
@@ -161,11 +156,6 @@ class CAM_MOVEMENT_Panel(CAMButtonsPanel, bpy.types.Panel):
                 self.layout.prop(self.op.movement, 'ramp_in_angle')
                 self.layout.prop(self.op.movement, 'helix_diameter')
 
-    def draw_first_down(self):
-        if not self.has_correct_level(): return
-        if self.op.strategy in ['CUTOUT','POCKET','MEDIAL_AXIS']:
-            self.layout.prop(self.op.movement, 'first_down')
-
     def draw_ramp(self):
         if not self.has_correct_level(): return
         self.layout.prop(self.op.movement, 'ramp')
@@ -204,7 +194,6 @@ class CAM_MOVEMENT_Panel(CAMButtonsPanel, bpy.types.Panel):
         self.draw_free_height()
         self.draw_use_g64()
         self.draw_parallel_stepback()
-        self.draw_first_down()
         self.draw_ramp()
         self.draw_helix_enter()
         self.draw_retract_tangential()