kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

PD: Fix assignment of Angle/Growth properties

Browse Source 
Depending on the input mode, either `Growth` or `Angle` is used to create
a conical or flat spiral. The respective other can easily be calculated
to give consistent view. This is already done for the other properties,
e.g. `Height` is calculated from `Pitch` and `Turns`.
With this patch, the same is done for `Angle` and `Growth`.
This commit is contained in:
Jonas Bähr
2021-12-12 18:08:13 +01:00
committed by Uwe
parent 11822b8c5c
commit bb3d02298d
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/PartDesign/App/FeatureHelix.cpp
View File

@@ -136,6 +136,7 @@ App::DocumentObjectExecReturn* Helix::execute(void)
if (Height.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Error: height too small!");
Turns.setValue(Height.getValue() / Pitch.getValue());
Growth.setValue(Pitch.getValue() * tan(Base::toRadians(Angle.getValue())));
}
else if (mode == HelixMode::pitch_turns_angle) {
if (Pitch.getValue() < Precision::Confusion())
@@ -143,6 +144,7 @@ App::DocumentObjectExecReturn* Helix::execute(void)
if (Turns.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Error: turns too small!");
Height.setValue(Turns.getValue() * Pitch.getValue());
Growth.setValue(Pitch.getValue() * tan(Base::toRadians(Angle.getValue())));
}
else if (mode == HelixMode::height_turns_angle) {
if (Height.getValue() < Precision::Confusion())
@@ -150,6 +152,7 @@ App::DocumentObjectExecReturn* Helix::execute(void)
if (Turns.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Error: turns too small!");
Pitch.setValue(Height.getValue() / Turns.getValue());
Growth.setValue(Pitch.getValue() * tan(Base::toRadians(Angle.getValue())));
}
else if (mode == HelixMode::height_turns_growth) {
if (Turns.getValue() < Precision::Confusion())
@@ -158,6 +161,16 @@ App::DocumentObjectExecReturn* Helix::execute(void)
&& (abs(Growth.getValue()) < Precision::Confusion()))
return new App::DocumentObjectExecReturn("Error: either height or growth must not be zero!");
Pitch.setValue(Height.getValue() / Turns.getValue());
if (Height.getValue() > 0) {
Angle.setValue(Base::toDegrees(atan(
Turns.getValue() * Growth.getValue() / Height.getValue())));
}
else {
// On purpose, we're doing nothing here; the else-branch is just for this comment.
// - we don't print a warning, as for a flat spiral a zero-height is perfectly fine
// - we don't void the angle (somehow) so that it keeps its value. This allows in
// interactive usage to just go back to another mode and everything keeps working
}
}
else {
return new App::DocumentObjectExecReturn("Error: unsupported mode");

2
src/Mod/PartDesign/Gui/TaskHelixParameters.cpp
View File

@@ -475,6 +475,8 @@ void TaskHelixParameters::onModeChanged(int index)
ui->pitch->setValue(propPitch->getValue());
ui->height->setValue(propHeight->getValue());
ui->turns->setValue(propTurns->getValue());
ui->coneAngle->setValue(propAngle->getValue());
ui->growth->setValue(propGrowth->getValue());
recomputeFeature();
updateUI();