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

PD: replace error-prone strings with enum to handle different helix modes

Browse Source
This commit is contained in:
wmayer
2021-03-28 13:37:13 +02:00
parent 1a8b840709
commit 2df88592ec
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,26 +111,26 @@ short Helix::mustExecute() const
App::DocumentObjectExecReturn *Helix::execute(void)
{
// Validate and normalize parameters
std::string mode = Mode.getValueAsString();
if (mode == "pitch-height-angle") {
HelixMode mode = static_cast<HelixMode>(Mode.getValue());
if (mode == HelixMode::pitch_height_angle) {
if (Pitch.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Error: Pitch too small");
if (Height.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Error: height too small!");
Turns.setValue(Height.getValue()/Pitch.getValue());
} else if (mode == "pitch-turns-angle") {
} else if (mode == HelixMode::pitch_turns_angle) {
if (Pitch.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Error: pitch too small!");
if (Turns.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Error: turns too small!");
Height.setValue(Turns.getValue()*Pitch.getValue());
} else if (mode == "height-turns-angle") {
} else if (mode == HelixMode::height_turns_angle) {
if (Height.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Error: height too small!");
if (Turns.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Error turns too small!");
Pitch.setValue(Height.getValue()/Turns.getValue());
} else if (mode == "height-turns-growth") {
} else if (mode == HelixMode::height_turns_growth) {
if (Turns.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Error turns too small!");
Pitch.setValue(Height.getValue()/Turns.getValue());

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

@@ -31,6 +31,13 @@
namespace PartDesign
{
enum class HelixMode {
pitch_height_angle,
pitch_turns_angle,
height_turns_angle,
height_turns_growth
};
class PartDesignExport Helix : public ProfileBased
{
PROPERTY_HEADER(PartDesign::Helix);

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

@@ -55,6 +55,7 @@
#include "TaskHelixParameters.h"
using namespace PartDesignGui;
using PartDesign::HelixMode;
using namespace Gui;
@@ -287,20 +288,20 @@ void TaskHelixParameters::updateUI()
if(pcHelix->getAddSubType() == PartDesign::FeatureAddSub::Subtractive)
isOutsideVisible = true;
std::string mode = propMode->getValueAsString();
if (mode == "pitch-height-angle") {
HelixMode mode = static_cast<HelixMode>(propMode->getValue());
if (mode == HelixMode::pitch_height_angle) {
isPitchVisible = true;
isHeightVisible = true;
isAngleVisible = true;
} else if (mode == "pitch-turns-angle") {
} else if (mode == HelixMode::pitch_turns_angle) {
isPitchVisible = true;
isTurnsVisible = true;
isAngleVisible = true;
} else if (mode == "height-turns-angle") {
} else if (mode == HelixMode::height_turns_angle) {
isHeightVisible = true;
isTurnsVisible = true;
isAngleVisible = true;
} else if (mode == "height-turns-growth") {
} else if (mode == HelixMode::height_turns_growth) {
isHeightVisible = true;
isTurnsVisible = true;
isGrowthVisible = true;