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

[PD] make constraints static class member

Browse Source 
the MSVC IDE warned me about different floatAngle definitions in PD
This commit is contained in:
donovaly
2021-03-03 13:53:22 +01:00
committed by wwmayer
parent 42bf2c8285
commit 3704ad68d8
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/PartDesign/App/FeatureChamfer.cpp
View File

@@ -53,8 +53,8 @@ using namespace PartDesign;
PROPERTY_SOURCE(PartDesign::Chamfer, PartDesign::DressUp)
const char* ChamferTypeEnums[] = {"Equal distance", "Two distances", "Distance and Angle", NULL};
const App::PropertyQuantityConstraint::Constraints floatSize = {0.0,FLT_MAX,0.1};
const App::PropertyAngle::Constraints floatAngle = {0.0,180.0,1.0};
const App::PropertyQuantityConstraint::Constraints Chamfer::floatSize = {0.0, FLT_MAX, 0.1};
const App::PropertyAngle::Constraints Chamfer::floatAngle = {0.0, 180.0, 1.0};
static App::DocumentObjectExecReturn *validateParameters(int chamferType, double size, double size2, double angle);

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

@@ -62,6 +62,8 @@ public:
protected:
void Restore(Base::XMLReader &reader) override;
static const App::PropertyQuantityConstraint::Constraints floatSize;
static const App::PropertyAngle::Constraints floatAngle;
};
} //namespace Part

4
src/Mod/PartDesign/App/FeaturePolarPattern.cpp
View File

@@ -48,8 +48,8 @@ namespace PartDesign {
PROPERTY_SOURCE(PartDesign::PolarPattern, PartDesign::Transformed)
const App::PropertyIntegerConstraint::Constraints intOccurrences = { 1, INT_MAX, 1 };
const App::PropertyAngle::Constraints floatAngle = { Base::toDegrees<double>(Precision::Angular()), 360.0, 1.0 };
const App::PropertyIntegerConstraint::Constraints PolarPattern::intOccurrences = { 1, INT_MAX, 1 };
const App::PropertyAngle::Constraints PolarPattern::floatAngle = { Base::toDegrees<double>(Precision::Angular()), 360.0, 1.0 };
PolarPattern::PolarPattern()
{

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

@@ -68,6 +68,8 @@ public:
protected:
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
static const App::PropertyIntegerConstraint::Constraints intOccurrences;
static const App::PropertyAngle::Constraints floatAngle;
};
} //namespace PartDesign