From ecd4038d3a650d5d0e1bcb17870f14e5cdcecebc Mon Sep 17 00:00:00 2001 From: mwganson Date: Mon, 12 Aug 2019 21:53:49 -0500 Subject: [PATCH] [PartDesign] Draft angle property change from App::PropertyFloatConstraint to App::PropertyAngle --- src/Mod/PartDesign/App/FeatureDraft.cpp | 7 ++++--- src/Mod/PartDesign/App/FeatureDraft.h | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Mod/PartDesign/App/FeatureDraft.cpp b/src/Mod/PartDesign/App/FeatureDraft.cpp index 67d6391b06..7fcd70a5f1 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.cpp +++ b/src/Mod/PartDesign/App/FeatureDraft.cpp @@ -65,12 +65,10 @@ using namespace PartDesign; PROPERTY_SOURCE(PartDesign::Draft, PartDesign::DressUp) -const App::PropertyFloatConstraint::Constraints floatAngle = {0.0,89.99,0.1}; Draft::Draft() { ADD_PROPERTY(Angle,(1.5)); - Angle.setConstraints(&floatAngle); ADD_PROPERTY_TYPE(NeutralPlane,(0),"Draft",(App::PropertyType)(App::Prop_None),"NeutralPlane"); ADD_PROPERTY_TYPE(PullDirection,(0),"Draft",(App::PropertyType)(App::Prop_None),"PullDirection"); ADD_PROPERTY(Reversed,(0)); @@ -105,7 +103,10 @@ App::DocumentObjectExecReturn *Draft::execute(void) return new App::DocumentObjectExecReturn("No faces specified"); // Draft angle - double angle = Angle.getValue() / 180.0 * M_PI; + double angle = Angle.getValue(); + angle = angle >= 90.0 ? 89.99 : angle < 0.0 ? 0.0 : angle; + Angle.setValue(angle); + angle = angle / 180.0 * M_PI; // Pull direction gp_Dir pullDirection; diff --git a/src/Mod/PartDesign/App/FeatureDraft.h b/src/Mod/PartDesign/App/FeatureDraft.h index 0b98c89b21..04cd72197b 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.h +++ b/src/Mod/PartDesign/App/FeatureDraft.h @@ -25,6 +25,7 @@ #define PARTDESIGN_FEATUREDRAFT_H #include +#include #include #include "FeatureDressUp.h" @@ -38,7 +39,7 @@ class PartDesignExport Draft : public DressUp public: Draft(); - App::PropertyFloatConstraint Angle; + App::PropertyAngle Angle; App::PropertyLinkSub NeutralPlane; App::PropertyLinkSub PullDirection; App::PropertyBool Reversed;