Mod: Use override etc 2
This commit is contained in:
@@ -40,7 +40,7 @@ public:
|
||||
initialize("This module is the PartDesign module."); // register with Python
|
||||
}
|
||||
|
||||
virtual ~Module() {}
|
||||
~Module() override {}
|
||||
|
||||
private:
|
||||
Py::Object makeFilletArc(const Py::Tuple& args)
|
||||
|
||||
@@ -63,8 +63,8 @@ public:
|
||||
* Add the feature into the body at the current insert point.
|
||||
* The insertion poin is the before next solid after the Tip feature
|
||||
*/
|
||||
virtual std::vector<App::DocumentObject*> addObject(App::DocumentObject*) override;
|
||||
virtual std::vector< DocumentObject* > addObjects(std::vector< DocumentObject* > obj) override;
|
||||
std::vector<App::DocumentObject*> addObject(App::DocumentObject*) override;
|
||||
std::vector< DocumentObject* > addObjects(std::vector< DocumentObject* > obj) override;
|
||||
|
||||
/**
|
||||
* Insert the feature into the body after the given feature.
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
void setBaseProperty(App::DocumentObject* feature);
|
||||
|
||||
/// Remove the feature from the body
|
||||
virtual std::vector<DocumentObject*> removeObject(DocumentObject* obj) override;
|
||||
std::vector<DocumentObject*> removeObject(DocumentObject* obj) override;
|
||||
|
||||
/**
|
||||
* Checks if the given document object lays after the current insert point
|
||||
@@ -105,7 +105,7 @@ public:
|
||||
* all features derived from PartDesign::Feature and Part::Datum and sketches
|
||||
*/
|
||||
static bool isAllowed(const App::DocumentObject *obj);
|
||||
virtual bool allowObject(DocumentObject *obj) override {
|
||||
bool allowObject(DocumentObject *obj) override {
|
||||
return isAllowed(obj);
|
||||
}
|
||||
|
||||
@@ -117,8 +117,8 @@ public:
|
||||
|
||||
PyObject *getPyObject() override;
|
||||
|
||||
virtual std::vector<std::string> getSubObjects(int reason=0) const override;
|
||||
virtual App::DocumentObject *getSubObject(const char *subname,
|
||||
std::vector<std::string> getSubObjects(int reason=0) const override;
|
||||
App::DocumentObject *getSubObject(const char *subname,
|
||||
PyObject **pyObj, Base::Matrix4D *pmat, bool transform, int depth) const override;
|
||||
|
||||
void setShowTip(bool enable) {
|
||||
@@ -141,17 +141,17 @@ public:
|
||||
bool isSolid();
|
||||
|
||||
protected:
|
||||
virtual void onSettingDocument() override;
|
||||
void onSettingDocument() override;
|
||||
|
||||
/// Adjusts the first solid's feature's base on BaseFeature getting set
|
||||
virtual void onChanged (const App::Property* prop) override;
|
||||
void onChanged (const App::Property* prop) override;
|
||||
|
||||
/// Creates the corresponding Origin object
|
||||
virtual void setupObject () override;
|
||||
void setupObject () override;
|
||||
/// Removes all planes and axis if they are still linked to the document
|
||||
virtual void unsetupObject () override;
|
||||
void unsetupObject () override;
|
||||
|
||||
virtual void onDocumentRestored() override;
|
||||
void onDocumentRestored() override;
|
||||
|
||||
private:
|
||||
boost::signals2::scoped_connection connection;
|
||||
|
||||
@@ -36,7 +36,7 @@ class PartDesignExport CoordinateSystem : public Part::Datum
|
||||
|
||||
public:
|
||||
CoordinateSystem();
|
||||
virtual ~CoordinateSystem();
|
||||
~CoordinateSystem() override;
|
||||
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderDatumCoordinateSystem";
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
Base::Vector3d getYAxis();
|
||||
Base::Vector3d getZAxis();
|
||||
|
||||
virtual App::DocumentObject *getSubObject(const char *subname,
|
||||
App::DocumentObject *getSubObject(const char *subname,
|
||||
PyObject **pyObj, Base::Matrix4D *pmat, bool transform, int depth) const override;
|
||||
};
|
||||
|
||||
|
||||
@@ -38,13 +38,13 @@ class PartDesignExport Line : public Part::Datum
|
||||
|
||||
public:
|
||||
Line();
|
||||
virtual ~Line();
|
||||
~Line() override;
|
||||
|
||||
App::PropertyEnumeration ResizeMode;
|
||||
App::PropertyLength Length;
|
||||
virtual void onChanged(const App::Property *prop);
|
||||
void onChanged(const App::Property *prop) override;
|
||||
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderDatumLine";
|
||||
}
|
||||
|
||||
|
||||
@@ -38,21 +38,21 @@ class PartDesignExport Plane : public Part::Datum
|
||||
|
||||
public:
|
||||
Plane();
|
||||
virtual ~Plane();
|
||||
~Plane() override;
|
||||
|
||||
App::PropertyEnumeration ResizeMode;
|
||||
App::PropertyLength Length;
|
||||
App::PropertyLength Width;
|
||||
|
||||
virtual void onChanged(const App::Property *prop);
|
||||
const char* getViewProviderName() const {
|
||||
void onChanged(const App::Property *prop) override;
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderDatumPlane";
|
||||
}
|
||||
|
||||
Base::Vector3d getNormal();
|
||||
|
||||
protected:
|
||||
virtual void Restore(Base::XMLReader& reader);
|
||||
void Restore(Base::XMLReader& reader) override;
|
||||
|
||||
private:
|
||||
static const char* ResizeModeEnums[];
|
||||
|
||||
@@ -37,7 +37,7 @@ class PartDesignExport Point : public Part::Datum
|
||||
|
||||
public:
|
||||
Point();
|
||||
virtual ~Point();
|
||||
~Point() override;
|
||||
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderDatumPoint";
|
||||
@@ -48,8 +48,8 @@ public:
|
||||
typedef Part::Datum Superclass;
|
||||
|
||||
protected:
|
||||
virtual void onChanged(const App::Property* prop) override;
|
||||
virtual void onDocumentRestored() override;
|
||||
void onChanged(const App::Property* prop) override;
|
||||
void onDocumentRestored() override;
|
||||
|
||||
private:
|
||||
void makeShape();
|
||||
|
||||
@@ -55,7 +55,7 @@ public:
|
||||
App::PropertyLink BaseFeature;
|
||||
App::PropertyLinkHidden _Body;
|
||||
|
||||
short mustExecute() const;
|
||||
short mustExecute() const override;
|
||||
|
||||
/// Check whether the given feature is a datum feature
|
||||
static bool isDatum(const App::DocumentObject* feature);
|
||||
@@ -75,9 +75,9 @@ public:
|
||||
/// Returns the BaseFeature property's TopoShape (if any)
|
||||
Part::TopoShape getBaseTopoShape(bool silent=false) const;
|
||||
|
||||
virtual PyObject* getPyObject();
|
||||
PyObject* getPyObject() override;
|
||||
|
||||
virtual const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProvider";
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
|
||||
Type getAddSubType();
|
||||
|
||||
virtual short mustExecute() const override;
|
||||
short mustExecute() const override;
|
||||
|
||||
virtual void getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShape);
|
||||
|
||||
@@ -65,7 +65,7 @@ class FeatureAdditivePython : public FeatureAddSubPython
|
||||
|
||||
public:
|
||||
FeatureAdditivePython();
|
||||
~FeatureAdditivePython();
|
||||
~FeatureAdditivePython() override;
|
||||
};
|
||||
|
||||
class FeatureSubtractivePython : public FeatureAddSubPython
|
||||
@@ -74,7 +74,7 @@ class FeatureSubtractivePython : public FeatureAddSubPython
|
||||
|
||||
public:
|
||||
FeatureSubtractivePython();
|
||||
~FeatureSubtractivePython();
|
||||
~FeatureSubtractivePython() override;
|
||||
};
|
||||
|
||||
} //namespace PartDesign
|
||||
|
||||
@@ -37,17 +37,17 @@ class PartDesignExport FeatureBase : public PartDesign::Feature
|
||||
public:
|
||||
FeatureBase();
|
||||
|
||||
virtual short int mustExecute() const;
|
||||
short int mustExecute() const override;
|
||||
|
||||
virtual Part::Feature* getBaseObject(bool silent=false) const;
|
||||
Part::Feature* getBaseObject(bool silent=false) const override;
|
||||
|
||||
virtual const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderBase";
|
||||
}
|
||||
|
||||
virtual void onChanged(const App::Property* prop);
|
||||
virtual App::DocumentObjectExecReturn* execute();
|
||||
virtual void onDocumentRestored();
|
||||
void onChanged(const App::Property* prop) override;
|
||||
App::DocumentObjectExecReturn* execute() override;
|
||||
void onDocumentRestored() override;
|
||||
};
|
||||
|
||||
} //namespace PartDesign
|
||||
|
||||
@@ -57,7 +57,7 @@ public:
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderBoolean";
|
||||
}
|
||||
virtual void onChanged(const App::Property* prop) override;
|
||||
void onChanged(const App::Property* prop) override;
|
||||
//@}
|
||||
|
||||
protected:
|
||||
|
||||
@@ -56,7 +56,7 @@ public:
|
||||
}
|
||||
//@}
|
||||
|
||||
virtual void onChanged(const App::Property* /*prop*/) override;
|
||||
void onChanged(const App::Property* /*prop*/) override;
|
||||
|
||||
void updateProperties();
|
||||
|
||||
|
||||
@@ -48,16 +48,16 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderDraft";
|
||||
}
|
||||
//@}
|
||||
|
||||
private:
|
||||
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
|
||||
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
|
||||
static const App::PropertyAngle::Constraints floatAngle;
|
||||
};
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
App::PropertyLinkSub Base;
|
||||
App::PropertyBool SupportTransform;
|
||||
|
||||
short mustExecute() const;
|
||||
short mustExecute() const override;
|
||||
/// updates the Placement property from the Placement of the BaseFeature
|
||||
void positionByBaseFeature();
|
||||
/**
|
||||
@@ -54,17 +54,17 @@ public:
|
||||
* silently return a nullptr, otherwise throw Base::Exception.
|
||||
* Default is false.
|
||||
*/
|
||||
virtual Part::Feature* getBaseObject(bool silent=false) const;
|
||||
Part::Feature* getBaseObject(bool silent=false) const override;
|
||||
/// extracts all edges from the subshapes (including face edges) and furthermore adds
|
||||
/// all C0 continuous edges to the vector
|
||||
void getContinuousEdges(Part::TopoShape, std::vector< std::string >&);
|
||||
// add argument to return the selected face that edges were derived from
|
||||
void getContinuousEdges(Part::TopoShape, std::vector< std::string >&, std::vector< std::string >&);
|
||||
|
||||
virtual void getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShape);
|
||||
void getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShape) override;
|
||||
|
||||
protected:
|
||||
virtual void onChanged(const App::Property* prop);
|
||||
void onChanged(const App::Property* prop) override;
|
||||
};
|
||||
|
||||
} //namespace PartDesign
|
||||
|
||||
@@ -59,7 +59,7 @@ public:
|
||||
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
short mustExecute() const;
|
||||
short mustExecute() const override;
|
||||
//@}
|
||||
|
||||
protected:
|
||||
|
||||
@@ -44,17 +44,17 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the feature
|
||||
App::DocumentObjectExecReturn *execute(void);
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute(void) override;
|
||||
short mustExecute() const override;
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName(void) const {
|
||||
const char* getViewProviderName(void) const override {
|
||||
return "PartDesignGui::ViewProviderFillet";
|
||||
}
|
||||
//@}
|
||||
|
||||
protected:
|
||||
void Restore(Base::XMLReader &reader);
|
||||
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
|
||||
void Restore(Base::XMLReader &reader) override;
|
||||
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
|
||||
};
|
||||
|
||||
} //namespace Part
|
||||
|
||||
@@ -55,10 +55,10 @@ public:
|
||||
* If Reversed is true then the direction of revolution will be reversed.
|
||||
* The created material will be cut out of the sketch support
|
||||
*/
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderGroove";
|
||||
}
|
||||
//@}
|
||||
|
||||
@@ -64,10 +64,10 @@ public:
|
||||
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
App::DocumentObjectExecReturn* execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn* execute() override;
|
||||
short mustExecute() const override;
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderHelix";
|
||||
}
|
||||
//@}
|
||||
@@ -89,9 +89,9 @@ protected:
|
||||
Base::Vector3d getProfileCenterPoint();
|
||||
|
||||
// handle changed property types for backward compatibility
|
||||
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
|
||||
void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override;
|
||||
|
||||
void onChanged(const App::Property* prop);
|
||||
void onChanged(const App::Property* prop) override;
|
||||
|
||||
static const App::PropertyFloatConstraint::Constraints floatTurns;
|
||||
static const App::PropertyAngle::Constraints floatAngle;
|
||||
|
||||
@@ -77,14 +77,14 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderHole";
|
||||
}
|
||||
//@}
|
||||
short mustExecute() const;
|
||||
short mustExecute() const override;
|
||||
|
||||
typedef struct {
|
||||
const char * designation;
|
||||
@@ -104,12 +104,12 @@ public:
|
||||
} UTSClearanceDefinition;
|
||||
static const UTSClearanceDefinition UTSHoleDiameters[22];
|
||||
|
||||
virtual void Restore(Base::XMLReader & reader);
|
||||
void Restore(Base::XMLReader & reader) override;
|
||||
|
||||
virtual void updateProps();
|
||||
|
||||
protected:
|
||||
void onChanged(const App::Property* prop);
|
||||
void onChanged(const App::Property* prop) override;
|
||||
static const App::PropertyAngle::Constraints floatAngle;
|
||||
|
||||
private:
|
||||
|
||||
@@ -44,10 +44,10 @@ public:
|
||||
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
short mustExecute() const;
|
||||
short mustExecute() const override;
|
||||
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderLinearPattern";
|
||||
}
|
||||
//@}
|
||||
@@ -61,10 +61,10 @@ public:
|
||||
* transformation direction will be parallel to the given edge, which must be linear
|
||||
* If Reversed is true, the direction of transformation will be opposite
|
||||
*/
|
||||
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> );
|
||||
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> ) override;
|
||||
|
||||
protected:
|
||||
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
|
||||
void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override;
|
||||
static const App::PropertyIntegerConstraint::Constraints intOccurrences;
|
||||
};
|
||||
|
||||
|
||||
@@ -42,17 +42,17 @@ public:
|
||||
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderLoft";
|
||||
}
|
||||
//@}
|
||||
|
||||
protected:
|
||||
// handle changed property
|
||||
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
|
||||
void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override;
|
||||
|
||||
private:
|
||||
//static const char* TypeEnums[];
|
||||
|
||||
@@ -41,10 +41,10 @@ public:
|
||||
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
short mustExecute() const;
|
||||
short mustExecute() const override;
|
||||
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderMultiTransform";
|
||||
}
|
||||
//@}
|
||||
@@ -56,10 +56,10 @@ public:
|
||||
* by the Transformations property. Subfeatures can be Mirrored, LinearPattern, PolarPattern and
|
||||
* Scaled.
|
||||
*/
|
||||
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> originals);
|
||||
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> originals) override;
|
||||
|
||||
protected:
|
||||
virtual void positionBySupport();
|
||||
void positionBySupport() override;
|
||||
};
|
||||
|
||||
} //namespace PartDesign
|
||||
|
||||
@@ -51,9 +51,9 @@ public:
|
||||
* If Reversed is true then the direction of revolution will be reversed.
|
||||
* The created material will be fused with the sketch support (if there is one)
|
||||
*/
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderPad";
|
||||
}
|
||||
//@}
|
||||
|
||||
@@ -48,10 +48,10 @@ public:
|
||||
App::PropertyEnumeration Transformation;
|
||||
App::PropertyLinkSubList Sections;
|
||||
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderPipe";
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ protected:
|
||||
void buildPipePath(const Part::TopoShape& input, const std::vector<std::string>& edges, TopoDS_Shape& result);
|
||||
void setupAlgorithm(BRepOffsetAPI_MakePipeShell& mkPipeShell, TopoDS_Shape& auxshape);
|
||||
/// handle changed property
|
||||
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
|
||||
void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override;
|
||||
|
||||
private:
|
||||
static const char* TypeEnums[];
|
||||
|
||||
@@ -48,9 +48,9 @@ public:
|
||||
* If Midplane is true, then the extrusion will extend for half of the length on both sides of the sketch plane
|
||||
* The created material will be cut out of the sketch support
|
||||
*/
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderPocket";
|
||||
}
|
||||
//@}
|
||||
|
||||
@@ -46,10 +46,10 @@ public:
|
||||
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
short mustExecute() const;
|
||||
short mustExecute() const override;
|
||||
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderPolarPattern";
|
||||
}
|
||||
//@}
|
||||
@@ -64,10 +64,10 @@ public:
|
||||
* the given edge, which must be linear.
|
||||
* If Reversed is true, the direction of rotation will be opposite.
|
||||
*/
|
||||
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*>);
|
||||
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*>) override;
|
||||
|
||||
protected:
|
||||
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
|
||||
void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override;
|
||||
static const App::PropertyIntegerConstraint::Constraints intOccurrences;
|
||||
static const App::PropertyAngle::Constraints floatAngle;
|
||||
};
|
||||
|
||||
@@ -49,15 +49,15 @@ public:
|
||||
|
||||
FeaturePrimitive();
|
||||
|
||||
virtual const char* getViewProviderName() const override {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderPrimitive";
|
||||
}
|
||||
Type getPrimitiveType() {return primitiveType;}
|
||||
virtual void onChanged(const App::Property* prop) override;
|
||||
virtual PyObject* getPyObject() override;
|
||||
void onChanged(const App::Property* prop) override;
|
||||
PyObject* getPyObject() override;
|
||||
|
||||
/// Do nothing, just to suppress warning, must be redefined in derived classes
|
||||
virtual App::DocumentObjectExecReturn* execute() override {
|
||||
App::DocumentObjectExecReturn* execute() override {
|
||||
return PartDesign::FeatureAddSub::execute();
|
||||
}
|
||||
protected:
|
||||
@@ -80,8 +80,8 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the Feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
|
||||
protected:
|
||||
|
||||
@@ -119,8 +119,8 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the Feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
};
|
||||
|
||||
class PartDesignExport AdditiveCylinder : public Cylinder {
|
||||
@@ -156,8 +156,8 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the Feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
|
||||
protected:
|
||||
|
||||
@@ -195,8 +195,8 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the Feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
|
||||
protected:
|
||||
|
||||
@@ -237,8 +237,8 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the Feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
|
||||
protected:
|
||||
|
||||
@@ -278,8 +278,8 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the Feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
|
||||
protected:
|
||||
|
||||
@@ -316,8 +316,8 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the Feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
};
|
||||
|
||||
class PartDesignExport AdditivePrism : public Prism {
|
||||
@@ -359,8 +359,8 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the Feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
@@ -55,10 +55,10 @@ public:
|
||||
* If Reversed is true then the direction of revolution will be reversed.
|
||||
* The created material will be fused with the sketch support (if there is one)
|
||||
*/
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderRevolution";
|
||||
}
|
||||
//@}
|
||||
|
||||
@@ -43,10 +43,10 @@ public:
|
||||
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
short mustExecute() const;
|
||||
short mustExecute() const override;
|
||||
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderScaled";
|
||||
}
|
||||
//@}
|
||||
@@ -60,7 +60,7 @@ public:
|
||||
*/
|
||||
// Note: We can't just use the Originals property because this will fail if the Scaled feature
|
||||
// is being used inside a MultiTransform feature
|
||||
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> originals);
|
||||
const std::list<gp_Trsf> getTransformations(const std::vector<App::DocumentObject*> originals) override;
|
||||
};
|
||||
|
||||
} //namespace PartDesign
|
||||
|
||||
@@ -60,9 +60,9 @@ public:
|
||||
|
||||
App::PropertyBool AllowMultiFace;
|
||||
|
||||
short mustExecute() const;
|
||||
short mustExecute() const override;
|
||||
|
||||
void setupObject();
|
||||
void setupObject() override;
|
||||
|
||||
/** calculates and updates the Placement property based on the features
|
||||
* this one is made from: either from Base, if there is one, or from sketch,
|
||||
@@ -73,7 +73,7 @@ public:
|
||||
/** applies a transform on the Placement of the Sketch or its
|
||||
* support if it has one
|
||||
*/
|
||||
virtual void transformPlacement(const Base::Placement &transform);
|
||||
void transformPlacement(const Base::Placement &transform) override;
|
||||
|
||||
/**
|
||||
* Verifies the linked Profile and returns it if it is a valid 2D object
|
||||
@@ -112,11 +112,11 @@ public:
|
||||
/// retrieves the number of axes in the linked sketch (defined as construction lines)
|
||||
int getSketchAxisCount() const;
|
||||
|
||||
virtual Part::Feature* getBaseObject(bool silent=false) const;
|
||||
Part::Feature* getBaseObject(bool silent=false) const override;
|
||||
|
||||
//backwards compatibility: profile property was renamed and has different type now
|
||||
virtual void Restore(Base::XMLReader& reader);
|
||||
virtual void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName);
|
||||
void Restore(Base::XMLReader& reader) override;
|
||||
void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName) override;
|
||||
|
||||
// calculate the through all length
|
||||
double getThroughAllLength() const;
|
||||
@@ -159,7 +159,7 @@ protected:
|
||||
void getAxis(const App::DocumentObject* pcReferenceAxis, const std::vector<std::string>& subReferenceAxis,
|
||||
Base::Vector3d& base, Base::Vector3d& dir, ForbiddenAxis checkAxis) const;
|
||||
|
||||
void onChanged(const App::Property* prop);
|
||||
void onChanged(const App::Property* prop) override;
|
||||
private:
|
||||
bool isParallelPlane(const TopoDS_Shape&, const TopoDS_Shape&) const;
|
||||
bool isEqualGeometry(const TopoDS_Shape&, const TopoDS_Shape&) const;
|
||||
|
||||
@@ -47,10 +47,10 @@ public:
|
||||
/** @name methods override feature */
|
||||
//@{
|
||||
/// recalculate the feature
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
/// returns the type name of the view provider
|
||||
const char* getViewProviderName() const {
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderThickness";
|
||||
}
|
||||
//@}
|
||||
|
||||
@@ -58,7 +58,7 @@ public:
|
||||
* silently return a nullptr, otherwise throw Base::Exception.
|
||||
* Default is false.
|
||||
*/
|
||||
virtual Part::Feature* getBaseObject(bool silent=false) const;
|
||||
Part::Feature* getBaseObject(bool silent=false) const override;
|
||||
|
||||
/// Return the sketch of the first original
|
||||
App::DocumentObject* getSketchObject() const;
|
||||
@@ -78,8 +78,8 @@ public:
|
||||
* If Originals is empty, execute() returns immediately without doing anything as
|
||||
* the actual processing will happen in the MultiTransform feature
|
||||
*/
|
||||
App::DocumentObjectExecReturn *execute();
|
||||
short mustExecute() const;
|
||||
App::DocumentObjectExecReturn *execute() override;
|
||||
short mustExecute() const override;
|
||||
//@}
|
||||
|
||||
/** returns the compound of the shapes that were rejected during the last execute
|
||||
@@ -88,8 +88,8 @@ public:
|
||||
TopoDS_Shape rejected;
|
||||
|
||||
protected:
|
||||
void Restore(Base::XMLReader &reader);
|
||||
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
|
||||
void Restore(Base::XMLReader &reader) override;
|
||||
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
|
||||
virtual void positionBySupport();
|
||||
TopoDS_Shape refineShapeIfActive(const TopoDS_Shape&) const;
|
||||
void divideTools(const std::vector<TopoDS_Shape> &toolsIn, std::vector<TopoDS_Shape> &individualsOut,
|
||||
|
||||
@@ -47,7 +47,7 @@ class PartDesignExport ShapeBinder : public Part::Feature
|
||||
|
||||
public:
|
||||
ShapeBinder();
|
||||
virtual ~ShapeBinder();
|
||||
~ShapeBinder() override;
|
||||
|
||||
App::PropertyLinkSubListGlobal Support;
|
||||
App::PropertyBool TraceSupport;
|
||||
@@ -62,14 +62,14 @@ public:
|
||||
protected:
|
||||
Part::TopoShape updatedShape() const;
|
||||
bool hasPlacementChanged() const;
|
||||
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
|
||||
virtual short int mustExecute() const override;
|
||||
virtual App::DocumentObjectExecReturn* execute() override;
|
||||
virtual void onChanged(const App::Property* prop) override;
|
||||
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
|
||||
short int mustExecute() const override;
|
||||
App::DocumentObjectExecReturn* execute() override;
|
||||
void onChanged(const App::Property* prop) override;
|
||||
|
||||
private:
|
||||
void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop);
|
||||
virtual void onSettingDocument() override;
|
||||
void onSettingDocument() override;
|
||||
|
||||
typedef boost::signals2::connection Connection;
|
||||
Connection connectDocumentChangedObject;
|
||||
@@ -81,7 +81,7 @@ public:
|
||||
typedef Part::Feature inherited;
|
||||
|
||||
SubShapeBinder();
|
||||
~SubShapeBinder();
|
||||
~SubShapeBinder() override;
|
||||
|
||||
const char* getViewProviderName() const override {
|
||||
return "PartDesignGui::ViewProviderSubShapeBinder";
|
||||
@@ -113,24 +113,24 @@ public:
|
||||
};
|
||||
void update(UpdateOption options = UpdateNone);
|
||||
|
||||
virtual int canLoadPartial() const override {
|
||||
int canLoadPartial() const override {
|
||||
return PartialLoad.getValue()?1:0;
|
||||
}
|
||||
|
||||
virtual bool canLinkProperties() const override {return false;}
|
||||
bool canLinkProperties() const override {return false;}
|
||||
|
||||
virtual App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj=nullptr,
|
||||
App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj=nullptr,
|
||||
Base::Matrix4D *mat=nullptr, bool transform=true, int depth=0) const override;
|
||||
|
||||
protected:
|
||||
virtual App::DocumentObjectExecReturn* execute() override;
|
||||
virtual void onChanged(const App::Property *prop) override;
|
||||
App::DocumentObjectExecReturn* execute() override;
|
||||
void onChanged(const App::Property *prop) override;
|
||||
|
||||
virtual void handleChangedPropertyType(
|
||||
void handleChangedPropertyType(
|
||||
Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
|
||||
|
||||
virtual void onDocumentRestored() override;
|
||||
virtual void setupObject() override;
|
||||
void onDocumentRestored() override;
|
||||
void setupObject() override;
|
||||
|
||||
void setupCopyOnChange();
|
||||
void checkCopyOnChange(const App::Property &prop);
|
||||
|
||||
Reference in New Issue
Block a user