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

[PD] allow negative helix growth

Browse Source 
Helices that become smaller with every turn are geometrically perfectly valid. Therefore we cannot forbid this.

(For example when creating a helix from a face you often cannot move it so that you can apply a positive growth.)
This commit is contained in:
Uwe
2021-11-29 00:53:19 +01:00
parent 1358cd021f
commit 35683883cb
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,14 +134,13 @@ App::DocumentObjectExecReturn *Helix::execute(void)
if (Turns.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Error: turns too small!");
if ((Height.getValue() < Precision::Confusion())
&& (Growth.getValue() < Precision::Confusion()))
&& (abs(Growth.getValue()) < Precision::Confusion()))
return new App::DocumentObjectExecReturn("Error: either height or growth must not be zero!");
Pitch.setValue(Height.getValue()/Turns.getValue());
} else {
return new App::DocumentObjectExecReturn("Error: unsupported mode");
}
TopoDS_Shape sketchshape;
try {
sketchshape = getVerifiedFace();
@@ -407,7 +406,7 @@ TopoDS_Shape Helix::generateHelixPath(void)
bool growthMode = std::string(Mode.getValueAsString()).find("growth") != std::string::npos;
double radiusTop;
if (growthMode)
radiusTop = radius + turns*growth;
radiusTop = radius + turns * growth;
else
radiusTop = radius + height * tan(Base::toRadians(angle));
@@ -534,6 +533,13 @@ void Helix::handleChangedPropertyType(Base::XMLReader& reader, const char* TypeN
TurnsProperty.Restore(reader);
Turns.setValue(TurnsProperty.getValue());
}
// property Growth had the App::PropertyLength and was changed to App::PropertyDistance
else if (prop == &Growth && strcmp(TypeName, "App::PropertyLength") == 0) {
App::PropertyLength GrowthProperty;
// restore the PropertyLength to be able to set its value
GrowthProperty.Restore(reader);
Growth.setValue(GrowthProperty.getValue());
}
else {
ProfileBased::handleChangedPropertyType(reader, TypeName, prop);
}

2
src/Mod/PartDesign/App/FeatureHelix.h
View File

@@ -52,7 +52,7 @@ public:
App::PropertyFloatConstraint Turns;
App::PropertyBool LeftHanded;
App::PropertyAngle Angle;
App::PropertyLength Growth;
App::PropertyDistance Growth;
App::PropertyEnumeration Mode;
App::PropertyBool Outside;
App::PropertyBool HasBeenEdited;

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

@@ -95,7 +95,7 @@ protected:
App::PropertyBool* propReversed;
App::PropertyLinkSub* propReferenceAxis;
App::PropertyAngle* propAngle;
App::PropertyLength* propGrowth;
App::PropertyDistance* propGrowth;
App::PropertyEnumeration* propMode;
App::PropertyBool* propOutside;