diff --git a/src/Mod/PartDesign/App/FeatureDraft.cpp b/src/Mod/PartDesign/App/FeatureDraft.cpp index 3fcfd91a58..8c946a741a 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.cpp +++ b/src/Mod/PartDesign/App/FeatureDraft.cpp @@ -67,7 +67,7 @@ using namespace PartDesign; PROPERTY_SOURCE(PartDesign::Draft, PartDesign::DressUp) -App::PropertyAngle::Constraints Draft::floatAngle = { 0.0, 90.0 - Base::toDegrees(Precision::Angular()), 0.1 }; +const App::PropertyAngle::Constraints Draft::floatAngle = { 0.0, 90.0 - Base::toDegrees(Precision::Angular()), 0.1 }; Draft::Draft() { diff --git a/src/Mod/PartDesign/App/FeatureDraft.h b/src/Mod/PartDesign/App/FeatureDraft.h index cf07d20ed3..9b7b92510d 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.h +++ b/src/Mod/PartDesign/App/FeatureDraft.h @@ -58,7 +58,7 @@ public: private: virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop); - static App::PropertyAngle::Constraints floatAngle; + static const App::PropertyAngle::Constraints floatAngle; }; } //namespace PartDesign diff --git a/src/Mod/PartDesign/App/FeatureHelix.cpp b/src/Mod/PartDesign/App/FeatureHelix.cpp index f2ec1b78fe..f8dc38b4d1 100644 --- a/src/Mod/PartDesign/App/FeatureHelix.cpp +++ b/src/Mod/PartDesign/App/FeatureHelix.cpp @@ -72,8 +72,8 @@ const char* Helix::ModeEnums[] = {"pitch-height-angle", "pitch-turns-angle", "he PROPERTY_SOURCE(PartDesign::Helix, PartDesign::ProfileBased) // we purposely use not FLT_MAX because this would not be computable -const App::PropertyFloatConstraint::Constraints floatTurns = { Precision::Confusion(), INT_MAX, 1.0 }; -const App::PropertyAngle::Constraints floatAngle = { -89.0, 89.0, 1.0 }; +const App::PropertyFloatConstraint::Constraints Helix::floatTurns = { Precision::Confusion(), INT_MAX, 1.0 }; +const App::PropertyAngle::Constraints Helix::floatAngle = { -89.0, 89.0, 1.0 }; Helix::Helix() { diff --git a/src/Mod/PartDesign/App/FeatureHelix.h b/src/Mod/PartDesign/App/FeatureHelix.h index 0f12c3ac67..23cf82b47e 100644 --- a/src/Mod/PartDesign/App/FeatureHelix.h +++ b/src/Mod/PartDesign/App/FeatureHelix.h @@ -90,6 +90,8 @@ protected: // handle changed property virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop); + static const App::PropertyFloatConstraint::Constraints Helix::floatTurns; + static const App::PropertyAngle::Constraints floatAngle; private: static const char* ModeEnums[]; diff --git a/src/Mod/PartDesign/App/FeatureLinearPattern.cpp b/src/Mod/PartDesign/App/FeatureLinearPattern.cpp index 8d1c9d2321..225da7daa8 100644 --- a/src/Mod/PartDesign/App/FeatureLinearPattern.cpp +++ b/src/Mod/PartDesign/App/FeatureLinearPattern.cpp @@ -32,8 +32,6 @@ # include #endif - -#include "FeatureLinearPattern.h" #include "DatumPlane.h" #include "DatumLine.h" #include @@ -42,6 +40,8 @@ #include #include +#include "FeatureLinearPattern.h" + using namespace PartDesign; namespace PartDesign { @@ -49,7 +49,7 @@ namespace PartDesign { PROPERTY_SOURCE(PartDesign::LinearPattern, PartDesign::Transformed) -const App::PropertyIntegerConstraint::Constraints intOccurrences = { 1, INT_MAX, 1 }; +const App::PropertyIntegerConstraint::Constraints LinearPattern::intOccurrences = { 1, INT_MAX, 1 }; LinearPattern::LinearPattern() { diff --git a/src/Mod/PartDesign/App/FeatureLinearPattern.h b/src/Mod/PartDesign/App/FeatureLinearPattern.h index 445556f221..9649b28b44 100644 --- a/src/Mod/PartDesign/App/FeatureLinearPattern.h +++ b/src/Mod/PartDesign/App/FeatureLinearPattern.h @@ -66,6 +66,7 @@ public: protected: virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop); + static const App::PropertyIntegerConstraint::Constraints intOccurrences; }; } //namespace PartDesign diff --git a/src/Mod/PartDesign/App/FeaturePolarPattern.cpp b/src/Mod/PartDesign/App/FeaturePolarPattern.cpp index 0dfab84734..b5eda35ba8 100644 --- a/src/Mod/PartDesign/App/FeaturePolarPattern.cpp +++ b/src/Mod/PartDesign/App/FeaturePolarPattern.cpp @@ -31,8 +31,6 @@ # include #endif - -#include "FeaturePolarPattern.h" #include "DatumLine.h" #include #include @@ -41,6 +39,8 @@ #include #include +#include "FeaturePolarPattern.h" + using namespace PartDesign; namespace PartDesign { diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.h b/src/Mod/PartDesign/Gui/TaskHelixParameters.h index 05ebe6788e..8b9b017299 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.h +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.h @@ -90,7 +90,7 @@ protected: //mirrors of helixes's properties App::PropertyLength* propPitch; App::PropertyLength* propHeight; - App::PropertyFloat* propTurns; + App::PropertyFloatConstraint* propTurns; App::PropertyBool* propLeftHanded; App::PropertyBool* propReversed; App::PropertyLinkSub* propReferenceAxis;