diff --git a/src/App/Application.cpp b/src/App/Application.cpp index 4dd0c3fe2f..0d8b2c0c7f 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -1891,86 +1891,86 @@ void Application::initTypes() Data::Segment ::init(); // Properties - App ::Property ::init(); - App ::PropertyContainer ::init(); - App ::PropertyLists ::init(); - App ::PropertyBool ::init(); - App ::PropertyBoolList ::init(); - App ::PropertyFloat ::init(); - App ::PropertyFloatList ::init(); - App ::PropertyFloatConstraint ::init(); - App ::PropertyPrecision ::init(); - App ::PropertyQuantity ::init(); - App ::PropertyQuantityConstraint::init(); - App ::PropertyAngle ::init(); - App ::PropertyDistance ::init(); - App ::PropertyLength ::init(); - App ::PropertyArea ::init(); - App ::PropertyVolume ::init(); - App ::PropertyFrequency ::init(); - App ::PropertySpeed ::init(); - App ::PropertyAcceleration ::init(); - App ::PropertyForce ::init(); - App ::PropertyPressure ::init(); - App ::PropertyElectricPotential ::init(); - App ::PropertyVacuumPermittivity::init(); - App ::PropertyInteger ::init(); - App ::PropertyIntegerConstraint ::init(); - App ::PropertyPercent ::init(); - App ::PropertyEnumeration ::init(); - App ::PropertyIntegerList ::init(); - App ::PropertyIntegerSet ::init(); - App ::PropertyMap ::init(); - App ::PropertyString ::init(); - App ::PropertyPersistentObject ::init(); - App ::PropertyUUID ::init(); - App ::PropertyFont ::init(); - App ::PropertyStringList ::init(); - App ::PropertyLinkBase ::init(); - App ::PropertyLinkListBase ::init(); - App ::PropertyLink ::init(); - App ::PropertyLinkChild ::init(); - App ::PropertyLinkGlobal ::init(); - App ::PropertyLinkHidden ::init(); - App ::PropertyLinkSub ::init(); - App ::PropertyLinkSubChild ::init(); - App ::PropertyLinkSubGlobal ::init(); - App ::PropertyLinkSubHidden ::init(); - App ::PropertyLinkList ::init(); - App ::PropertyLinkListChild ::init(); - App ::PropertyLinkListGlobal ::init(); - App ::PropertyLinkListHidden ::init(); - App ::PropertyLinkSubList ::init(); - App ::PropertyLinkSubListChild ::init(); - App ::PropertyLinkSubListGlobal ::init(); - App ::PropertyLinkSubListHidden ::init(); - App ::PropertyXLink ::init(); - App ::PropertyXLinkSub ::init(); - App ::PropertyXLinkSubList ::init(); - App ::PropertyXLinkList ::init(); - App ::PropertyXLinkContainer ::init(); - App ::PropertyMatrix ::init(); - App ::PropertyVector ::init(); - App ::PropertyVectorDistance ::init(); - App ::PropertyPosition ::init(); - App ::PropertyDirection ::init(); - App ::PropertyVectorList ::init(); - App ::PropertyPlacement ::init(); - App ::PropertyPlacementList ::init(); - App ::PropertyPlacementLink ::init(); - App ::PropertyRotation ::init(); - App ::PropertyGeometry ::init(); - App ::PropertyComplexGeoData ::init(); - App ::PropertyColor ::init(); - App ::PropertyColorList ::init(); - App ::PropertyMaterial ::init(); - App ::PropertyMaterialList ::init(); - App ::PropertyPath ::init(); - App ::PropertyFile ::init(); - App ::PropertyFileIncluded ::init(); - App ::PropertyPythonObject ::init(); - App ::PropertyExpressionContainer ::init(); - App ::PropertyExpressionEngine ::init(); + App ::Property ::init(); + App ::PropertyAcceleration ::init(); + App ::PropertyAngle ::init(); + App ::PropertyArea ::init(); + App ::PropertyBool ::init(); + App ::PropertyBoolList ::init(); + App ::PropertyColor ::init(); + App ::PropertyColorList ::init(); + App ::PropertyComplexGeoData ::init(); + App ::PropertyContainer ::init(); + App ::PropertyDirection ::init(); + App ::PropertyDistance ::init(); + App ::PropertyElectricPotential ::init(); + App ::PropertyEnumeration ::init(); + App ::PropertyExpressionContainer::init(); + App ::PropertyExpressionEngine ::init(); + App ::PropertyFile ::init(); + App ::PropertyFileIncluded ::init(); + App ::PropertyFloat ::init(); + App ::PropertyFloatConstraint ::init(); + App ::PropertyFloatList ::init(); + App ::PropertyFont ::init(); + App ::PropertyForce ::init(); + App ::PropertyFrequency ::init(); + App ::PropertyGeometry ::init(); + App ::PropertyInteger ::init(); + App ::PropertyIntegerConstraint ::init(); + App ::PropertyIntegerList ::init(); + App ::PropertyIntegerSet ::init(); + App ::PropertyLength ::init(); + App ::PropertyLink ::init(); + App ::PropertyLinkBase ::init(); + App ::PropertyLinkChild ::init(); + App ::PropertyLinkGlobal ::init(); + App ::PropertyLinkHidden ::init(); + App ::PropertyLinkList ::init(); + App ::PropertyLinkListBase ::init(); + App ::PropertyLinkListChild ::init(); + App ::PropertyLinkListGlobal ::init(); + App ::PropertyLinkListHidden ::init(); + App ::PropertyLinkSub ::init(); + App ::PropertyLinkSubChild ::init(); + App ::PropertyLinkSubGlobal ::init(); + App ::PropertyLinkSubHidden ::init(); + App ::PropertyLinkSubList ::init(); + App ::PropertyLinkSubListChild ::init(); + App ::PropertyLinkSubListGlobal ::init(); + App ::PropertyLinkSubListHidden ::init(); + App ::PropertyLists ::init(); + App ::PropertyMap ::init(); + App ::PropertyMaterial ::init(); + App ::PropertyMaterialList ::init(); + App ::PropertyMatrix ::init(); + App ::PropertyPath ::init(); + App ::PropertyPercent ::init(); + App ::PropertyPersistentObject ::init(); + App ::PropertyPlacement ::init(); + App ::PropertyPlacementList ::init(); + App ::PropertyPlacementLink ::init(); + App ::PropertyPrecision ::init(); + App ::PropertyPressure ::init(); + App ::PropertyPosition ::init(); + App ::PropertyPythonObject ::init(); + App ::PropertyQuantity ::init(); + App ::PropertyQuantityConstraint ::init(); + App ::PropertyRotation ::init(); + App ::PropertySpeed ::init(); + App ::PropertyString ::init(); + App ::PropertyStringList ::init(); + App ::PropertyUUID ::init(); + App ::PropertyVacuumPermittivity ::init(); + App ::PropertyVector ::init(); + App ::PropertyVectorDistance ::init(); + App ::PropertyVectorList ::init(); + App ::PropertyVolume ::init(); + App ::PropertyXLink ::init(); + App ::PropertyXLinkContainer ::init(); + App ::PropertyXLinkList ::init(); + App ::PropertyXLinkSub ::init(); + App ::PropertyXLinkSubList ::init(); // Extension classes App ::Extension ::init(); diff --git a/src/App/PropertyUnits.cpp b/src/App/PropertyUnits.cpp index 201cdbb331..995aca9a21 100644 --- a/src/App/PropertyUnits.cpp +++ b/src/App/PropertyUnits.cpp @@ -203,42 +203,6 @@ void PropertyQuantityConstraint::setPyObject(PyObject *value) PropertyFloat::setValue(quant.getValue()); // clazy:exclude=skipped-base-method } -//************************************************************************** -//************************************************************************** -// PropertyDistance -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -TYPESYSTEM_SOURCE(App::PropertyDistance, App::PropertyQuantity) - -PropertyDistance::PropertyDistance() -{ - setUnit(Base::Unit::Length); -} - -//************************************************************************** -//************************************************************************** -// PropertyFrequency -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -TYPESYSTEM_SOURCE(App::PropertyFrequency, App::PropertyQuantity) - -PropertyFrequency::PropertyFrequency() -{ - setUnit(Base::Unit::Frequency); -} - -//************************************************************************** -//************************************************************************** -// PropertySpeed -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -TYPESYSTEM_SOURCE(App::PropertySpeed, App::PropertyQuantity) - -PropertySpeed::PropertySpeed() -{ - setUnit(Base::Unit::Velocity); -} - //************************************************************************** //************************************************************************** // PropertyAcceleration @@ -251,45 +215,6 @@ PropertyAcceleration::PropertyAcceleration() setUnit(Base::Unit::Acceleration); } -//************************************************************************** -//************************************************************************** -// PropertyLength -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -TYPESYSTEM_SOURCE(App::PropertyLength, App::PropertyQuantityConstraint) - -PropertyLength::PropertyLength() -{ - setUnit(Base::Unit::Length); - setConstraints(&LengthStandard); -} - -//************************************************************************** -//************************************************************************** -// PropertyArea -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -TYPESYSTEM_SOURCE(App::PropertyArea, App::PropertyQuantityConstraint) - -PropertyArea::PropertyArea() -{ - setUnit(Base::Unit::Area); - setConstraints(&LengthStandard); -} - -//************************************************************************** -//************************************************************************** -// PropertyVolume -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -TYPESYSTEM_SOURCE(App::PropertyVolume, App::PropertyQuantityConstraint) - -PropertyVolume::PropertyVolume() -{ - setUnit(Base::Unit::Volume); - setConstraints(&LengthStandard); -} - //************************************************************************** //************************************************************************** // PropertyAngle @@ -305,38 +230,27 @@ PropertyAngle::PropertyAngle() //************************************************************************** //************************************************************************** -// PropertyPressure +// PropertyArea //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyPressure, App::PropertyQuantity) +TYPESYSTEM_SOURCE(App::PropertyArea, App::PropertyQuantityConstraint) -PropertyPressure::PropertyPressure() +PropertyArea::PropertyArea() { - setUnit(Base::Unit::Pressure); + setUnit(Base::Unit::Area); + setConstraints(&LengthStandard); } //************************************************************************** //************************************************************************** -// PropertyStiffness +// PropertyDistance //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyStiffness, App::PropertyQuantity) +TYPESYSTEM_SOURCE(App::PropertyDistance, App::PropertyQuantity) -PropertyStiffness::PropertyStiffness() +PropertyDistance::PropertyDistance() { - setUnit(Base::Unit::Stiffness); -} - -//************************************************************************** -//************************************************************************** -// PropertyForce -//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -TYPESYSTEM_SOURCE(App::PropertyForce, App::PropertyQuantity) - -PropertyForce::PropertyForce() -{ - setUnit(Base::Unit::Force); + setUnit(Base::Unit::Length); } //************************************************************************** @@ -351,6 +265,80 @@ PropertyElectricPotential::PropertyElectricPotential() setUnit(Base::Unit::ElectricPotential); } +//************************************************************************** +//************************************************************************** +// PropertyFrequency +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +TYPESYSTEM_SOURCE(App::PropertyFrequency, App::PropertyQuantity) + +PropertyFrequency::PropertyFrequency() +{ + setUnit(Base::Unit::Frequency); +} + +//************************************************************************** +//************************************************************************** +// PropertyForce +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +TYPESYSTEM_SOURCE(App::PropertyForce, App::PropertyQuantity) + +PropertyForce::PropertyForce() +{ + setUnit(Base::Unit::Force); +} + +//************************************************************************** +//************************************************************************** +// PropertyLength +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +TYPESYSTEM_SOURCE(App::PropertyLength, App::PropertyQuantityConstraint) + +PropertyLength::PropertyLength() +{ + setUnit(Base::Unit::Length); + setConstraints(&LengthStandard); +} + + +//************************************************************************** +//************************************************************************** +// PropertyPressure +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +TYPESYSTEM_SOURCE(App::PropertyPressure, App::PropertyQuantity) + +PropertyPressure::PropertyPressure() +{ + setUnit(Base::Unit::Pressure); +} + +//************************************************************************** +//************************************************************************** +// PropertySpeed +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +TYPESYSTEM_SOURCE(App::PropertySpeed, App::PropertyQuantity) + +PropertySpeed::PropertySpeed() +{ + setUnit(Base::Unit::Velocity); +} + +//************************************************************************** +//************************************************************************** +// PropertyStiffness +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +TYPESYSTEM_SOURCE(App::PropertyStiffness, App::PropertyQuantity) + +PropertyStiffness::PropertyStiffness() +{ + setUnit(Base::Unit::Stiffness); +} + //************************************************************************** //************************************************************************** // PropertyVacuumPermittivity @@ -362,3 +350,16 @@ PropertyVacuumPermittivity::PropertyVacuumPermittivity() { setUnit(Base::Unit::VacuumPermittivity); } + +//************************************************************************** +//************************************************************************** +// PropertyVolume +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +TYPESYSTEM_SOURCE(App::PropertyVolume, App::PropertyQuantityConstraint) + +PropertyVolume::PropertyVolume() +{ + setUnit(Base::Unit::Volume); + setConstraints(&LengthStandard); +} diff --git a/src/App/PropertyUnits.h b/src/App/PropertyUnits.h index e241c5e4be..fef0d547bc 100644 --- a/src/App/PropertyUnits.h +++ b/src/App/PropertyUnits.h @@ -119,52 +119,17 @@ protected: const Constraints* _ConstStruct; }; -/** Distance property - * This is a property for representing distances. It is basically a float - * property. On the Gui it has a quantity like m or mm. +/** Acceleration property + * This is a property for representing acceleration. It is basically a float + * property. On the Gui it has a quantity like m/s^2. */ -class AppExport PropertyDistance: public PropertyQuantity +class AppExport PropertyAcceleration: public PropertyQuantity { TYPESYSTEM_HEADER(); -public: - PropertyDistance(void); - virtual ~PropertyDistance(){} -}; -/** Length property - * This is a property for representing lengths. It is basically a float - * property which must not be negative. On the Gui it has a quantity like m or mm. - */ -class AppExport PropertyLength : public PropertyQuantityConstraint -{ - TYPESYSTEM_HEADER(); public: - PropertyLength(void); - virtual ~PropertyLength(){} -}; - -/** Area property - * This is a property for representing areas. It is basically a float - * property which must not be negative. On the Gui it has a quantity like m^2 or mm^2. - */ -class AppExport PropertyArea : public PropertyQuantityConstraint -{ - TYPESYSTEM_HEADER(); -public: - PropertyArea(void); - virtual ~PropertyArea(){} -}; - -/** Volume property - * This is a property for representing volumes. It is basically a float - * property which must not be negative. On the Gui it has a quantity like m^3 or mm^3. - */ -class AppExport PropertyVolume : public PropertyQuantityConstraint -{ - TYPESYSTEM_HEADER(); -public: - PropertyVolume(void); - virtual ~PropertyVolume(){} + PropertyAcceleration(void); + virtual ~PropertyAcceleration() {} }; /** Angle property @@ -174,10 +139,50 @@ public: class AppExport PropertyAngle: public PropertyQuantityConstraint { TYPESYSTEM_HEADER(); + public: PropertyAngle(void); - virtual ~PropertyAngle(){} - virtual const char* getEditorName(void) const { return "Gui::PropertyEditor::PropertyAngleItem"; } + virtual ~PropertyAngle() {} + virtual const char *getEditorName(void) const { return "Gui::PropertyEditor::PropertyAngleItem"; } +}; + +/** Area property + * This is a property for representing areas. It is basically a float + * property which must not be negative. On the Gui it has a quantity like m^2 or mm^2. + */ +class AppExport PropertyArea: public PropertyQuantityConstraint +{ + TYPESYSTEM_HEADER(); + +public: + PropertyArea(void); + virtual ~PropertyArea() {} +}; + +/** Distance property + * This is a property for representing distances. It is basically a float + * property. On the Gui it has a quantity like m or mm. + */ +class AppExport PropertyDistance: public PropertyQuantity +{ + TYPESYSTEM_HEADER(); + +public: + PropertyDistance(void); + virtual ~PropertyDistance() {} +}; + +/** ElectricPotential property + * This is a property for electric potentials. It is basically a float + * property. On the Gui it has a quantity of Volt. + */ +class AppExport PropertyElectricPotential: public PropertyQuantity +{ + TYPESYSTEM_HEADER(); + +public: + PropertyElectricPotential(void); + virtual ~PropertyElectricPotential() {} }; /** Frequency property @@ -187,57 +192,10 @@ public: class AppExport PropertyFrequency: public PropertyQuantity { TYPESYSTEM_HEADER(); + public: PropertyFrequency(void); - virtual ~PropertyFrequency(){} -}; - -/** Speed property - * This is a property for representing speed. It is basically a float - * property. On the Gui it has a quantity like m/s or km/h. - */ -class AppExport PropertySpeed: public PropertyQuantity -{ - TYPESYSTEM_HEADER(); -public: - PropertySpeed(void); - virtual ~PropertySpeed(){} -}; - -/** Acceleration property - * This is a property for representing acceleration. It is basically a float - * property. On the Gui it has a quantity like m/s^2. - */ -class AppExport PropertyAcceleration: public PropertyQuantity -{ - TYPESYSTEM_HEADER(); -public: - PropertyAcceleration(void); - virtual ~PropertyAcceleration(){} -}; - -/** Pressure property - * This is a property for representing acceleration. It is basically a float - * property. On the Gui it has a quantity like m/s^2. - */ -class AppExport PropertyPressure: public PropertyQuantity -{ - TYPESYSTEM_HEADER(); -public: - PropertyPressure(void); - virtual ~PropertyPressure(){} -}; - -/** Stiffness property - * This is a property for representing stiffness. It is basically a float - * property. On the Gui it has a quantity like m/s^2. - */ -class AppExport PropertyStiffness: public PropertyQuantity -{ - TYPESYSTEM_HEADER(); -public: - PropertyStiffness(void); - virtual ~PropertyStiffness(){} + virtual ~PropertyFrequency() {} }; /** Force property @@ -247,21 +205,62 @@ public: class AppExport PropertyForce: public PropertyQuantity { TYPESYSTEM_HEADER(); + public: PropertyForce(void); - virtual ~PropertyForce(){} + virtual ~PropertyForce() {} }; -/** ElectricPotential property - * This is a property for electric potentials. It is basically a float - * property. On the Gui it has a quantity of Volt. +/** Length property + * This is a property for representing lengths. It is basically a float + * property which must not be negative. On the Gui it has a quantity like m or mm. */ -class AppExport PropertyElectricPotential : public PropertyQuantity +class AppExport PropertyLength: public PropertyQuantityConstraint { TYPESYSTEM_HEADER(); + public: - PropertyElectricPotential(void); - virtual ~PropertyElectricPotential() {} + PropertyLength(void); + virtual ~PropertyLength() {} +}; + +/** Pressure property + * This is a property for representing acceleration. It is basically a float + * property. On the Gui it has a quantity like m/s^2. + */ +class AppExport PropertyPressure: public PropertyQuantity +{ + TYPESYSTEM_HEADER(); + +public: + PropertyPressure(void); + virtual ~PropertyPressure() {} +}; + +/** Speed property + * This is a property for representing speed. It is basically a float + * property. On the Gui it has a quantity like m/s or km/h. + */ +class AppExport PropertySpeed: public PropertyQuantity +{ + TYPESYSTEM_HEADER(); + +public: + PropertySpeed(void); + virtual ~PropertySpeed() {} +}; + +/** Stiffness property + * This is a property for representing stiffness. It is basically a float + * property. On the Gui it has a quantity like m/s^2. + */ +class AppExport PropertyStiffness: public PropertyQuantity +{ + TYPESYSTEM_HEADER(); + +public: + PropertyStiffness(void); + virtual ~PropertyStiffness() {} }; /** VacuumPermittivity property @@ -271,11 +270,25 @@ public: class AppExport PropertyVacuumPermittivity: public PropertyQuantity { TYPESYSTEM_HEADER(); + public: PropertyVacuumPermittivity(void); - virtual ~PropertyVacuumPermittivity(){} + virtual ~PropertyVacuumPermittivity() {} }; -} // namespace App +/** Volume property + * This is a property for representing volumes. It is basically a float + * property which must not be negative. On the Gui it has a quantity like m^3 or mm^3. + */ +class AppExport PropertyVolume: public PropertyQuantityConstraint +{ + TYPESYSTEM_HEADER(); -#endif // APP_PROPERTYUNITS_H +public: + PropertyVolume(void); + virtual ~PropertyVolume() {} +}; + +}// namespace App + +#endif// APP_PROPERTYUNITS_H