From d29bee2d23df4b493e4135ea40c06709eee428eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Station=C3=A4r=5CHenrik?= Date: Sun, 29 Dec 2024 15:47:48 +0100 Subject: [PATCH 1/3] Fix missing references for A and B axis --- scripts/addons/cam/ui/panels/op_properties_panel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/addons/cam/ui/panels/op_properties_panel.py b/scripts/addons/cam/ui/panels/op_properties_panel.py index 5fde1826..a189260d 100644 --- a/scripts/addons/cam/ui/panels/op_properties_panel.py +++ b/scripts/addons/cam/ui/panels/op_properties_panel.py @@ -216,20 +216,20 @@ class CAM_OPERATION_PROPERTIES_Panel(CAMParentPanel, Panel): header.label(text="A & B Axes") if panel: subheader, subpanel = panel.panel("a_axis", default_closed=True) - subheader.prop(self.op, "enable_A", text="A Axis") + subheader.prop(self.op, "enable_a_axis", text="A Axis") if subpanel: subpanel.enabled = self.op.enable_a_axis col = subpanel.column(align=True) row = col.row() row.use_property_split = True row.prop(self.op, "rotation_a") - col.prop(self.op, "A_along_x") + col.prop(self.op, "a_along_x") if self.op.a_along_x: col.label(text="Ⓐ || Ⓧ - Ⓑ || Ⓨ") else: col.label(text="Ⓐ || Ⓨ - Ⓑ || Ⓧ") subheader, subpanel = panel.panel("b_axis", default_closed=True) - subheader.prop(self.op, "enable_B", text="B Axis") + subheader.prop(self.op, "enable_b_axis", text="B Axis") if subpanel: subpanel.enabled = self.op.enable_b_axis col = subpanel.column(align=True) From 776661e1345e4bdb2391233c3afd83672f182fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Station=C3=A4r=5CHenrik?= Date: Sun, 29 Dec 2024 18:58:46 +0100 Subject: [PATCH 2/3] Set step values for angle properties --- scripts/addons/cam/operators/curve_create_ops.py | 6 ++++++ scripts/addons/cam/operators/curve_tools_ops.py | 2 ++ scripts/addons/cam/operators/pack_op.py | 1 + scripts/addons/cam/properties/movement_props.py | 3 +++ scripts/addons/cam/properties/operation_props.py | 6 ++++++ 5 files changed, 18 insertions(+) diff --git a/scripts/addons/cam/operators/curve_create_ops.py b/scripts/addons/cam/operators/curve_create_ops.py index 128244b1..fa78f508 100644 --- a/scripts/addons/cam/operators/curve_create_ops.py +++ b/scripts/addons/cam/operators/curve_create_ops.py @@ -851,6 +851,7 @@ class CamCurveMortise(Operator): default=0.0, min=0.000, max=2, + step=100, subtype="ANGLE", unit="ROTATION", ) @@ -1029,6 +1030,7 @@ class CamCurveInterlock(Operator): default=0.0, min=0.000, max=2, + step=100, subtype="ANGLE", unit="ROTATION", ) @@ -1037,6 +1039,7 @@ class CamCurveInterlock(Operator): default=0.0, min=0.000, max=2, + step=100, subtype="ANGLE", unit="ROTATION", ) @@ -1444,6 +1447,7 @@ class CamCurvePuzzle(Operator): default=pi / 4, min=-10, max=10, + step=500, subtype="ANGLE", unit="ROTATION", ) @@ -1452,6 +1456,7 @@ class CamCurvePuzzle(Operator): default=pi / 4, min=-10, max=10, + step=500, subtype="ANGLE", unit="ROTATION", ) @@ -1986,6 +1991,7 @@ class CamCurveGear(Operator): min=0.001, max=pi / 2, precision=4, + step=100, subtype="ANGLE", unit="ROTATION", ) diff --git a/scripts/addons/cam/operators/curve_tools_ops.py b/scripts/addons/cam/operators/curve_tools_ops.py index 9dc351e2..35d05077 100644 --- a/scripts/addons/cam/operators/curve_tools_ops.py +++ b/scripts/addons/cam/operators/curve_tools_ops.py @@ -236,6 +236,7 @@ class CamCurveSimpleOvercuts(Operator): min=-3.14, max=3.14, precision=4, + step=500, subtype="ANGLE", unit="ROTATION", ) @@ -361,6 +362,7 @@ class CamCurveBoneFilletOvercuts(Operator): max=3.14, description="The maximum angle to be considered as an inside corner", precision=4, + step=500, subtype="ANGLE", unit="ROTATION", ) diff --git a/scripts/addons/cam/operators/pack_op.py b/scripts/addons/cam/operators/pack_op.py index b4e619dd..f338fdd1 100644 --- a/scripts/addons/cam/operators/pack_op.py +++ b/scripts/addons/cam/operators/pack_op.py @@ -96,6 +96,7 @@ class CamPackObjects(Operator): min=pi / 180, max=pi, precision=5, + step=500, subtype="ANGLE", unit="ROTATION", ) diff --git a/scripts/addons/cam/properties/movement_props.py b/scripts/addons/cam/properties/movement_props.py index cccaddb3..776d652d 100644 --- a/scripts/addons/cam/properties/movement_props.py +++ b/scripts/addons/cam/properties/movement_props.py @@ -118,6 +118,7 @@ class CAM_MOVEMENT_Properties(PropertyGroup): min=0, max=pi * 0.4999, precision=1, + step=500, subtype="ANGLE", unit="ROTATION", update=update_operation, @@ -158,6 +159,7 @@ class CAM_MOVEMENT_Properties(PropertyGroup): min=0, max=pi * 0.4999, precision=1, + step=500, subtype="ANGLE", unit="ROTATION", update=update_operation, @@ -220,6 +222,7 @@ class CAM_MOVEMENT_Properties(PropertyGroup): min=0, max=pi * 0.5, precision=0, + step=100, subtype="ANGLE", unit="ROTATION", update=update_operation, diff --git a/scripts/addons/cam/properties/operation_props.py b/scripts/addons/cam/properties/operation_props.py index ba4c0759..f864e45e 100644 --- a/scripts/addons/cam/properties/operation_props.py +++ b/scripts/addons/cam/properties/operation_props.py @@ -507,10 +507,12 @@ class CAM_OPERATION_Properties(PropertyGroup): min=-360, max=360, precision=0, + step=500, subtype="ANGLE", unit="ROTATION", update=update_rest, ) + # OBSOLETE?, REMOVE ? old_rotation_a: FloatProperty( name="A Axis Angle", description="old value of Rotate A axis\nto specified angle", @@ -522,6 +524,7 @@ class CAM_OPERATION_Properties(PropertyGroup): unit="ROTATION", update=update_rest, ) + # OBSOLETE?, REMOVE ? old_rotation_b: FloatProperty( name="A Axis Angle", description="old value of Rotate A axis\nto specified angle", @@ -540,6 +543,7 @@ class CAM_OPERATION_Properties(PropertyGroup): min=-360, max=360, precision=0, + step=500, subtype="ANGLE", unit="ROTATION", update=update_rotation, @@ -563,6 +567,7 @@ class CAM_OPERATION_Properties(PropertyGroup): min=-360, max=360, precision=0, + step=500, subtype="ANGLE", unit="ROTATION", update=update_rotation, @@ -882,6 +887,7 @@ class CAM_OPERATION_Properties(PropertyGroup): min=0, max=pi * 0.5, precision=0, + step=500, subtype="ANGLE", unit="ROTATION", update=update_rest, From b3b344bf86685305d52135da542083cfac95e283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Station=C3=A4r=5CHenrik?= Date: Sun, 29 Dec 2024 19:20:06 +0100 Subject: [PATCH 3/3] More angle step fixes --- scripts/addons/cam/operators/curve_equation_ops.py | 3 +++ scripts/addons/cam/properties/operation_props.py | 1 + 2 files changed, 4 insertions(+) diff --git a/scripts/addons/cam/operators/curve_equation_ops.py b/scripts/addons/cam/operators/curve_equation_ops.py index a3751043..eef93310 100644 --- a/scripts/addons/cam/operators/curve_equation_ops.py +++ b/scripts/addons/cam/operators/curve_equation_ops.py @@ -79,6 +79,7 @@ class CamSineCurve(Operator): min=-360, max=360, precision=4, + step=100, unit="ROTATION", ) offset: FloatProperty( @@ -125,6 +126,7 @@ class CamSineCurve(Operator): min=-200 * pi, max=200 * pi, precision=4, + step=100, unit="ROTATION", ) wave_amount: IntProperty( @@ -266,6 +268,7 @@ class CamLissajousCurve(Operator): min=-360, max=360, precision=4, + step=100, unit="ROTATION", ) diff --git a/scripts/addons/cam/properties/operation_props.py b/scripts/addons/cam/properties/operation_props.py index fc43c584..a10fe010 100644 --- a/scripts/addons/cam/properties/operation_props.py +++ b/scripts/addons/cam/properties/operation_props.py @@ -413,6 +413,7 @@ class CAM_OPERATION_Properties(PropertyGroup): subtype="ANGLE", unit="ROTATION", precision=PRECISION, + step=500, update=update_offset_image, ) ball_radius: FloatProperty(