Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix dw/beta refactoring bug. #199

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix dw/beta refactoring bug. #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 39 additions & 8 deletions freecad/gears/bevelgear.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,21 +106,21 @@ def __init__(self, obj):
)
obj.addProperty(
"App::PropertyAngle",
"beta",
"helix_angle",
"helical",
QT_TRANSLATE_NOOP("App::Property", "angle used for spiral bevel-gears"),
)
obj.addProperty(
"App::PropertyLength",
"dw",
"pitch_diameter",
"computed",
QT_TRANSLATE_NOOP("App::Property", "The pitch diameter."),
)
obj.setExpression(
"dw", "num_teeth * module"
"pitch_diameter", "num_teeth * module"
) # calculate via expression to ease usage for placement
obj.setEditorMode(
"dw", 1
"pitch_diameter", 1
) # set read-only after setting the expression, else it won't be visible. bug?
obj.addProperty(
"App::PropertyAngle",
Expand All @@ -132,7 +132,7 @@ def __init__(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 All @@ -147,11 +147,42 @@ def __init__(self, obj):
obj.numpoints = 20
obj.backlash = "0.00 mm"
obj.clearance = 0.1
obj.beta = "0 deg"
obj.helix_angle = "0 deg"
obj.reset_origin = True
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 beta with helix_angle
if hasattr(obj, "beta"):
helix_angle = getattr(obj, "beta")
obj.addProperty(
"App::PropertyAngle",
"helix_angle",
"helical",
QT_TRANSLATE_NOOP("App::Property", "helix angle"),
)
obj.helix_angle = helix_angle
obj.removeProperty("beta")

def generate_gear_shape(self, fp):
fp.gear.z = fp.num_teeth
fp.gear.module = fp.module.Value
Expand Down Expand Up @@ -189,7 +220,7 @@ def generate_gear_shape(self, fp):
else: # starting with version 0.0.2
scale_0 = scale - fp.height.Value
scale_1 = scale
if fp.beta.Value == 0:
if fp.helix_angle.Value == 0:
wires.append(make_bspline_wire([scale_0 * p for p in pts]))
wires.append(make_bspline_wire([scale_1 * p for p in pts]))
else:
Expand All @@ -198,7 +229,7 @@ def generate_gear_shape(self, fp):
# rot = rotation3D(- beta_i)
# points = [rot(pt) * scale_i for pt in pts]
angle = (
fp.beta.Value
fp.helix_angle.Value
* np.pi
/ 180.0
* np.sin(np.pi / 4)
Expand Down
40 changes: 20 additions & 20 deletions freecad/gears/connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ def onChanged(self, fp, prop):
angle_master = fp.master_gear.Placement.Rotation.Angle * sum(
fp.master_gear.Placement.Rotation.Axis
)
dw_master = fp.master_gear.dw
dw_slave = fp.slave_gear.dw
dist = (dw_master + dw_slave) / 2
pitch_diameter_master = fp.master_gear.pitch_diameter
pitch_diameter_slave = fp.slave_gear.pitch_diameter
dist = (pitch_diameter_master + pitch_diameter_slave) / 2
if fp.master_gear.shift != 0 or fp.slave_gear.shift != 0:
dist, alpha_w = compute_shifted_gears(
fp.master_gear.module,
Expand All @@ -132,8 +132,8 @@ def onChanged(self, fp, prop):
trans = app.Vector(dist)
mat0.move(trans)
rot = app.Rotation(app.Vector(0, 0, 1), fp.angle1).toMatrix()
angle2 = dw_master / dw_slave * fp.angle1.Value
angle4 = dw_master / dw_slave * np.rad2deg(angle_master)
angle2 = pitch_diameter_master / pitch_diameter_slave * fp.angle1.Value
angle4 = pitch_diameter_master / pitch_diameter_slave * np.rad2deg(angle_master)
rot2 = app.Rotation(app.Vector(0, 0, 1), angle2).toMatrix()
angle3 = abs(fp.slave_gear.num_teeth % 2 - 1) * 180.0 / fp.slave_gear.num_teeth
rot3 = app.Rotation(app.Vector(0, 0, 1), angle3).toMatrix()
Expand All @@ -148,9 +148,9 @@ def onChanged(self, fp, prop):
angle_master = fp.master_gear.Placement.Rotation.Angle * sum(
fp.master_gear.Placement.Rotation.Axis
)
dw_master = fp.master_gear.dw
dw_slave = fp.slave_gear.dw
dist = (dw_master - dw_slave) / 2
pitch_diameter_master = fp.master_gear.pitch_diameter
pitch_diameter_slave = fp.slave_gear.pitch_diameter
dist = (pitch_diameter_master - pitch_diameter_slave) / 2
if fp.master_gear.shift != 0 or fp.slave_gear.shift != 0:
dist, alpha_w = compute_shifted_gears(
fp.master_gear.module,
Expand All @@ -165,8 +165,8 @@ def onChanged(self, fp, prop):
trans = app.Vector(dist)
mat0.move(trans)
rot = app.Rotation(app.Vector(0, 0, 1), fp.angle1).toMatrix()
angle2 = -dw_master / dw_slave * fp.angle1.Value
angle4 = -dw_master / dw_slave * np.rad2deg(angle_master)
angle2 = -pitch_diameter_master / pitch_diameter_slave * fp.angle1.Value
angle4 = -pitch_diameter_master / pitch_diameter_slave * np.rad2deg(angle_master)
rot2 = app.Rotation(app.Vector(0, 0, 1), angle2).toMatrix()
angle3 = abs(fp.slave_gear.num_teeth % 2 - 1) * 180.0 / fp.slave_gear.num_teeth
rot3 = app.Rotation(app.Vector(0, 0, 1), angle3).toMatrix()
Expand All @@ -185,15 +185,15 @@ def onChanged(self, fp, prop):
angle_master = fp.master_gear.Placement.Rotation.Angle * sum(
fp.master_gear.Placement.Rotation.Axis
)
dw_master = fp.master_gear.dw.Value
dw_slave = 0
dist = -(dw_master + dw_slave) / 2
pitch_diameter_master = fp.master_gear.pitch_diameter.Value
pitch_diameter_slave = 0
dist = -(pitch_diameter_master + pitch_diameter_slave) / 2
mat0 = app.Matrix() # unity matrix
mat0.move(app.Vector(dist, 0, 0))
mat1 = app.Matrix()
mat1.move(app.Vector(0, np.deg2rad(fp.angle1.Value) * dw_master / 2, 0))
mat1.move(app.Vector(0, np.deg2rad(fp.angle1.Value) * pitch_diameter_master / 2, 0))
mat2 = app.Matrix()
mat2.move(app.Vector(0, -np.deg2rad(fp.angle2.Value) * dw_master / 2, 0))
mat2.move(app.Vector(0, -np.deg2rad(fp.angle2.Value) * pitch_diameter_master / 2, 0))
rot = app.Rotation(app.Vector(0, 0, 1), fp.angle1).toMatrix()
mat3 = rot * mat2 * mat1 * mat0
mat3.move(fp.master_gear.Placement.Base)
Expand All @@ -205,15 +205,15 @@ def onChanged(self, fp, prop):
angle_master = fp.master_gear.Placement.Rotation.Angle * sum(
fp.master_gear.Placement.Rotation.Axis
)
dw_master = fp.master_gear.dw
dw_slave = fp.slave_gear.dw
dist = (dw_master + dw_slave) / 2
pitch_diameter_master = fp.master_gear.pitch_diameter
pitch_diameter_slave = fp.slave_gear.pitch_diameter
dist = (pitch_diameter_master + pitch_diameter_slave) / 2
mat0 = app.Matrix() # unity matrix
trans = app.Vector(dist, 0, 0)
mat0.move(trans)
rot = app.Rotation(app.Vector(0, 0, 1), fp.angle1).toMatrix()
angle2 = dw_master / dw_slave * fp.angle1.Value
angle4 = dw_master / dw_slave * np.rad2deg(angle_master)
angle2 = pitch_diameter_master / pitch_diameter_slave * fp.angle1.Value
angle4 = pitch_diameter_master / pitch_diameter_slave * np.rad2deg(angle_master)
rot2 = app.Rotation(app.Vector(0, 0, 1), angle2).toMatrix()
angle3 = abs(fp.slave_gear.num_teeth % 2 - 1) * 180.0 / fp.slave_gear.num_teeth
rot3 = app.Rotation(app.Vector(0, 0, 1), angle3).toMatrix()
Expand Down