WIP: Fix to ensure consistent bolt sizes regardless of the user's unit scale preference. #16

Draft
Ado wants to merge 5 commits from Ado/add_mesh_BoltFactory:scaling_fix into main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Showing only changes of commit 83420f20d1 - Show all commits

View File

@ -81,14 +81,14 @@ class add_mesh_bolt(Operator, AddObjectHelper):
# Shank Types
bf_Shank_Length: FloatProperty(
attr='bf_Shank_Length',
name='Shank Length', default=0,
name='Shank Length (mm)', default=0,
min=0, soft_min=0, max=MAX_INPUT_NUMBER,
description='Length of the unthreaded shank',
unit='NONE',
) # type: ignore
bf_Shank_Dia: FloatProperty(
attr='bf_Shank_Dia',
name='Shank Dia', default=3,
name='Shank Dia (mm)', default=3,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Diameter of the shank',
@ -96,7 +96,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
) # type: ignore
bf_Phillips_Bit_Depth: FloatProperty(
attr='bf_Phillips_Bit_Depth',
name='Bit Depth', default=1.1431535482406616,
name='Bit Depth (mm)', default=1.1431535482406616,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Depth of the Phillips Bit',
@ -104,7 +104,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_Allen_Bit_Depth: FloatProperty(
attr='bf_Allen_Bit_Depth',
name='Bit Depth', default=1.5,
name='Bit Depth (mm)', default=1.5,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Depth of the Allen Bit',
@ -112,7 +112,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_Allen_Bit_Flat_Distance: FloatProperty(
attr='bf_Allen_Bit_Flat_Distance',
name='Flat Dist', default=2.5,
name='Flat Dist (mm)', default=2.5,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Flat Distance of the Allen Bit',
@ -136,7 +136,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_Torx_Bit_Depth: FloatProperty(
attr='bf_Torx_Bit_Depth',
name='Bit Depth', default=1.5,
name='Bit Depth (mm)', default=1.5,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Depth of the Torx Bit',
@ -144,14 +144,14 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_Hex_Head_Height: FloatProperty(
attr='bf_Hex_Head_Height',
name='Head Height', default=2,
name='Head Height (mm)', default=2,
min=0, soft_min=0, max=MAX_INPUT_NUMBER,
description='Height of the Hex Head',
unit='NONE',
)
bf_Hex_Head_Flat_Distance: FloatProperty(
attr='bf_Hex_Head_Flat_Distance',
name='Flat Dist', default=5.5,
name='Flat Dist (mm)', default=5.5,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Flat Distance of the Hex Head',
@ -159,14 +159,14 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_12_Point_Head_Height: FloatProperty(
attr='bf_12_Point_Head_Height',
name='Head Height', default=3.0,
name='Head Height (mm)', default=3.0,
min=0, soft_min=0, max=MAX_INPUT_NUMBER,
description='Height of the 12 Point Head',
unit='NONE',
)
bf_12_Point_Head_Flat_Distance: FloatProperty(
attr='bf_12_Point_Head_Flat_Distance',
name='Flat Dist', default=3.0,
name='Flat Dist (mm)', default=3.0,
min=0.001, soft_min=0, # limit to 0.001*createMesh.GLOBAL_SCALE to avoid calculation error
max=MAX_INPUT_NUMBER,
description='Flat Distance of the 12 Point Head',
@ -174,7 +174,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_12_Point_Head_Flange_Dia: FloatProperty(
attr='bf_12_Point_Head_Flange_Dia',
name='12 Point Head Flange Dia', default=5.5,
name='12 Point Head Flange Dia (mm)', default=5.5,
Ado marked this conversation as resolved Outdated

"createMesh.GLOBAL_SCALE" not needed in the comment.

"createMesh.GLOBAL_SCALE" not needed in the comment.
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Flange diameter of the 12 point Head',
@ -182,7 +182,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_CounterSink_Head_Dia: FloatProperty(
attr='bf_CounterSink_Head_Dia',
name='Head Dia', default=6.300000190734863,
name='Head Dia (mm)', default=6.300000190734863,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Diameter of the Counter Sink Head',
@ -190,7 +190,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_Cap_Head_Height: FloatProperty(
attr='bf_Cap_Head_Height',
name='Head Height', default=3,
name='Head Height (mm)', default=3,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Height of the Cap Head',
@ -198,7 +198,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_Cap_Head_Dia: FloatProperty(
attr='bf_Cap_Head_Dia',
name='Head Dia', default=5.5,
name='Head Dia (mm)', default=5.5,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Diameter of the Cap Head',
@ -206,7 +206,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_Dome_Head_Dia: FloatProperty(
attr='bf_Dome_Head_Dia',
name='Dome Head Dia', default=5.599999904632568,
name='Dome Head Dia (mm)', default=5.599999904632568,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Length of the unthreaded shank',
@ -214,7 +214,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_Pan_Head_Dia: FloatProperty(
attr='bf_Pan_Head_Dia',
name='Pan Head Dia', default=5.599999904632568,
name='Pan Head Dia (mm)', default=5.599999904632568,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Diameter of the Pan Head',
@ -223,7 +223,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
bf_Philips_Bit_Dia: FloatProperty(
attr='bf_Philips_Bit_Dia',
name='Bit Dia', default=1.8199999332427979,
name='Bit Dia (mm)', default=1.8199999332427979,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Diameter of the Philips Bit',
@ -232,7 +232,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
bf_Thread_Length: FloatProperty(
attr='bf_Thread_Length',
name='Thread Length', default=6,
name='Thread Length (mm)', default=6,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Length of the Thread',
@ -241,7 +241,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
bf_Major_Dia: FloatProperty(
attr='bf_Major_Dia',
name='Major Dia', default=3,
name='Major Dia (mm)', default=3,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Outside diameter of the Thread',
@ -250,7 +250,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
bf_Pitch: FloatProperty(
attr='bf_Pitch',
name='Pitch', default=0.3499999940395355,
name='Pitch (mm)', default=0.3499999940395355,
min=0.1, soft_min=0.1,
max=7.0,
description='Pitch if the thread',
@ -258,7 +258,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_Minor_Dia: FloatProperty(
attr='bf_Minor_Dia',
name='Minor Dia', default=2.6211137771606445,
name='Minor Dia (mm)', default=2.6211137771606445,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Inside diameter of the Thread',
@ -287,7 +287,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_Hex_Nut_Height: FloatProperty(
attr='bf_Hex_Nut_Height',
name='Hex Nut Height', default=2.4000000953674316,
name='Hex Nut Height (mm)', default=2.4000000953674316,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Height of the Hex Nut',
@ -295,7 +295,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_Hex_Nut_Flat_Distance: FloatProperty(
attr='bf_Hex_Nut_Flat_Distance',
name='Hex Nut Flat Dist', default=5.5,
name='Hex Nut Flat Dist (mm)', default=5.5,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Flat distance of the Hex Nut',
@ -303,7 +303,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_12_Point_Nut_Height: FloatProperty(
attr='bf_12_Point_Nut_Height',
name='12 Point Nut Height', default=2.4000000953674316,
name='12 Point Nut Height (mm)', default=2.4000000953674316,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Height of the 12 Point Nut',
@ -312,7 +312,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
bf_12_Point_Nut_Flat_Distance: FloatProperty(
attr='bf_12_Point_Nut_Flat_Distance',
name='12 Point Nut Flat Dist', default=3.0,
name='12 Point Nut Flat Dist (mm)', default=3.0,
min=0.001, soft_min=0, # limit to 0.001 to avoid calculation error
max=MAX_INPUT_NUMBER,
description='Flat distance of the 12 point Nut',
@ -320,7 +320,7 @@ class add_mesh_bolt(Operator, AddObjectHelper):
)
bf_12_Point_Nut_Flange_Dia: FloatProperty(
attr='bf_12_Point_Nut_Flange_Dia',
name='12 Point Nut Flange Dia', default=5.5,
name='12 Point Nut Flange Dia (mm)', default=5.5,
min=0, soft_min=0,
max=MAX_INPUT_NUMBER,
description='Flange diameter of the 12 point Nut',