Skip to content

Commit

Permalink
rename: dw=pitch_diameter, da=addendum_diameter, df=root_diameter
Browse files Browse the repository at this point in the history
  • Loading branch information
@looooo
looooo committed Jan 3, 2025
1 parent 5d3072a commit f7c8080
Show file tree
Hide file tree
Showing 3 changed files with 4,148 additions and 2,158 deletions.
66 changes: 54 additions & 12 deletions freecad/gears/internalinvolutegear.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,26 +120,68 @@ def __init__(self, obj):
self.obj = obj
obj.Proxy = self

def onDocumentRestored(self, obj):
"""
backward compatibility functions
"""
if hasattr(obj, "dw"):
pitch_diameter = getattr(obj, "dw")
obj.addProperty(
"App::PropertyLength",
"pitch_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "The pitch diameter."),
1,
)
obj.pitch_diameter = pitch_diameter
obj.removeProperty("dw")
obj.setExpression(
"angular_backlash", "backlash / pitch_diameter * 360° / pi"
)
# replace da with addendum_diameter
if hasattr(obj, "da"):
addendum_diameter = getattr(obj, "da")
obj.addProperty(
"App::PropertyLength",
"addendum_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "The addendum diameter."),
1,
)
obj.addendum_diameter = addendum_diameter

# replace df with root_diameter
if hasattr(obj, "df"):
root_diameter = getattr(obj, "df")
obj.addProperty(
"App::PropertyLength",
"root_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "The root diameter."),
1,
)
obj.root_diameter = root_diameter

def add_limiting_diameter_properties(self, obj):
obj.addProperty(
"App::PropertyLength",
"da",
"addendum_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "inside diameter"),
QT_TRANSLATE_NOOP("App::Property", "The addendum diameter"),
1,
)
obj.addProperty(
"App::PropertyLength",
"df",
"root_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "root diameter"),
QT_TRANSLATE_NOOP("App::Property", "The root diameter"),
1,
)

def add_computed_properties(self, obj):
obj.addProperty(
"App::PropertyLength",
"dw",
"pitch_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "The pitch diameter."),
)
Expand All @@ -153,7 +195,7 @@ def add_computed_properties(self, obj):
),
)
obj.setExpression(
"angular_backlash", "backlash / dw * 360° / pi"
"angular_backlash", "backlash / pitch_diameter * 360° / pi"
) # calculate via expression to ease usage for placement
obj.setEditorMode(
"angular_backlash", 1
Expand Down Expand Up @@ -278,16 +320,16 @@ def generate_gear_shape(self, fp):
fp.gear.properties_from_tool = fp.properties_from_tool
fp.gear._update()

fp.dw = "{}mm".format(fp.gear.dw)
fp.pitch_diameter = "{}mm".format(fp.gear.dw)

# computed properties
fp.transverse_pitch = "{}mm".format(fp.gear.pitch)
fp.outside_diameter = fp.dw + 2 * fp.thickness
fp.outside_diameter = fp.pitch_diameter + 2 * fp.thickness
# checksbackwardcompatibility:
if not "da" in fp.PropertiesList:
if not "addendum_diameter" in fp.PropertiesList:
self.add_limiting_diameter_properties(fp)
fp.da = "{}mm".format(fp.gear.df) # swap addednum and dedendum for "internal"
fp.df = "{}mm".format(fp.gear.da) # swap addednum and dedendum for "internal"
fp.addendum_diameter = "{}mm".format(fp.gear.df) # swap addendum and dedendum for "internal"
fp.root_diameter = "{}mm".format(fp.gear.da) # swap addendum and dedendum for "internal"

outer_circle = part.Wire(part.makeCircle(fp.outside_diameter / 2.0))
outer_circle.reverse()
Expand Down Expand Up @@ -341,7 +383,7 @@ def generate_gear_shape(self, fp):
base, fp.height.Value, twist_angle, fp.double_helix
)
else:
inner_circle = part.Wire(part.makeCircle(fp.dw / 2.0))
inner_circle = part.Wire(part.makeCircle(fp.pitch_diameter / 2.0))
inner_circle.reverse()
base = part.Face([outer_circle, inner_circle])
return base.extrude(app.Vector(0, 0, fp.height.Value))
60 changes: 51 additions & 9 deletions freecad/gears/involutegear.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,48 @@ def __init__(self, obj):
obj.Proxy = self
self.compute_traverse_properties(obj)

def onDocumentRestored(self, obj):
"""
backward compatibility functions
"""
if hasattr(obj, "dw"):
pitch_diameter = getattr(obj, "dw")
obj.addProperty(
"App::PropertyLength",
"pitch_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "The pitch diameter."),
1,
)
obj.pitch_diameter = pitch_diameter
obj.removeProperty("dw")
obj.setExpression(
"angular_backlash", "backlash / pitch_diameter * 360° / pi"
)
# replace da with addendum_diameter
if hasattr(obj, "da"):
addendum_diameter = getattr(obj, "da")
obj.addProperty(
"App::PropertyLength",
"addendum_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "The addendum diameter."),
1,
)
obj.addendum_diameter = addendum_diameter

# replace df with root_diameter
if hasattr(obj, "df"):
root_diameter = getattr(obj, "df")
obj.addProperty(
"App::PropertyLength",
"root_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "The root diameter."),
1,
)
obj.root_diameter = root_diameter

def add_hole_properties(self, obj):
"""Add properties for the central hole"""
obj.addProperty(
Expand Down Expand Up @@ -203,22 +245,22 @@ def add_helical_properties(self, obj):
def add_computed_properties(self, obj):
obj.addProperty(
"App::PropertyLength",
"da",
"addendum_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "outside diameter"),
QT_TRANSLATE_NOOP("App::Property", "The outside diameter"),
1,
)
obj.addProperty(
"App::PropertyLength",
"df",
"root_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "root diameter"),
QT_TRANSLATE_NOOP("App::Property", "The root diameter"),
1,
)
self.add_traverse_module_property(obj)
obj.addProperty(
"App::PropertyLength",
"dw",
"pitch_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "The pitch diameter."),
1,
Expand All @@ -233,7 +275,7 @@ def add_computed_properties(self, obj):
),
)
obj.setExpression(
"angular_backlash", "backlash / dw * 360° / pi"
"angular_backlash", "backlash / pitch_diameter * 360° / pi"
) # calculate via expression to ease usage for placement
obj.setEditorMode(
"angular_backlash", 1
Expand Down Expand Up @@ -310,9 +352,9 @@ def compute_traverse_properties(self, obj):
obj.traverse_module = obj.module

obj.transverse_pitch = "{}mm".format(obj.gear.pitch)
obj.da = "{}mm".format(obj.gear.da)
obj.df = "{}mm".format(obj.gear.df)
obj.dw = "{}mm".format(obj.gear.dw)
obj.addendum_diameter = "{}mm".format(obj.gear.da)
obj.root_diameter = "{}mm".format(obj.gear.df)
obj.pitch_diameter = "{}mm".format(obj.gear.dw)

def generate_gear_shape(self, obj):
obj.gear.double_helix = obj.double_helix
Expand Down
Loading

0 comments on commit f7c8080

Please sign in to comment.