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

Mod: Use override etc 2

Browse Source
This commit is contained in:
berniev
2022-08-09 11:53:46 +10:00
committed by wwmayer
parent 75fa455c5d
commit 71dc5ead2f
697 changed files with 4956 additions and 4956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Draft/App/AppDraftUtilsPy.cpp
View File

@@ -46,7 +46,7 @@ public:
initialize("The DraftUtils module contains utility functions for the Draft module."); // register with Python
}
virtual ~Module() {}
~Module() override {}
private:
Py::Object readDXF(const Py::Tuple& /*args*/)

4
src/Mod/Fem/App/AppFemPy.cpp
View File

@@ -75,10 +75,10 @@ public:
initialize("This module is the Fem module."); // register with Python
}
virtual ~Module() {}
~Module() override {}
private:
virtual Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args)
Py::Object invoke_method_varargs(void *method_def, const Py::Tuple &args) override
{
try {
return Py::ExtensionModule<Module>::invoke_method_varargs(method_def, args);

8
src/Mod/Fem/App/FemAnalysis.h
View File

@@ -58,7 +58,7 @@ public:
* unique id because PropertyUUID doesn't initialize itself.
*/
FemAnalysis();
virtual ~FemAnalysis();
~FemAnalysis() override;
/**
* A unique identifier for each Analysis object. Useful when doing
@@ -68,7 +68,7 @@ public:
*/
App::PropertyUUID Uid;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemAnalysis";
}
@@ -82,8 +82,8 @@ protected:
* property of DocumentObjectGroup. This methods translates old files
* still using the "Member" property.
*/
virtual void handleChangedPropertyName(
Base::XMLReader &reader, const char * TypeName, const char *PropName);
void handleChangedPropertyName(
Base::XMLReader &reader, const char * TypeName, const char *PropName) override;
};
class FemExport DocumentObject : public App::DocumentObject

10
src/Mod/Fem/App/FemConstraint.h
View File

@@ -61,7 +61,7 @@ class FemExport Constraint : public App::DocumentObject {
public:
Constraint();
virtual ~Constraint();
~Constraint() override;
/**
* @brief List of objects the constraints applies to.
@@ -113,7 +113,7 @@ public:
* cleared right after the @ref execute call by the recompute mechanism.
* See Document::recompute() and DocumentObject::purgeTouched().
*/
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/**
* @brief Calculates scale factor based on length of edge.
@@ -154,7 +154,7 @@ public:
*/
int calcDrawScaleFactor() const;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemConstraint";
}
@@ -163,7 +163,7 @@ protected:
/**
* @brief Updates NormalDirection if References change.
*/
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
/**
* @brief Triggers @ref onChanged to update View Provider.
@@ -172,7 +172,7 @@ protected:
* This should not be necessary and is properly a bug in the View Provider
* of FemConstraint.
*/
virtual void onDocumentRestored();
void onDocumentRestored() override;
/**
* @brief Returns data based on References relevant for rendering widgets.

6
src/Mod/Fem/App/FemConstraintBearing.h
View File

@@ -55,15 +55,15 @@ public:
App::PropertyVector Axis;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemConstraintBearing";
}
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};
} //namespace Fem

6
src/Mod/Fem/App/FemConstraintContact.h
View File

@@ -57,13 +57,13 @@ public:
/* */
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const;
const char* getViewProviderName() const override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};

6
src/Mod/Fem/App/FemConstraintDisplacement.h
View File

@@ -66,13 +66,13 @@ public:
//App::PropertyBool element;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const;
const char* getViewProviderName() const override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};

6
src/Mod/Fem/App/FemConstraintFixed.h
View File

@@ -46,15 +46,15 @@ public:
App::PropertyVectorList Normals;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemConstraintFixed";
}
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};
} //namespace Fem

6
src/Mod/Fem/App/FemConstraintFluidBoundary.h
View File

@@ -64,15 +64,15 @@ public:
App::PropertyVector DirectionVector;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemConstraintFluidBoundary";
}
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
private:
Base::Vector3d naturalDirectionVector;

6
src/Mod/Fem/App/FemConstraintForce.h
View File

@@ -50,15 +50,15 @@ public:
App::PropertyVector DirectionVector;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemConstraintForce";
}
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
private:
Base::Vector3d naturalDirectionVector;

6
src/Mod/Fem/App/FemConstraintGear.h
View File

@@ -51,15 +51,15 @@ public:
App::PropertyVector DirectionVector;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemConstraintGear";
}
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
private:
Base::Vector3d naturalDirectionVector;

6
src/Mod/Fem/App/FemConstraintHeatflux.h
View File

@@ -48,13 +48,13 @@ public:
App::PropertyVectorList Normals;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const;
const char* getViewProviderName() const override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};
}

6
src/Mod/Fem/App/FemConstraintInitialTemperature.h
View File

@@ -49,13 +49,13 @@ public:
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const;
const char* getViewProviderName() const override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};

6
src/Mod/Fem/App/FemConstraintPlaneRotation.h
View File

@@ -44,13 +44,13 @@ public:
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const;
const char* getViewProviderName() const override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};

6
src/Mod/Fem/App/FemConstraintPressure.h
View File

@@ -42,13 +42,13 @@ public:
App::PropertyVectorList Normals;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const;
const char* getViewProviderName() const override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};
}

6
src/Mod/Fem/App/FemConstraintPulley.h
View File

@@ -55,15 +55,15 @@ public:
App::PropertyFloat BeltForce2;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemConstraintPulley";
}
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};

6
src/Mod/Fem/App/FemConstraintSpring.h
View File

@@ -42,13 +42,13 @@ public:
App::PropertyVectorList Normals;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const;
const char* getViewProviderName() const override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};
}

6
src/Mod/Fem/App/FemConstraintTemperature.h
View File

@@ -51,13 +51,13 @@ public:
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const;
const char* getViewProviderName() const override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};

6
src/Mod/Fem/App/FemConstraintTransform.h
View File

@@ -52,13 +52,13 @@ public:
/* */
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const;
const char* getViewProviderName() const override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};

58
src/Mod/Fem/App/FemMesh.cpp
View File

@@ -1169,7 +1169,7 @@ protected:
typedef std::shared_ptr<NastranElement> NastranElementPtr;
class GRIDElement : public NastranElement {
void addToMesh(SMESHDS_Mesh* meshds) {
void addToMesh(SMESHDS_Mesh* meshds) override {
meshds->AddNodeWithID(node.x, node.y, node.z, element_id);
}
@@ -1178,7 +1178,7 @@ protected:
};
class GRIDFreeFieldElement : public GRIDElement {
void read(const std::string& str, const std::string&) {
void read(const std::string& str, const std::string&) override {
char_separator<char> sep(",");
tokenizer<char_separator<char> > tokens(str, sep);
std::vector<string> token_results;
@@ -1194,7 +1194,7 @@ class GRIDFreeFieldElement : public GRIDElement {
};
class GRIDLongFieldElement : public GRIDElement {
void read(const std::string& str1, const std::string& str2) {
void read(const std::string& str1, const std::string& str2) override {
element_id = atoi(str1.substr(8,24).c_str());
node.x = atof(str1.substr(40,56).c_str());
node.y = atof(str1.substr(56,72).c_str());
@@ -1203,13 +1203,13 @@ class GRIDLongFieldElement : public GRIDElement {
};
class GRIDSmallFieldElement : public GRIDElement {
void read(const std::string&, const std::string&) {
void read(const std::string&, const std::string&) override {
}
};
class CTRIA3Element : public NastranElement {
public:
void addToMesh(SMESHDS_Mesh* meshds) {
void addToMesh(SMESHDS_Mesh* meshds) override {
const SMDS_MeshNode* n0 = meshds->FindNode(elements[0]);
const SMDS_MeshNode* n1 = meshds->FindNode(elements[1]);
const SMDS_MeshNode* n2 = meshds->FindNode(elements[2]);
@@ -1232,7 +1232,7 @@ public:
class CTRIA3FreeFieldElement : public CTRIA3Element {
public:
void read(const std::string& str, const std::string&) {
void read(const std::string& str, const std::string&) override {
char_separator<char> sep(",");
tokenizer<char_separator<char> > tokens(str, sep);
std::vector<string> token_results;
@@ -1249,7 +1249,7 @@ public:
class CTRIA3LongFieldElement : public CTRIA3Element {
public:
void read(const std::string& str, const std::string&) {
void read(const std::string& str, const std::string&) override {
element_id = atoi(str.substr(8,16).c_str());
elements.push_back(atoi(str.substr(24,32).c_str()));
elements.push_back(atoi(str.substr(32,40).c_str()));
@@ -1259,13 +1259,13 @@ public:
class CTRIA3SmallFieldElement : public CTRIA3Element {
public:
void read(const std::string&, const std::string&) {
void read(const std::string&, const std::string&) override {
}
};
class CTETRAElement : public NastranElement {
public:
void addToMesh(SMESHDS_Mesh* meshds) {
void addToMesh(SMESHDS_Mesh* meshds) override {
const SMDS_MeshNode* n0 = meshds->FindNode(elements[1]);
const SMDS_MeshNode* n1 = meshds->FindNode(elements[0]);
const SMDS_MeshNode* n2 = meshds->FindNode(elements[2]);
@@ -1302,7 +1302,7 @@ public:
class CTETRAFreeFieldElement : public CTETRAElement {
public:
void read(const std::string& str, const std::string&) {
void read(const std::string& str, const std::string&) override {
char_separator<char> sep(",");
tokenizer<char_separator<char> > tokens(str, sep);
std::vector<string> token_results;
@@ -1326,7 +1326,7 @@ public:
class CTETRALongFieldElement : public CTETRAElement {
public:
void read(const std::string& str1, const std::string& str2) {
void read(const std::string& str1, const std::string& str2) override {
int id = atoi(str1.substr(8,16).c_str());
int offset = 0;
@@ -1355,14 +1355,14 @@ public:
class CTETRASmallFieldElement : public CTETRAElement {
public:
void read(const std::string&, const std::string&) {
void read(const std::string&, const std::string&) override {
}
};
// NASTRAN-95
class GRIDNastran95Element : public GRIDElement {
void read(const std::string& str, const std::string&) {
void read(const std::string& str, const std::string&) override {
element_id = atoi(str.substr(8, 16).c_str());
node.x = atof(str.substr(24, 32).c_str());
node.y = atof(str.substr(32, 40).c_str());
@@ -1371,12 +1371,12 @@ class GRIDNastran95Element : public GRIDElement {
};
class CBARElement : public NastranElement {
void read(const std::string& str, const std::string&) {
void read(const std::string& str, const std::string&) override {
element_id = atoi(str.substr(8,16).c_str());
elements.push_back(atoi(str.substr(24,32).c_str()));
elements.push_back(atoi(str.substr(32,40).c_str()));
}
void addToMesh(SMESHDS_Mesh* meshds) {
void addToMesh(SMESHDS_Mesh* meshds) override {
meshds->AddEdgeWithID(
elements[0],
elements[1],
@@ -1386,13 +1386,13 @@ class CBARElement : public NastranElement {
};
class CTRMEMElement : public NastranElement {
void read(const std::string& str, const std::string&) {
void read(const std::string& str, const std::string&) override {
element_id = atoi(str.substr(8,16).c_str());
elements.push_back(atoi(str.substr(24,32).c_str()));
elements.push_back(atoi(str.substr(32,40).c_str()));
elements.push_back(atoi(str.substr(40,48).c_str()));
}
void addToMesh(SMESHDS_Mesh* meshds) {
void addToMesh(SMESHDS_Mesh* meshds) override {
meshds->AddFaceWithID(
elements[0],
elements[1],
@@ -1403,13 +1403,13 @@ class CTRMEMElement : public NastranElement {
};
class CTRIA1Element : public NastranElement {
void read(const std::string& str, const std::string&) {
void read(const std::string& str, const std::string&) override {
element_id = atoi(str.substr(8,16).c_str());
elements.push_back(atoi(str.substr(24, 32).c_str()));
elements.push_back(atoi(str.substr(32, 40).c_str()));
elements.push_back(atoi(str.substr(40, 48).c_str()));
}
void addToMesh(SMESHDS_Mesh* meshds) {
void addToMesh(SMESHDS_Mesh* meshds) override {
meshds->AddFaceWithID(
elements[0],
elements[1],
@@ -1420,14 +1420,14 @@ class CTRIA1Element : public NastranElement {
};
class CQUAD1Element : public NastranElement {
void read(const std::string& str, const std::string&) {
void read(const std::string& str, const std::string&) override {
element_id = atoi(str.substr(8,16).c_str());
elements.push_back(atoi(str.substr(24, 32).c_str()));
elements.push_back(atoi(str.substr(32, 40).c_str()));
elements.push_back(atoi(str.substr(40, 48).c_str()));
elements.push_back(atoi(str.substr(48, 56).c_str()));
}
void addToMesh(SMESHDS_Mesh* meshds) {
void addToMesh(SMESHDS_Mesh* meshds) override {
meshds->AddFaceWithID(
elements[0],
elements[1],
@@ -1439,14 +1439,14 @@ class CQUAD1Element : public NastranElement {
};
class CTETRANastran95Element : public NastranElement {
void read(const std::string& str, const std::string&) {
void read(const std::string& str, const std::string&) override {
element_id = atoi(str.substr(8,16).c_str());
elements.push_back(atoi(str.substr(24, 32).c_str()));
elements.push_back(atoi(str.substr(32, 40).c_str()));
elements.push_back(atoi(str.substr(40, 48).c_str()));
elements.push_back(atoi(str.substr(48, 56).c_str()));
}
void addToMesh(SMESHDS_Mesh* meshds) {
void addToMesh(SMESHDS_Mesh* meshds) override {
meshds->AddFaceWithID(
elements[0],
elements[1],
@@ -1458,7 +1458,7 @@ class CTETRANastran95Element : public NastranElement {
};
class CWEDGEElement : public NastranElement {
void read(const std::string& str, const std::string&) {
void read(const std::string& str, const std::string&) override {
element_id = atoi(str.substr(8,16).c_str());
elements.push_back(atoi(str.substr(24,32).c_str()));
elements.push_back(atoi(str.substr(32,40).c_str()));
@@ -1467,7 +1467,7 @@ class CWEDGEElement : public NastranElement {
elements.push_back(atoi(str.substr(56,64).c_str()));
elements.push_back(atoi(str.substr(64,72).c_str()));
}
void addToMesh(SMESHDS_Mesh* meshds) {
void addToMesh(SMESHDS_Mesh* meshds) override {
meshds->AddVolumeWithID(
elements[0],
elements[1],
@@ -1481,7 +1481,7 @@ class CWEDGEElement : public NastranElement {
};
class CHEXA1Element : public NastranElement {
void read(const std::string& str1, const std::string& str2) {
void read(const std::string& str1, const std::string& str2) override {
element_id = atoi(str1.substr(8,16).c_str());
elements.push_back(atoi(str1.substr(24,32).c_str()));
elements.push_back(atoi(str1.substr(32,40).c_str()));
@@ -1493,7 +1493,7 @@ class CHEXA1Element : public NastranElement {
elements.push_back(atoi(str2.substr(8,16).c_str()));
elements.push_back(atoi(str2.substr(16,24).c_str()));
}
void addToMesh(SMESHDS_Mesh* meshds) {
void addToMesh(SMESHDS_Mesh* meshds) override {
meshds->AddVolumeWithID(
elements[0],
elements[1],
@@ -1509,7 +1509,7 @@ class CHEXA1Element : public NastranElement {
};
class CHEXA2Element : public NastranElement {
void read(const std::string& str1, const std::string& str2) {
void read(const std::string& str1, const std::string& str2) override {
element_id = atoi(str1.substr(8,16).c_str());
elements.push_back(atoi(str1.substr(24,32).c_str()));
elements.push_back(atoi(str1.substr(32,40).c_str()));
@@ -1521,7 +1521,7 @@ class CHEXA2Element : public NastranElement {
elements.push_back(atoi(str2.substr(8,16).c_str()));
elements.push_back(atoi(str2.substr(16,24).c_str()));
}
void addToMesh(SMESHDS_Mesh* meshds) {
void addToMesh(SMESHDS_Mesh* meshds) override {
meshds->AddVolumeWithID(
elements[0],
elements[1],

26
src/Mod/Fem/App/FemMesh.h
View File

@@ -56,7 +56,7 @@ class FemExport FemMesh : public Data::ComplexGeoData
public:
FemMesh();
FemMesh(const FemMesh&);
~FemMesh();
~FemMesh() override;
FemMesh &operator=(const FemMesh&);
const SMESH_Mesh* getSMesh() const;
@@ -67,11 +67,11 @@ public:
void compute();
// from base class
virtual unsigned int getMemSize () const;
virtual void Save (Base::Writer &/*writer*/) const;
virtual void Restore(Base::XMLReader &/*reader*/);
void SaveDocFile (Base::Writer &writer) const;
void RestoreDocFile(Base::Reader &reader);
unsigned int getMemSize () const override;
void Save (Base::Writer &/*writer*/) const override;
void Restore(Base::XMLReader &/*reader*/) override;
void SaveDocFile (Base::Writer &writer) const override;
void RestoreDocFile(Base::Reader &reader) override;
/** @name Subelement management */
//@{
@@ -79,10 +79,10 @@ public:
* List of different subelement types
* it is NOT a list of the subelements itself
*/
virtual std::vector<const char*> getElementTypes() const;
virtual unsigned long countSubElements(const char* Type) const;
std::vector<const char*> getElementTypes() const override;
unsigned long countSubElements(const char* Type) const override;
/// get the subelement by type and number
virtual Data::Segment* getSubElement(const char* Type, unsigned long) const;
Data::Segment* getSubElement(const char* Type, unsigned long) const override;
//@}
/** @name search and retrieval */
@@ -116,11 +116,11 @@ public:
/** @name Placement control */
//@{
/// set the transformation
void setTransform(const Base::Matrix4D& rclTrf);
void setTransform(const Base::Matrix4D& rclTrf) override;
/// get the transformation
Base::Matrix4D getTransform() const;
Base::Matrix4D getTransform() const override;
/// Bound box from the shape
Base::BoundBox3d getBoundBox()const;
Base::BoundBox3d getBoundBox()const override;
/// get the volume (when there are volume elements)
Base::Quantity getVolume()const;
//@}
@@ -128,7 +128,7 @@ public:
/** @name Modification */
//@{
/// Applies a transformation on the real geometric data type
void transformGeometry(const Base::Matrix4D &rclMat);
void transformGeometry(const Base::Matrix4D &rclMat) override;
//@}
/** @name Group management */

12
src/Mod/Fem/App/FemMeshObject.h
View File

@@ -40,23 +40,23 @@ class FemExport FemMeshObject : public App::GeoFeature
public:
/// Constructor
FemMeshObject();
virtual ~FemMeshObject();
~FemMeshObject() override;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemMesh";
}
virtual App::DocumentObjectExecReturn *execute() {
App::DocumentObjectExecReturn *execute() override {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute() const;
virtual PyObject *getPyObject();
short mustExecute() const override;
PyObject *getPyObject() override;
PropertyFemMesh FemMesh;
protected:
/// get called by the container when a property has changed
virtual void onChanged (const App::Property* prop);
void onChanged (const App::Property* prop) override;
};
typedef App::FeaturePythonT<FemMeshObject> FemMeshObjectPython;

32
src/Mod/Fem/App/FemMeshProperty.h
View File

@@ -41,7 +41,7 @@ class FemExport PropertyFemMesh : public App::PropertyComplexGeoData
public:
PropertyFemMesh();
~PropertyFemMesh();
~PropertyFemMesh() override;
/** @name Getter/setter */
//@{
@@ -52,38 +52,38 @@ public:
void setValue(){}
/// get the FemMesh shape
const FemMesh &getValue() const;
const Data::ComplexGeoData* getComplexData() const;
const Data::ComplexGeoData* getComplexData() const override;
//@}
/** @name Getting basic geometric entities */
//@{
/** Returns the bounding box around the underlying mesh kernel */
Base::BoundBox3d getBoundingBox() const;
Base::BoundBox3d getBoundingBox() const override;
/// Set the placement of the geometry
void setTransform(const Base::Matrix4D& rclTrf);
void setTransform(const Base::Matrix4D& rclTrf) override;
/// Get the placement of the geometry
Base::Matrix4D getTransform() const;
void transformGeometry(const Base::Matrix4D &rclMat);
Base::Matrix4D getTransform() const override;
void transformGeometry(const Base::Matrix4D &rclMat) override;
//@}
/** @name Python interface */
//@{
PyObject* getPyObject();
void setPyObject(PyObject *value);
PyObject* getPyObject() override;
void setPyObject(PyObject *value) override;
//@}
/** @name Save/restore */
//@{
void Save (Base::Writer &writer) const;
void Restore(Base::XMLReader &reader);
void SaveDocFile (Base::Writer &writer) const;
void RestoreDocFile(Base::Reader &reader);
void Save (Base::Writer &writer) const override;
void Restore(Base::XMLReader &reader) override;
void SaveDocFile (Base::Writer &writer) const override;
void RestoreDocFile(Base::Reader &reader) override;
App::Property *Copy() const;
void Paste(const App::Property &from);
unsigned int getMemSize () const;
const char* getEditorName() const { return "FemGui::PropertyFemMeshItem"; }
App::Property *Copy() const override;
void Paste(const App::Property &from) override;
unsigned int getMemSize () const override;
const char* getEditorName() const override { return "FemGui::PropertyFemMeshItem"; }
//@}
private:

6
src/Mod/Fem/App/FemMeshShapeNetgenObject.h
View File

@@ -36,7 +36,7 @@ class FemExport FemMeshShapeNetgenObject : public FemMeshShapeObject
public:
/// Constructor
FemMeshShapeNetgenObject();
virtual ~FemMeshShapeNetgenObject();
~FemMeshShapeNetgenObject() override;
App::PropertyFloat MaxSize;
App::PropertyBool SecondOrder;
@@ -47,10 +47,10 @@ public:
App::PropertyBool Optimize;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemMeshShapeNetgen";
}
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//virtual short mustExecute(void) const;
//virtual PyObject *getPyObject(void);

6
src/Mod/Fem/App/FemMeshShapeObject.h
View File

@@ -37,13 +37,13 @@ class FemExport FemMeshShapeObject : public FemMeshObject
public:
/// Constructor
FemMeshShapeObject();
virtual ~FemMeshShapeObject();
~FemMeshShapeObject() override;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemMeshShape";
}
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//virtual short mustExecute(void) const;
//virtual PyObject *getPyObject(void);

66
src/Mod/Fem/App/FemPostFilter.h
View File

@@ -47,11 +47,11 @@ class FemExport FemPostFilter : public Fem::FemPostObject
public:
/// Constructor
FemPostFilter();
virtual ~FemPostFilter();
~FemPostFilter() override;
App::PropertyLink Input;
virtual App::DocumentObjectExecReturn* execute();
App::DocumentObjectExecReturn* execute() override;
protected:
vtkDataObject* getInputData();
@@ -78,20 +78,20 @@ class FemExport FemPostClipFilter : public FemPostFilter {
public:
FemPostClipFilter();
virtual ~FemPostClipFilter();
~FemPostClipFilter() override;
App::PropertyLink Function;
App::PropertyBool InsideOut;
App::PropertyBool CutCells;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemPostClip";
}
virtual short int mustExecute() const;
virtual App::DocumentObjectExecReturn* execute();
short int mustExecute() const override;
App::DocumentObjectExecReturn* execute() override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
private:
vtkSmartPointer<vtkTableBasedClipDataSet> m_clipper;
@@ -104,7 +104,7 @@ class FemExport FemPostDataAlongLineFilter : public FemPostFilter {
public:
FemPostDataAlongLineFilter();
virtual ~FemPostDataAlongLineFilter();
~FemPostDataAlongLineFilter() override;
App::PropertyVectorDistance Point1;
App::PropertyVectorDistance Point2;
@@ -113,16 +113,16 @@ public:
App::PropertyFloatList YAxisData;
App::PropertyString PlotData;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemPostDataAlongLine";
}
virtual short int mustExecute() const;
short int mustExecute() const override;
void GetAxisData();
protected:
virtual App::DocumentObjectExecReturn* execute();
virtual void onChanged(const App::Property* prop);
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
App::DocumentObjectExecReturn* execute() override;
void onChanged(const App::Property* prop) override;
void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop) override;
private:
@@ -137,7 +137,7 @@ class FemExport FemPostDataAtPointFilter : public FemPostFilter {
public:
FemPostDataAtPointFilter();
virtual ~FemPostDataAtPointFilter();
~FemPostDataAtPointFilter() override;
App::PropertyVectorDistance Center;
App::PropertyDistance Radius;
@@ -145,14 +145,14 @@ public:
App::PropertyFloatList PointData;
App::PropertyString Unit;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemPostDataAtPoint";
}
virtual short int mustExecute() const;
short int mustExecute() const override;
protected:
virtual App::DocumentObjectExecReturn* execute();
virtual void onChanged(const App::Property* prop);
App::DocumentObjectExecReturn* execute() override;
void onChanged(const App::Property* prop) override;
void GetPointData();
private:
@@ -168,20 +168,20 @@ class FemExport FemPostScalarClipFilter : public FemPostFilter {
public:
FemPostScalarClipFilter();
virtual ~FemPostScalarClipFilter();
~FemPostScalarClipFilter() override;
App::PropertyBool InsideOut;
App::PropertyFloatConstraint Value;
App::PropertyEnumeration Scalars;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemPostScalarClip";
}
virtual short int mustExecute() const;
short int mustExecute() const override;
protected:
virtual App::DocumentObjectExecReturn* execute();
virtual void onChanged(const App::Property* prop);
App::DocumentObjectExecReturn* execute() override;
void onChanged(const App::Property* prop) override;
void setConstraintForField();
private:
@@ -196,19 +196,19 @@ class FemExport FemPostWarpVectorFilter : public FemPostFilter {
public:
FemPostWarpVectorFilter();
virtual ~FemPostWarpVectorFilter();
~FemPostWarpVectorFilter() override;
App::PropertyFloat Factor;
App::PropertyEnumeration Vector;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemPostWarpVector";
}
virtual short int mustExecute() const;
short int mustExecute() const override;
protected:
virtual App::DocumentObjectExecReturn* execute();
virtual void onChanged(const App::Property* prop);
App::DocumentObjectExecReturn* execute() override;
void onChanged(const App::Property* prop) override;
private:
vtkSmartPointer<vtkWarpVector> m_warp;
@@ -221,18 +221,18 @@ class FemExport FemPostCutFilter : public FemPostFilter {
public:
FemPostCutFilter();
virtual ~FemPostCutFilter();
~FemPostCutFilter() override;
App::PropertyLink Function;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemPostCut";
}
virtual short int mustExecute() const;
virtual App::DocumentObjectExecReturn* execute();
short int mustExecute() const override;
App::DocumentObjectExecReturn* execute() override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
private:
vtkSmartPointer<vtkCutter> m_cutter;

26
src/Mod/Fem/App/FemPostFunction.h
View File

@@ -44,13 +44,13 @@ class FemExport FemPostFunction : public App::DocumentObject
public:
/// Constructor
FemPostFunction();
virtual ~FemPostFunction();
~FemPostFunction() override;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemPostFunction";
}
virtual App::DocumentObjectExecReturn* execute();
App::DocumentObjectExecReturn* execute() override;
//bound box handling
void setBoundingBox(vtkBoundingBox b) {m_boundingBox = b;};
@@ -69,16 +69,16 @@ class FemExport FemPostFunctionProvider : public App::DocumentObject {
public:
FemPostFunctionProvider();
virtual ~FemPostFunctionProvider();
~FemPostFunctionProvider() override;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemPostFunctionProvider";
}
App::PropertyLinkList Functions;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};
@@ -91,19 +91,19 @@ class FemExport FemPostPlaneFunction : public FemPostFunction
public:
FemPostPlaneFunction();
virtual ~FemPostPlaneFunction();
~FemPostPlaneFunction() override;
App::PropertyVector Normal;
App::PropertyVectorDistance Origin;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemPostPlaneFunction";
}
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
/// get called after a document has been fully restored
virtual void onDocumentRestored();
void onDocumentRestored() override;
vtkSmartPointer<vtkPlane> m_plane;
};
@@ -117,17 +117,17 @@ class FemExport FemPostSphereFunction : public FemPostFunction
public:
FemPostSphereFunction();
virtual ~FemPostSphereFunction();
~FemPostSphereFunction() override;
App::PropertyDistance Radius;
App::PropertyVectorDistance Center;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemPostSphereFunction";
}
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
vtkSmartPointer<vtkSphere> m_sphere;
};

2
src/Mod/Fem/App/FemPostObject.h
View File

@@ -40,7 +40,7 @@ class FemExport FemPostObject : public App::GeoFeature
public:
/// Constructor
FemPostObject();
virtual ~FemPostObject();
~FemPostObject() override;
Fem::PropertyPostDataObject Data;

12
src/Mod/Fem/App/FemPostPipeline.h
View File

@@ -41,17 +41,17 @@ class FemExport FemPostPipeline : public Fem::FemPostFilter
public:
/// Constructor
FemPostPipeline();
virtual ~FemPostPipeline();
~FemPostPipeline() override;
App::PropertyLinkList Filter;
App::PropertyLink Functions;
App::PropertyEnumeration Mode;
short mustExecute() const;
virtual App::DocumentObjectExecReturn* execute();
PyObject* getPyObject();
short mustExecute() const override;
App::DocumentObjectExecReturn* execute() override;
PyObject* getPyObject() override;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderFemPostPipeline";
}
@@ -69,7 +69,7 @@ public:
bool holdsPostObject(FemPostObject *obj);
protected:
virtual void onChanged(const App::Property *prop);
void onChanged(const App::Property *prop) override;
private:
static const char* ModeEnums[];

10
src/Mod/Fem/App/FemResultObject.h
View File

@@ -39,7 +39,7 @@ class FemExport FemResultObject : public App::DocumentObject
public:
/// Constructor
FemResultObject();
virtual ~FemResultObject();
~FemResultObject() override;
App::PropertyIntegerList NodeNumbers;
/// Link to the corresponding mesh
@@ -51,14 +51,14 @@ public:
/// Displacement vectors of analysis
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderResult";
}
virtual App::DocumentObjectExecReturn *execute() {
App::DocumentObjectExecReturn *execute() override {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute() const;
virtual PyObject *getPyObject();
short mustExecute() const override;
PyObject *getPyObject() override;
};
typedef App::FeaturePythonT<FemResultObject> FemResultObjectPython;

10
src/Mod/Fem/App/FemSetElementsObject.h
View File

@@ -37,17 +37,17 @@ class FemExport FemSetElementsObject : public FemSetObject
public:
/// Constructor
FemSetElementsObject();
virtual ~FemSetElementsObject();
~FemSetElementsObject() override;
// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderSetElements";
}
virtual App::DocumentObjectExecReturn *execute() {
App::DocumentObjectExecReturn *execute() override {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute() const;
virtual PyObject *getPyObject();
short mustExecute() const override;
PyObject *getPyObject() override;
};

10
src/Mod/Fem/App/FemSetFacesObject.h
View File

@@ -37,17 +37,17 @@ class FemExport FemSetFacesObject : public FemSetObject
public:
/// Constructor
FemSetFacesObject();
virtual ~FemSetFacesObject();
~FemSetFacesObject() override;
// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderSetFaces";
}
virtual App::DocumentObjectExecReturn *execute() {
App::DocumentObjectExecReturn *execute() override {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute() const;
virtual PyObject *getPyObject();
short mustExecute() const override;
PyObject *getPyObject() override;
};
} //namespace Fem

10
src/Mod/Fem/App/FemSetGeometryObject.h
View File

@@ -37,17 +37,17 @@ class FemExport FemSetGeometryObject : public FemSetObject
public:
/// Constructor
FemSetGeometryObject();
virtual ~FemSetGeometryObject();
~FemSetGeometryObject() override;
// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderSetGeometry";
}
virtual App::DocumentObjectExecReturn *execute() {
App::DocumentObjectExecReturn *execute() override {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute() const;
virtual PyObject *getPyObject();
short mustExecute() const override;
PyObject *getPyObject() override;
};

10
src/Mod/Fem/App/FemSetNodesObject.h
View File

@@ -38,19 +38,19 @@ class FemExport FemSetNodesObject : public FemSetObject
public:
/// Constructor
FemSetNodesObject();
virtual ~FemSetNodesObject();
~FemSetNodesObject() override;
App::PropertyIntegerSet Nodes;
// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderSetNodes";
}
virtual App::DocumentObjectExecReturn *execute() {
App::DocumentObjectExecReturn *execute() override {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute() const;
virtual PyObject *getPyObject();
short mustExecute() const override;
PyObject *getPyObject() override;
};

8
src/Mod/Fem/App/FemSetObject.h
View File

@@ -38,7 +38,7 @@ class FemExport FemSetObject : public App::DocumentObject
public:
/// Constructor
FemSetObject();
virtual ~FemSetObject();
~FemSetObject() override;
App::PropertyLink FemMesh;
@@ -46,11 +46,11 @@ public:
//virtual const char* getViewProviderName(void) const {
// return "FemGui::ViewProviderFemSet";
//}
virtual App::DocumentObjectExecReturn *execute() {
App::DocumentObjectExecReturn *execute() override {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute() const;
virtual PyObject *getPyObject();
short mustExecute() const override;
PyObject *getPyObject() override;
};

10
src/Mod/Fem/App/FemSolverObject.h
View File

@@ -38,19 +38,19 @@ class FemExport FemSolverObject : public App::DocumentObject
public:
/// Constructor
FemSolverObject();
virtual ~FemSolverObject();
~FemSolverObject() override;
// Attributes are implemented in the FemSolverObjectPython
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "FemGui::ViewProviderSolver";
}
virtual App::DocumentObjectExecReturn *execute() {
App::DocumentObjectExecReturn *execute() override {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute() const;
virtual PyObject *getPyObject();
short mustExecute() const override;
PyObject *getPyObject() override;
};

72
src/Mod/Fem/App/HypothesisPy.h
View File

@@ -37,7 +37,7 @@ class HypothesisPy : public Py::PythonExtension<HypothesisPy>
public:
typedef Py::PythonExtension<HypothesisPy> HypothesisPyBase;
HypothesisPy(std::shared_ptr<SMESH_Hypothesis>);
virtual ~HypothesisPy();
~HypothesisPy() override;
std::shared_ptr<SMESH_Hypothesis> getHypothesis() const
{ return hyp; }
@@ -55,10 +55,10 @@ public:
static void init_type(PyObject*); // announce properties and methods
SMESH_HypothesisPy(SMESH_Hypothesis*);
virtual ~SMESH_HypothesisPy();
~SMESH_HypothesisPy() override;
Py::Object getattr(const char *name);
Py::Object repr();
Py::Object getattr(const char *name) override;
Py::Object repr() override;
Py::Object getLibName(const Py::Tuple& args);
Py::Object setLibName(const Py::Tuple& args);
#if SMESH_VERSION_MAJOR < 7
@@ -387,7 +387,7 @@ class StdMeshers_Arithmetic1DPy : public SMESH_HypothesisPy<StdMeshers_Arithmeti
public:
static void init_type(PyObject*);
StdMeshers_Arithmetic1DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_Arithmetic1DPy();
~StdMeshers_Arithmetic1DPy() override;
Py::Object setLength(const Py::Tuple& args);
Py::Object getLength(const Py::Tuple& args);
@@ -398,7 +398,7 @@ class StdMeshers_AutomaticLengthPy : public SMESH_HypothesisPy<StdMeshers_Automa
public:
static void init_type(PyObject*);
StdMeshers_AutomaticLengthPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_AutomaticLengthPy();
~StdMeshers_AutomaticLengthPy() override;
Py::Object setFineness(const Py::Tuple& args);
Py::Object getFineness(const Py::Tuple& args);
@@ -410,7 +410,7 @@ class StdMeshers_NotConformAllowedPy : public SMESH_HypothesisPy<StdMeshers_NotC
public:
static void init_type(PyObject*);
StdMeshers_NotConformAllowedPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_NotConformAllowedPy();
~StdMeshers_NotConformAllowedPy() override;
};
class StdMeshers_MaxLengthPy : public SMESH_HypothesisPy<StdMeshers_MaxLengthPy>
@@ -418,7 +418,7 @@ class StdMeshers_MaxLengthPy : public SMESH_HypothesisPy<StdMeshers_MaxLengthPy>
public:
static void init_type(PyObject*);
StdMeshers_MaxLengthPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_MaxLengthPy();
~StdMeshers_MaxLengthPy() override;
Py::Object setLength(const Py::Tuple& args);
Py::Object getLength(const Py::Tuple& args);
@@ -434,7 +434,7 @@ class StdMeshers_LocalLengthPy : public SMESH_HypothesisPy<StdMeshers_LocalLengt
public:
static void init_type(PyObject*);
StdMeshers_LocalLengthPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_LocalLengthPy();
~StdMeshers_LocalLengthPy() override;
Py::Object setLength(const Py::Tuple& args);
Py::Object getLength(const Py::Tuple& args);
@@ -447,7 +447,7 @@ class StdMeshers_MaxElementAreaPy : public SMESH_HypothesisPy<StdMeshers_MaxElem
public:
static void init_type(PyObject*);
StdMeshers_MaxElementAreaPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_MaxElementAreaPy();
~StdMeshers_MaxElementAreaPy() override;
Py::Object setMaxArea(const Py::Tuple& args);
Py::Object getMaxArea(const Py::Tuple& args);
@@ -458,7 +458,7 @@ class StdMeshers_QuadranglePreferencePy : public SMESH_HypothesisPy<StdMeshers_Q
public:
static void init_type(PyObject*);
StdMeshers_QuadranglePreferencePy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_QuadranglePreferencePy();
~StdMeshers_QuadranglePreferencePy() override;
};
class StdMeshers_Quadrangle_2DPy : public SMESH_HypothesisPy<StdMeshers_Quadrangle_2DPy>
@@ -466,7 +466,7 @@ class StdMeshers_Quadrangle_2DPy : public SMESH_HypothesisPy<StdMeshers_Quadrang
public:
static void init_type(PyObject*);
StdMeshers_Quadrangle_2DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_Quadrangle_2DPy();
~StdMeshers_Quadrangle_2DPy() override;
};
class StdMeshers_Regular_1DPy : public SMESH_HypothesisPy<StdMeshers_Regular_1DPy>
@@ -474,7 +474,7 @@ class StdMeshers_Regular_1DPy : public SMESH_HypothesisPy<StdMeshers_Regular_1DP
public:
static void init_type(PyObject*);
StdMeshers_Regular_1DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_Regular_1DPy();
~StdMeshers_Regular_1DPy() override;
};
class StdMeshers_UseExisting_1DPy : public SMESH_HypothesisPy<StdMeshers_UseExisting_1DPy>
@@ -482,7 +482,7 @@ class StdMeshers_UseExisting_1DPy : public SMESH_HypothesisPy<StdMeshers_UseExis
public:
static void init_type(PyObject*);
StdMeshers_UseExisting_1DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_UseExisting_1DPy();
~StdMeshers_UseExisting_1DPy() override;
};
class StdMeshers_UseExisting_2DPy : public SMESH_HypothesisPy<StdMeshers_UseExisting_2DPy>
@@ -490,7 +490,7 @@ class StdMeshers_UseExisting_2DPy : public SMESH_HypothesisPy<StdMeshers_UseExis
public:
static void init_type(PyObject*);
StdMeshers_UseExisting_2DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_UseExisting_2DPy();
~StdMeshers_UseExisting_2DPy() override;
};
class StdMeshers_CompositeSegment_1DPy : public SMESH_HypothesisPy<StdMeshers_CompositeSegment_1DPy>
@@ -498,7 +498,7 @@ class StdMeshers_CompositeSegment_1DPy : public SMESH_HypothesisPy<StdMeshers_Co
public:
static void init_type(PyObject*);
StdMeshers_CompositeSegment_1DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_CompositeSegment_1DPy();
~StdMeshers_CompositeSegment_1DPy() override;
};
class StdMeshers_Deflection1DPy : public SMESH_HypothesisPy<StdMeshers_Deflection1DPy>
@@ -506,7 +506,7 @@ class StdMeshers_Deflection1DPy : public SMESH_HypothesisPy<StdMeshers_Deflectio
public:
static void init_type(PyObject*);
StdMeshers_Deflection1DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_Deflection1DPy();
~StdMeshers_Deflection1DPy() override;
Py::Object setDeflection(const Py::Tuple& args);
};
@@ -516,7 +516,7 @@ class StdMeshers_Hexa_3DPy : public SMESH_HypothesisPy<StdMeshers_Hexa_3DPy>
public:
static void init_type(PyObject*);
StdMeshers_Hexa_3DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_Hexa_3DPy();
~StdMeshers_Hexa_3DPy() override;
};
#if SMESH_VERSION_MAJOR < 7 // -----------------------------------------------
class StdMeshers_TrianglePreferencePy : public SMESH_HypothesisPy<StdMeshers_TrianglePreferencePy>
@@ -533,7 +533,7 @@ class StdMeshers_StartEndLengthPy : public SMESH_HypothesisPy<StdMeshers_StartEn
public:
static void init_type(PyObject*);
StdMeshers_StartEndLengthPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_StartEndLengthPy();
~StdMeshers_StartEndLengthPy() override;
Py::Object setLength(const Py::Tuple& args);
Py::Object getLength(const Py::Tuple& args);
};
@@ -543,7 +543,7 @@ class StdMeshers_SegmentLengthAroundVertexPy : public SMESH_HypothesisPy<StdMesh
public:
static void init_type(PyObject*);
StdMeshers_SegmentLengthAroundVertexPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_SegmentLengthAroundVertexPy();
~StdMeshers_SegmentLengthAroundVertexPy() override;
Py::Object setLength(const Py::Tuple& args);
Py::Object getLength(const Py::Tuple& args);
};
@@ -553,7 +553,7 @@ class StdMeshers_SegmentAroundVertex_0DPy : public SMESH_HypothesisPy<StdMeshers
public:
static void init_type(PyObject*);
StdMeshers_SegmentAroundVertex_0DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_SegmentAroundVertex_0DPy();
~StdMeshers_SegmentAroundVertex_0DPy() override;
};
class StdMeshers_RadialPrism_3DPy : public SMESH_HypothesisPy<StdMeshers_RadialPrism_3DPy>
@@ -561,7 +561,7 @@ class StdMeshers_RadialPrism_3DPy : public SMESH_HypothesisPy<StdMeshers_RadialP
public:
static void init_type(PyObject*);
StdMeshers_RadialPrism_3DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_RadialPrism_3DPy();
~StdMeshers_RadialPrism_3DPy() override;
};
class StdMeshers_QuadraticMeshPy : public SMESH_HypothesisPy<StdMeshers_QuadraticMeshPy>
@@ -569,7 +569,7 @@ class StdMeshers_QuadraticMeshPy : public SMESH_HypothesisPy<StdMeshers_Quadrati
public:
static void init_type(PyObject*);
StdMeshers_QuadraticMeshPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_QuadraticMeshPy();
~StdMeshers_QuadraticMeshPy() override;
};
class StdMeshers_ProjectionSource3DPy : public SMESH_HypothesisPy<StdMeshers_ProjectionSource3DPy>
@@ -577,7 +577,7 @@ class StdMeshers_ProjectionSource3DPy : public SMESH_HypothesisPy<StdMeshers_Pro
public:
static void init_type(PyObject*);
StdMeshers_ProjectionSource3DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_ProjectionSource3DPy();
~StdMeshers_ProjectionSource3DPy() override;
//Py::Object setSource3DShape(const Py::Tuple& args);
//Py::Object getSource3DShape(const Py::Tuple& args);
//Py::Object setSourceMesh(const Py::Tuple& args);
@@ -595,7 +595,7 @@ class StdMeshers_ProjectionSource2DPy : public SMESH_HypothesisPy<StdMeshers_Pro
public:
static void init_type(PyObject*);
StdMeshers_ProjectionSource2DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_ProjectionSource2DPy();
~StdMeshers_ProjectionSource2DPy() override;
//Py::Object setSourceFace(const Py::Tuple& args);
//Py::Object getSourceFace(const Py::Tuple& args);
//Py::Object isCompoundSource(const Py::Tuple& args);
@@ -614,7 +614,7 @@ class StdMeshers_ProjectionSource1DPy : public SMESH_HypothesisPy<StdMeshers_Pro
public:
static void init_type(PyObject*);
StdMeshers_ProjectionSource1DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_ProjectionSource1DPy();
~StdMeshers_ProjectionSource1DPy() override;
//Py::Object setSourceEdge(const Py::Tuple& args);
//Py::Object getSourceEdge(const Py::Tuple& args);
//Py::Object isCompoundSource(const Py::Tuple& args);
@@ -633,7 +633,7 @@ class StdMeshers_Projection_3DPy : public SMESH_HypothesisPy<StdMeshers_Projecti
public:
static void init_type(PyObject*);
StdMeshers_Projection_3DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_Projection_3DPy();
~StdMeshers_Projection_3DPy() override;
};
class StdMeshers_Projection_2DPy : public SMESH_HypothesisPy<StdMeshers_Projection_2DPy>
@@ -641,7 +641,7 @@ class StdMeshers_Projection_2DPy : public SMESH_HypothesisPy<StdMeshers_Projecti
public:
static void init_type(PyObject*);
StdMeshers_Projection_2DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_Projection_2DPy();
~StdMeshers_Projection_2DPy() override;
};
class StdMeshers_Projection_1DPy : public SMESH_HypothesisPy<StdMeshers_Projection_1DPy>
@@ -649,7 +649,7 @@ class StdMeshers_Projection_1DPy : public SMESH_HypothesisPy<StdMeshers_Projecti
public:
static void init_type(PyObject*);
StdMeshers_Projection_1DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_Projection_1DPy();
~StdMeshers_Projection_1DPy() override;
};
class StdMeshers_Prism_3DPy : public SMESH_HypothesisPy<StdMeshers_Prism_3DPy>
@@ -657,7 +657,7 @@ class StdMeshers_Prism_3DPy : public SMESH_HypothesisPy<StdMeshers_Prism_3DPy>
public:
static void init_type(PyObject*);
StdMeshers_Prism_3DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_Prism_3DPy();
~StdMeshers_Prism_3DPy() override;
};
class StdMeshers_NumberOfSegmentsPy : public SMESH_HypothesisPy<StdMeshers_NumberOfSegmentsPy>
@@ -665,7 +665,7 @@ class StdMeshers_NumberOfSegmentsPy : public SMESH_HypothesisPy<StdMeshers_Numbe
public:
static void init_type(PyObject*);
StdMeshers_NumberOfSegmentsPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_NumberOfSegmentsPy();
~StdMeshers_NumberOfSegmentsPy() override;
Py::Object setNumSegm(const Py::Tuple& args);
Py::Object getNumSegm(const Py::Tuple& args);
};
@@ -675,7 +675,7 @@ class StdMeshers_NumberOfLayersPy : public SMESH_HypothesisPy<StdMeshers_NumberO
public:
static void init_type(PyObject*);
StdMeshers_NumberOfLayersPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_NumberOfLayersPy();
~StdMeshers_NumberOfLayersPy() override;
Py::Object setNumLayers(const Py::Tuple& args);
Py::Object getNumLayers(const Py::Tuple& args);
};
@@ -685,7 +685,7 @@ class StdMeshers_MEFISTO_2DPy : public SMESH_HypothesisPy<StdMeshers_MEFISTO_2DP
public:
static void init_type(PyObject*);
StdMeshers_MEFISTO_2DPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_MEFISTO_2DPy();
~StdMeshers_MEFISTO_2DPy() override;
};
class StdMeshers_MaxElementVolumePy : public SMESH_HypothesisPy<StdMeshers_MaxElementVolumePy>
@@ -693,7 +693,7 @@ class StdMeshers_MaxElementVolumePy : public SMESH_HypothesisPy<StdMeshers_MaxEl
public:
static void init_type(PyObject*);
StdMeshers_MaxElementVolumePy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_MaxElementVolumePy();
~StdMeshers_MaxElementVolumePy() override;
Py::Object setMaxVolume(const Py::Tuple& args);
Py::Object getMaxVolume(const Py::Tuple& args);
};
@@ -703,7 +703,7 @@ class StdMeshers_LengthFromEdgesPy : public SMESH_HypothesisPy<StdMeshers_Length
public:
static void init_type(PyObject*);
StdMeshers_LengthFromEdgesPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_LengthFromEdgesPy();
~StdMeshers_LengthFromEdgesPy() override;
Py::Object setMode(const Py::Tuple& args);
Py::Object getMode(const Py::Tuple& args);
};
@@ -713,7 +713,7 @@ class StdMeshers_LayerDistributionPy : public SMESH_HypothesisPy<StdMeshers_Laye
public:
static void init_type(PyObject*);
StdMeshers_LayerDistributionPy(int hypId, int studyId, SMESH_Gen* gen);
~StdMeshers_LayerDistributionPy();
~StdMeshers_LayerDistributionPy() override;
Py::Object setLayerDistribution(const Py::Tuple& args);
Py::Object getLayerDistribution(const Py::Tuple& args);
};

22
src/Mod/Fem/App/PropertyPostDataObject.h
View File

@@ -43,7 +43,7 @@ class FemExport PropertyPostDataObject : public App::Property
public:
PropertyPostDataObject();
~PropertyPostDataObject();
~PropertyPostDataObject() override;
/** @name Getter/setter */
//@{
@@ -61,25 +61,25 @@ public:
/** @name Python interface */
//@{
PyObject* getPyObject();
void setPyObject(PyObject *value);
PyObject* getPyObject() override;
void setPyObject(PyObject *value) override;
//@}
/** @name Save/restore */
//@{
void Save (Base::Writer &writer) const;
void Restore(Base::XMLReader &reader);
void Save (Base::Writer &writer) const override;
void Restore(Base::XMLReader &reader) override;
void SaveDocFile (Base::Writer &writer) const;
void RestoreDocFile(Base::Reader &reader);
void SaveDocFile (Base::Writer &writer) const override;
void RestoreDocFile(Base::Reader &reader) override;
App::Property *Copy() const;
void Paste(const App::Property &from);
unsigned int getMemSize () const;
App::Property *Copy() const override;
void Paste(const App::Property &from) override;
unsigned int getMemSize () const override;
//@}
/// Get valid paths for this property; used by auto completer
virtual void getPaths(std::vector<App::ObjectIdentifier> & paths) const;
void getPaths(std::vector<App::ObjectIdentifier> & paths) const override;
private:
static void scaleDataObject(vtkDataObject*, double s);

6
src/Mod/Fem/Gui/ActiveAnalysisObserver.h
View File

@@ -48,10 +48,10 @@ public:
private:
ActiveAnalysisObserver();
~ActiveAnalysisObserver();
~ActiveAnalysisObserver() override;
void slotDeletedDocument(const App::Document& Doc);
void slotDeletedObject(const App::DocumentObject& Obj);
void slotDeletedDocument(const App::Document& Doc) override;
void slotDeletedObject(const App::DocumentObject& Obj) override;
private:
static ActiveAnalysisObserver* inst;

4
src/Mod/Fem/Gui/AppFemGuiPy.cpp
View File

@@ -58,10 +58,10 @@ public:
initialize("This module is the FemGui module."); // register with Python
}
virtual ~Module() {}
~Module() override {}
private:
virtual Py::Object invoke_method_varargs(void* method_def, const Py::Tuple& args)
Py::Object invoke_method_varargs(void* method_def, const Py::Tuple& args) override
{
try {
return Py::ExtensionModule<Module>::invoke_method_varargs(method_def, args);

8
src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h
View File

@@ -38,15 +38,15 @@ class DlgSettingsFemCcxImp : public Gui::Dialog::PreferencePage
public:
DlgSettingsFemCcxImp( QWidget* parent = nullptr );
~DlgSettingsFemCcxImp();
~DlgSettingsFemCcxImp() override;
protected Q_SLOTS:
void onfileNameChanged(QString FileName);
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsFemCcxImp> ui;

8
src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h
View File

@@ -37,7 +37,7 @@ class DlgSettingsFemElmerImp : public Gui::Dialog::PreferencePage
public:
DlgSettingsFemElmerImp( QWidget* parent = nullptr );
~DlgSettingsFemElmerImp();
~DlgSettingsFemElmerImp() override;
protected Q_SLOTS:
void onfileNameChanged(QString FileName);
@@ -45,9 +45,9 @@ protected Q_SLOTS:
void onCoresValueChanged(int cores);
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsFemElmerImp> ui;

8
src/Mod/Fem/Gui/DlgSettingsFemExportAbaqusImp.h
View File

@@ -37,12 +37,12 @@ class DlgSettingsFemExportAbaqusImp : public Gui::Dialog::PreferencePage
public:
DlgSettingsFemExportAbaqusImp( QWidget* parent = nullptr );
~DlgSettingsFemExportAbaqusImp();
~DlgSettingsFemExportAbaqusImp() override;
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
private:
Ui_DlgSettingsFemExportAbaqus* ui;

8
src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h
View File

@@ -37,12 +37,12 @@ class DlgSettingsFemGeneralImp : public Gui::Dialog::PreferencePage
public:
DlgSettingsFemGeneralImp( QWidget* parent = nullptr );
~DlgSettingsFemGeneralImp();
~DlgSettingsFemGeneralImp() override;
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsFemGeneralImp> ui;

8
src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h
View File

@@ -37,15 +37,15 @@ class DlgSettingsFemGmshImp : public Gui::Dialog::PreferencePage
public:
DlgSettingsFemGmshImp( QWidget* parent = nullptr );
~DlgSettingsFemGmshImp();
~DlgSettingsFemGmshImp() override;
protected Q_SLOTS:
void onfileNameChanged(QString FileName);
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsFemGmshImp> ui;

8
src/Mod/Fem/Gui/DlgSettingsFemInOutVtkImp.h
View File

@@ -37,12 +37,12 @@ class DlgSettingsFemInOutVtkImp : public Gui::Dialog::PreferencePage
public:
DlgSettingsFemInOutVtkImp( QWidget* parent = nullptr );
~DlgSettingsFemInOutVtkImp();
~DlgSettingsFemInOutVtkImp() override;
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
private:
Ui_DlgSettingsFemInOutVtk* ui;

8
src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h
View File

@@ -38,12 +38,12 @@ class DlgSettingsFemMaterialImp : public Gui::Dialog::PreferencePage
public:
DlgSettingsFemMaterialImp( QWidget* parent = nullptr );
~DlgSettingsFemMaterialImp();
~DlgSettingsFemMaterialImp() override;
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsFemMaterialImp> ui;

8
src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h
View File

@@ -38,15 +38,15 @@ class DlgSettingsFemMystranImp : public Gui::Dialog::PreferencePage
public:
DlgSettingsFemMystranImp( QWidget* parent = nullptr );
~DlgSettingsFemMystranImp();
~DlgSettingsFemMystranImp() override;
protected Q_SLOTS:
void onfileNameChanged(QString FileName);
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsFemMystranImp> ui;

8
src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h
View File

@@ -38,15 +38,15 @@ class DlgSettingsFemZ88Imp : public Gui::Dialog::PreferencePage
public:
DlgSettingsFemZ88Imp( QWidget* parent = nullptr );
~DlgSettingsFemZ88Imp();
~DlgSettingsFemZ88Imp() override;
protected Q_SLOTS:
void onfileNameChanged(QString FileName);
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgSettingsFemZ88Imp> ui;

2
src/Mod/Fem/Gui/FemSelectionGate.h
View File

@@ -45,7 +45,7 @@ class FemSelectionGate : public Gui::SelectionFilterGate
ElemType Type;
/// get called by the frame-work
bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName);
bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName) override;
};
} //namespace FemGui

14
src/Mod/Fem/Gui/PropertyFemMeshItem.h
View File

@@ -43,9 +43,9 @@ class PropertyFemMeshItem : public Gui::PropertyEditor::PropertyItem
Q_PROPERTY(int Groups READ countGroups CONSTANT)
PROPERTYITEM_HEADER
virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const;
virtual void setEditorData(QWidget *editor, const QVariant& data) const;
virtual QVariant editorData(QWidget *editor) const;
QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const override;
void setEditorData(QWidget *editor, const QVariant& data) const override;
QVariant editorData(QWidget *editor) const override;
int countNodes() const;
int countEdges() const;
@@ -56,13 +56,13 @@ class PropertyFemMeshItem : public Gui::PropertyEditor::PropertyItem
int countGroups() const;
protected:
virtual QVariant toolTip(const App::Property*) const;
virtual QVariant value(const App::Property*) const;
virtual void setValue(const QVariant&);
QVariant toolTip(const App::Property*) const override;
QVariant value(const App::Property*) const override;
void setValue(const QVariant&) override;
protected:
PropertyFemMeshItem();
void initialize();
void initialize() override;
private:
Gui::PropertyEditor::PropertyIntegerItem* m_n;

2
src/Mod/Fem/Gui/TaskAnalysisInfo.h
View File

@@ -57,7 +57,7 @@ class TaskAnalysisInfo : public Gui::TaskView::TaskBox
public:
TaskAnalysisInfo(Fem::FemAnalysis *pcObject,QWidget *parent = nullptr);
~TaskAnalysisInfo();
~TaskAnalysisInfo() override;
private Q_SLOTS:
void SwitchMethod(int Value);

4
src/Mod/Fem/Gui/TaskCreateNodeSet.h
View File

@@ -53,7 +53,7 @@ class TaskCreateNodeSet : public Gui::TaskView::TaskBox, public Gui::SelectionOb
public:
TaskCreateNodeSet(Fem::FemSetNodesObject *pcObject,QWidget *parent = nullptr);
~TaskCreateNodeSet();
~TaskCreateNodeSet() override;
std::set<long> tempSet;
ViewProviderFemMesh * MeshViewProvider;
@@ -69,7 +69,7 @@ protected:
void DefineNodes(const Base::Polygon2d &polygon,const Gui::ViewVolumeProjection &proj,bool);
protected:
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
enum selectionModes { none, PickElement} selectionMode;
private:

12
src/Mod/Fem/Gui/TaskDlgAnalysis.h
View File

@@ -42,20 +42,20 @@ class TaskDlgAnalysis : public Gui::TaskView::TaskDialog
public:
TaskDlgAnalysis(Fem::FemAnalysis *);
~TaskDlgAnalysis();
~TaskDlgAnalysis() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user press the help button
virtual void helpRequested();
void helpRequested() override;
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
QDialogButtonBox::StandardButtons getStandardButtons() const override
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Apply; }
protected:

12
src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h
View File

@@ -44,20 +44,20 @@ class TaskDlgCreateNodeSet : public Gui::TaskView::TaskDialog
public:
TaskDlgCreateNodeSet(Fem::FemSetNodesObject *);
~TaskDlgCreateNodeSet();
~TaskDlgCreateNodeSet() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user press the help button
virtual void helpRequested();
void helpRequested() override;
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
QDialogButtonBox::StandardButtons getStandardButtons() const override
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; }
protected:

14
src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h
View File

@@ -43,22 +43,22 @@ class TaskDlgMeshShapeNetgen : public Gui::TaskView::TaskDialog
public:
TaskDlgMeshShapeNetgen(FemGui::ViewProviderFemMeshShapeNetgen *);
~TaskDlgMeshShapeNetgen();
~TaskDlgMeshShapeNetgen() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or rject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user press the help button
virtual void helpRequested();
void helpRequested() override;
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
QDialogButtonBox::StandardButtons getStandardButtons() const override
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Apply; }
protected:

2
src/Mod/Fem/Gui/TaskDriver.h
View File

@@ -55,7 +55,7 @@ class TaskDriver : public Gui::TaskView::TaskBox
public:
TaskDriver(Fem::FemAnalysis *pcObject,QWidget *parent = nullptr);
~TaskDriver();
~TaskDriver() override;
private Q_SLOTS:

18
src/Mod/Fem/Gui/TaskFemConstraint.h
View File

@@ -45,7 +45,7 @@ class TaskFemConstraint : public Gui::TaskView::TaskBox, public Gui::SelectionOb
public:
TaskFemConstraint(ViewProviderFemConstraint *ConstraintView,QWidget *parent = nullptr,const char* pixmapname = "");
virtual ~TaskFemConstraint() {}
~TaskFemConstraint() override {}
virtual const std::string getReferences() const {return std::string();}
const std::string getReferences(const std::vector<std::string>& items) const;
@@ -60,13 +60,13 @@ protected Q_SLOTS:
void onButtonWizCancel();
protected:
virtual void changeEvent(QEvent *e) { TaskBox::changeEvent(e); }
void changeEvent(QEvent *e) override { TaskBox::changeEvent(e); }
const QString makeRefText(const std::string& objName, const std::string& subName) const;
const QString makeRefText(const App::DocumentObject* obj, const std::string& subName) const;
virtual void keyPressEvent(QKeyEvent * ke);
void keyPressEvent(QKeyEvent * ke) override;
void createDeleteAction(QListWidget* parentList);
bool KeyEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges&) {}
void onSelectionChanged(const Gui::SelectionChanges&) override {}
protected:
QWidget* proxy;
@@ -89,20 +89,20 @@ class TaskDlgFemConstraint : public Gui::TaskView::TaskDialog
public:
/// is called the TaskView when the dialog is opened
void open();
void open() override;
/*
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int) {}
/// is called by the framework if the dialog is accepted (Ok)
*/
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
virtual bool isAllowedAlterDocument() const
bool reject() override;
bool isAllowedAlterDocument() const override
{ return false; }
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
QDialogButtonBox::StandardButtons getStandardButtons() const override
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; }
ViewProviderFemConstraint* getConstraintView() const

12
src/Mod/Fem/Gui/TaskFemConstraintBearing.h
View File

@@ -49,10 +49,10 @@ class TaskFemConstraintBearing : public TaskFemConstraint
public:
TaskFemConstraintBearing(ViewProviderFemConstraint *ConstraintView, QWidget *parent = nullptr,
const char* pixmapname = "FEM_ConstraintBearing");
virtual ~TaskFemConstraintBearing();
~TaskFemConstraintBearing() override;
double getDistance() const;
virtual const std::string getReferences() const;
const std::string getReferences() const override;
const std::string getLocationName() const;
const std::string getLocationObject() const;
bool getAxial() const;
@@ -64,9 +64,9 @@ private Q_SLOTS:
void onCheckAxial(bool);
protected:
bool event(QEvent *e);
virtual void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
protected:
Ui_TaskFemConstraintBearing* ui;
@@ -83,7 +83,7 @@ public:
TaskDlgFemConstraintBearing(ViewProviderFemConstraintBearing *ConstraintView);
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
};

12
src/Mod/Fem/Gui/TaskFemConstraintContact.h
View File

@@ -41,8 +41,8 @@ class TaskFemConstraintContact : public TaskFemConstraint
public:
TaskFemConstraintContact(ViewProviderFemConstraintContact *ConstraintView,QWidget *parent = nullptr);
~TaskFemConstraintContact();
const std::string getReferences() const;
~TaskFemConstraintContact() override;
const std::string getReferences() const override;
double get_Slope()const;
double get_Friction()const;
@@ -55,7 +55,7 @@ private Q_SLOTS:
void removeFromSelectionMaster();
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
//void onSelectionChanged(const Gui::SelectionChanges& msg);
@@ -70,9 +70,9 @@ class TaskDlgFemConstraintContact : public TaskDlgFemConstraint
public:
TaskDlgFemConstraintContact(ViewProviderFemConstraintContact *ConstraintView);
void open();
bool accept();
bool reject();
void open() override;
bool accept() override;
bool reject() override;
};
} //namespace FemGui

18
src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h
View File

@@ -50,8 +50,8 @@ class TaskFemConstraintDisplacement : public TaskFemConstraintOnBoundary
public:
TaskFemConstraintDisplacement(ViewProviderFemConstraintDisplacement *ConstraintView, QWidget *parent = nullptr);
~TaskFemConstraintDisplacement();
const std::string getReferences() const;
~TaskFemConstraintDisplacement() override;
const std::string getReferences() const override;
double get_spinxDisplacement()const;
double get_spinyDisplacement()const;
double get_spinzDisplacement()const;
@@ -92,12 +92,12 @@ private Q_SLOTS:
void rotfixz(int);
void rotfreez(int);
void addToSelection();
void removeFromSelection();
void addToSelection() override;
void removeFromSelection() override;
protected:
bool event(QEvent *e);
void changeEvent(QEvent *e);
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void clearButtons(const SelectionChangeModes notThis) override;
private:
@@ -112,9 +112,9 @@ class TaskDlgFemConstraintDisplacement : public TaskDlgFemConstraint
public:
TaskDlgFemConstraintDisplacement(ViewProviderFemConstraintDisplacement *ConstraintView);
void open();
bool accept();
bool reject();
void open() override;
bool accept() override;
bool reject() override;
};
} //namespace FemGui

18
src/Mod/Fem/Gui/TaskFemConstraintFixed.h
View File

@@ -39,17 +39,17 @@ class TaskFemConstraintFixed : public TaskFemConstraintOnBoundary
public:
TaskFemConstraintFixed(ViewProviderFemConstraintFixed *ConstraintView,QWidget *parent = nullptr);
~TaskFemConstraintFixed();
const std::string getReferences() const;
~TaskFemConstraintFixed() override;
const std::string getReferences() const override;
private Q_SLOTS:
void onReferenceDeleted();
void addToSelection();
void removeFromSelection();
void addToSelection() override;
void removeFromSelection() override;
protected:
bool event(QEvent *e);
void changeEvent(QEvent *e);
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void clearButtons(const SelectionChangeModes notThis) override;
private:
@@ -64,9 +64,9 @@ class TaskDlgFemConstraintFixed : public TaskDlgFemConstraint
public:
TaskDlgFemConstraintFixed(ViewProviderFemConstraintFixed *ConstraintView);
void open();
bool accept();
bool reject();
void open() override;
bool accept() override;
bool reject() override;
};
} //namespace FemGui

18
src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h
View File

@@ -50,7 +50,7 @@ class TaskFemConstraintFluidBoundary : public TaskFemConstraintOnBoundary
public:
TaskFemConstraintFluidBoundary(ViewProviderFemConstraintFluidBoundary *ConstraintView,QWidget *parent = nullptr);
virtual ~TaskFemConstraintFluidBoundary();
~TaskFemConstraintFluidBoundary() override;
const Fem::FemSolverObject* getFemSolver() const;
@@ -69,7 +69,7 @@ public:
double getHeatFluxValue() const;
double getHTCoeffValue() const;
const std::string getReferences() const;
const std::string getReferences() const override;
const std::string getDirectionName() const;
const std::string getDirectionObject() const;
bool getReverse() const;
@@ -83,12 +83,12 @@ private Q_SLOTS:
void onReferenceDeleted();
void onButtonDirection(const bool pressed = true);
void onCheckReverse(bool); // consider removing this slot as the UI is hidden
void addToSelection();
void removeFromSelection();
void addToSelection() override;
void removeFromSelection() override;
protected:
bool event(QEvent *e);
virtual void changeEvent(QEvent *e);
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void clearButtons(const SelectionChangeModes notThis) override;
private:
@@ -115,9 +115,9 @@ public:
TaskDlgFemConstraintFluidBoundary(ViewProviderFemConstraintFluidBoundary *ConstraintView);
/// is called by the framework if the dialog is accepted (Ok)
virtual void open();
virtual bool accept();
virtual bool reject();
void open() override;
bool accept() override;
bool reject() override;
};

18
src/Mod/Fem/Gui/TaskFemConstraintForce.h
View File

@@ -49,9 +49,9 @@ class TaskFemConstraintForce : public TaskFemConstraintOnBoundary
public:
TaskFemConstraintForce(ViewProviderFemConstraintForce *ConstraintView,QWidget *parent = nullptr);
virtual ~TaskFemConstraintForce();
~TaskFemConstraintForce() override;
double getForce() const;
const std::string getReferences() const;
const std::string getReferences() const override;
const std::string getDirectionName() const;
const std::string getDirectionObject() const;
bool getReverse() const;
@@ -61,12 +61,12 @@ private Q_SLOTS:
void onForceChanged(double);
void onButtonDirection(const bool pressed = false);
void onCheckReverse(bool);
void addToSelection();
void removeFromSelection();
void addToSelection() override;
void removeFromSelection() override;
protected:
bool event(QEvent *e);
virtual void changeEvent(QEvent *e);
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void clearButtons(const SelectionChangeModes notThis) override;
private:
@@ -86,9 +86,9 @@ public:
TaskDlgFemConstraintForce(ViewProviderFemConstraintForce *ConstraintView);
/// is called by the framework if the dialog is accepted (Ok)
virtual void open();
virtual bool accept();
virtual bool reject();
void open() override;
bool accept() override;
bool reject() override;
};

6
src/Mod/Fem/Gui/TaskFemConstraintGear.h
View File

@@ -52,8 +52,8 @@ private Q_SLOTS:
void onCheckReversed(bool);
protected:
virtual void changeEvent(QEvent *e);
virtual void onSelectionChanged(const Gui::SelectionChanges& msg);
void changeEvent(QEvent *e) override;
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
};
/// simulation dialog for the TaskView
@@ -66,7 +66,7 @@ public:
TaskDlgFemConstraintGear(ViewProviderFemConstraintGear *ConstraintView);
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
};

18
src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h
View File

@@ -41,12 +41,12 @@ class TaskFemConstraintHeatflux : public TaskFemConstraintOnBoundary
public:
TaskFemConstraintHeatflux(ViewProviderFemConstraintHeatflux *ConstraintView,QWidget *parent = nullptr);
virtual ~TaskFemConstraintHeatflux();
~TaskFemConstraintHeatflux() override;
double getAmbientTemp() const;
/*double getFaceTemp(void) const;*/
double getFilmCoef() const;
std::string get_constraint_type() const;
virtual const std::string getReferences() const;
const std::string getReferences() const override;
private Q_SLOTS:
void onReferenceDeleted();
@@ -56,12 +56,12 @@ private Q_SLOTS:
void onHeatFluxChanged(double val);
void Conv();
void Flux();
void addToSelection();
void removeFromSelection();
void addToSelection() override;
void removeFromSelection() override;
protected:
bool event(QEvent *e);
virtual void changeEvent(QEvent *e);
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void clearButtons(const SelectionChangeModes notThis) override;
private:
@@ -75,9 +75,9 @@ class TaskDlgFemConstraintHeatflux : public TaskDlgFemConstraint
public:
TaskDlgFemConstraintHeatflux(ViewProviderFemConstraintHeatflux *ConstraintView);
virtual void open();
virtual bool accept();
virtual bool reject();
void open() override;
bool accept() override;
bool reject() override;
};
} //namespace FemGui

10
src/Mod/Fem/Gui/TaskFemConstraintInitialTemperature.h
View File

@@ -41,11 +41,11 @@ class TaskFemConstraintInitialTemperature : public TaskFemConstraint
public:
TaskFemConstraintInitialTemperature(ViewProviderFemConstraintInitialTemperature *ConstraintView,QWidget *parent = nullptr);
~TaskFemConstraintInitialTemperature();
~TaskFemConstraintInitialTemperature() override;
double get_temperature()const;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
//void onSelectionChanged(const Gui::SelectionChanges& msg);
@@ -60,9 +60,9 @@ class TaskDlgFemConstraintInitialTemperature : public TaskDlgFemConstraint
public:
TaskDlgFemConstraintInitialTemperature(ViewProviderFemConstraintInitialTemperature *ConstraintView);
void open();
bool accept();
bool reject();
void open() override;
bool accept() override;
bool reject() override;
};
} //namespace FemGui

4
src/Mod/Fem/Gui/TaskFemConstraintOnBoundary.h
View File

@@ -49,7 +49,7 @@ class TaskFemConstraintOnBoundary : public TaskFemConstraint
public:
TaskFemConstraintOnBoundary(ViewProviderFemConstraint *ConstraintView, QWidget *parent = nullptr, const char* pixmapname = "");
~TaskFemConstraintOnBoundary();
~TaskFemConstraintOnBoundary() override;
protected Q_SLOTS:
void onButtonToggled(QAbstractButton *button, bool checked);
@@ -58,7 +58,7 @@ protected Q_SLOTS:
protected:
enum class SelectionChangeModes {none, refAdd, refRemove};
virtual void onSelectionChanged(const Gui::SelectionChanges&) override;
void onSelectionChanged(const Gui::SelectionChanges&) override;
virtual void clearButtons(const SelectionChangeModes notThis) = 0;
protected:

14
src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h
View File

@@ -41,8 +41,8 @@ class TaskFemConstraintPlaneRotation : public TaskFemConstraint
public:
TaskFemConstraintPlaneRotation(ViewProviderFemConstraintPlaneRotation *ConstraintView,QWidget *parent = nullptr);
~TaskFemConstraintPlaneRotation();
const std::string getReferences() const;
~TaskFemConstraintPlaneRotation() override;
const std::string getReferences() const override;
private Q_SLOTS:
void onReferenceDeleted();
@@ -50,8 +50,8 @@ private Q_SLOTS:
void removeFromSelection();
protected:
bool event(QEvent *e);
void changeEvent(QEvent *e);
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
private:
void updateUI();
@@ -65,9 +65,9 @@ class TaskDlgFemConstraintPlaneRotation : public TaskDlgFemConstraint
public:
TaskDlgFemConstraintPlaneRotation(ViewProviderFemConstraintPlaneRotation *ConstraintView);
void open();
bool accept();
bool reject();
void open() override;
bool accept() override;
bool reject() override;
};
} //namespace FemGui

18
src/Mod/Fem/Gui/TaskFemConstraintPressure.h
View File

@@ -41,20 +41,20 @@ class TaskFemConstraintPressure : public TaskFemConstraintOnBoundary
public:
TaskFemConstraintPressure(ViewProviderFemConstraintPressure *ConstraintView,QWidget *parent = nullptr);
~TaskFemConstraintPressure();
const std::string getReferences() const;
~TaskFemConstraintPressure() override;
const std::string getReferences() const override;
double get_Pressure()const;
bool get_Reverse()const;
private Q_SLOTS:
void onReferenceDeleted();
void onCheckReverse(bool);
void addToSelection();
void removeFromSelection();
void addToSelection() override;
void removeFromSelection() override;
protected:
bool event(QEvent *e);
void changeEvent(QEvent *e);
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void clearButtons(const SelectionChangeModes notThis) override;
private:
@@ -69,9 +69,9 @@ class TaskDlgFemConstraintPressure : public TaskDlgFemConstraint
public:
TaskDlgFemConstraintPressure(ViewProviderFemConstraintPressure *ConstraintView);
void open();
bool accept();
bool reject();
void open() override;
bool accept() override;
bool reject() override;
};
} //namespace FemGui

6
src/Mod/Fem/Gui/TaskFemConstraintPulley.h
View File

@@ -49,7 +49,7 @@ private Q_SLOTS:
void onCheckIsDriven(bool);
protected:
virtual void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
};
/// simulation dialog for the TaskView
@@ -61,8 +61,8 @@ public:
TaskDlgFemConstraintPulley(ViewProviderFemConstraintPulley *ConstraintView);
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
void open();
bool accept() override;
void open() override;
};
} //namespace FemGui

18
src/Mod/Fem/Gui/TaskFemConstraintSpring.h
View File

@@ -39,19 +39,19 @@ class TaskFemConstraintSpring : public TaskFemConstraintOnBoundary
public:
TaskFemConstraintSpring(ViewProviderFemConstraintSpring *ConstraintView,QWidget *parent = nullptr);
~TaskFemConstraintSpring();
const std::string getReferences() const;
~TaskFemConstraintSpring() override;
const std::string getReferences() const override;
double get_normalStiffness()const;
double get_tangentialStiffness()const;
private Q_SLOTS:
void onReferenceDeleted();
void addToSelection();
void removeFromSelection();
void addToSelection() override;
void removeFromSelection() override;
protected:
bool event(QEvent *e);
void changeEvent(QEvent *e);
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void clearButtons(const SelectionChangeModes notThis) override;
private:
@@ -66,9 +66,9 @@ class TaskDlgFemConstraintSpring : public TaskDlgFemConstraint
public:
TaskDlgFemConstraintSpring(ViewProviderFemConstraintSpring *ConstraintView);
void open();
bool accept();
bool reject();
void open() override;
bool accept() override;
bool reject() override;
};
} //namespace FemGui

18
src/Mod/Fem/Gui/TaskFemConstraintTemperature.h
View File

@@ -44,8 +44,8 @@ class TaskFemConstraintTemperature : public TaskFemConstraintOnBoundary
public:
TaskFemConstraintTemperature(ViewProviderFemConstraintTemperature *ConstraintView,QWidget *parent = nullptr);
~TaskFemConstraintTemperature();
const std::string getReferences() const;
~TaskFemConstraintTemperature() override;
const std::string getReferences() const override;
double get_temperature()const;
double get_cflux() const;
std::string get_constraint_type() const;
@@ -55,12 +55,12 @@ private Q_SLOTS:
void onTempCfluxChanged(double val);
void Temp();
void Flux();
void addToSelection();
void removeFromSelection();
void addToSelection() override;
void removeFromSelection() override;
protected:
bool event(QEvent *e);
void changeEvent(QEvent *e);
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
void clearButtons(const SelectionChangeModes notThis) override;
private:
@@ -75,9 +75,9 @@ class TaskDlgFemConstraintTemperature : public TaskDlgFemConstraint
public:
TaskDlgFemConstraintTemperature(ViewProviderFemConstraintTemperature *ConstraintView);
void open();
bool accept();
bool reject();
void open() override;
bool accept() override;
bool reject() override;
};
} //namespace FemGui

14
src/Mod/Fem/Gui/TaskFemConstraintTransform.h
View File

@@ -42,8 +42,8 @@ class TaskFemConstraintTransform : public TaskFemConstraint
public:
TaskFemConstraintTransform(ViewProviderFemConstraintTransform *ConstraintView,QWidget *parent = nullptr);
~TaskFemConstraintTransform();
const std::string getReferences() const;
~TaskFemConstraintTransform() override;
const std::string getReferences() const override;
double get_X_rot()const;
double get_Y_rot()const;
double get_Z_rot()const;
@@ -61,8 +61,8 @@ private Q_SLOTS:
void z_Changed(int z);
protected:
bool event(QEvent *e);
void changeEvent(QEvent *e);
bool event(QEvent *e) override;
void changeEvent(QEvent *e) override;
const QString makeText(const App::DocumentObject* obj) const;
private:
@@ -76,9 +76,9 @@ class TaskDlgFemConstraintTransform : public TaskDlgFemConstraint
public:
TaskDlgFemConstraintTransform(ViewProviderFemConstraintTransform *ConstraintView);
void open();
bool accept();
bool reject();
void open() override;
bool accept() override;
bool reject() override;
};
} //namespace FemGui

2
src/Mod/Fem/Gui/TaskObjectName.h
View File

@@ -49,7 +49,7 @@ class TaskObjectName : public Gui::TaskView::TaskBox
public:
TaskObjectName(App::DocumentObject *pcObject,QWidget *parent = nullptr);
~TaskObjectName();
~TaskObjectName() override;
std::string name;

64
src/Mod/Fem/Gui/TaskPostBoxes.h
View File

@@ -60,7 +60,7 @@ class PointMarker : public QObject
public:
PointMarker(Gui::View3DInventorViewer* view, std::string ObjName);
~PointMarker();
~PointMarker() override;
void addPoint(const SbVec3f&);
int countPoints() const;
@@ -69,7 +69,7 @@ Q_SIGNALS:
void PointsChanged(double x1, double y1, double z1, double x2, double y2, double z2);
protected:
void customEvent(QEvent* e);
void customEvent(QEvent* e) override;
private:
Gui::View3DInventorViewer *view;
@@ -85,7 +85,7 @@ class FemGuiExport ViewProviderPointMarker : public Gui::ViewProviderDocumentObj
public:
ViewProviderPointMarker();
virtual ~ViewProviderPointMarker();
~ViewProviderPointMarker() override;
protected:
SoCoordinate3 * pCoords;
@@ -100,7 +100,7 @@ class DataMarker : public QObject
public:
DataMarker(Gui::View3DInventorViewer* view, std::string ObjName);
~DataMarker();
~DataMarker() override;
void addPoint(const SbVec3f&);
int countPoints() const;
@@ -109,7 +109,7 @@ Q_SIGNALS:
void PointsChanged(double x, double y, double z);
protected:
void customEvent(QEvent* e);
void customEvent(QEvent* e) override;
private:
Gui::View3DInventorViewer *view;
@@ -125,7 +125,7 @@ class FemGuiExport ViewProviderDataMarker : public Gui::ViewProviderDocumentObje
public:
ViewProviderDataMarker();
virtual ~ViewProviderDataMarker();
~ViewProviderDataMarker() override;
protected:
SoCoordinate3 * pCoords;
@@ -139,7 +139,7 @@ class TaskPostBox : public Gui::TaskView::TaskBox {
public:
TaskPostBox(Gui::ViewProviderDocumentObject* view, const QPixmap &icon, const QString &title, QWidget *parent = nullptr);
~TaskPostBox();
~TaskPostBox() override;
virtual void applyPythonCode() = 0;
virtual bool isGuiTaskOnly() {return false;} //return true if only gui properties are manipulated
@@ -180,7 +180,7 @@ class TaskDlgPost : public Gui::TaskView::TaskDialog
public:
TaskDlgPost(Gui::ViewProviderDocumentObject *view);
~TaskDlgPost();
~TaskDlgPost() override;
void connectSlots();
void appendBox(TaskPostBox* box);
@@ -190,20 +190,20 @@ public:
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual bool isAllowedAlterDocument() const
bool isAllowedAlterDocument() const override
{ return false; }
virtual void modifyStandardButtons(QDialogButtonBox*);
void modifyStandardButtons(QDialogButtonBox*) override;
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons() const;
QDialogButtonBox::StandardButtons getStandardButtons() const override;
protected:
void recompute();
@@ -220,10 +220,10 @@ class TaskPostDisplay : public TaskPostBox
public:
TaskPostDisplay(Gui::ViewProviderDocumentObject* view, QWidget *parent = nullptr);
~TaskPostDisplay();
~TaskPostDisplay() override;
virtual void applyPythonCode();
virtual bool isGuiTaskOnly() {return true;}
void applyPythonCode() override;
bool isGuiTaskOnly() override {return true;}
private Q_SLOTS:
void on_Representation_activated(int i);
@@ -244,9 +244,9 @@ class TaskPostFunction : public TaskPostBox {
public:
TaskPostFunction(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr);
virtual ~TaskPostFunction();
~TaskPostFunction() override;
virtual void applyPythonCode();
void applyPythonCode() override;
};
@@ -256,9 +256,9 @@ class TaskPostClip : public TaskPostBox {
public:
TaskPostClip(Gui::ViewProviderDocumentObject* view, App::PropertyLink* function, QWidget* parent = nullptr);
virtual ~TaskPostClip();
~TaskPostClip() override;
virtual void applyPythonCode();
void applyPythonCode() override;
private Q_SLOTS:
void on_CreateButton_triggered(QAction*);
@@ -285,9 +285,9 @@ class TaskPostDataAlongLine: public TaskPostBox {
public:
TaskPostDataAlongLine(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr);
virtual ~TaskPostDataAlongLine();
~TaskPostDataAlongLine() override;
virtual void applyPythonCode();
void applyPythonCode() override;
static void pointCallback(void * ud, SoEventCallback * n);
private Q_SLOTS:
@@ -316,9 +316,9 @@ class TaskPostDataAtPoint: public TaskPostBox {
public:
TaskPostDataAtPoint(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr);
virtual ~TaskPostDataAtPoint();
~TaskPostDataAtPoint() override;
virtual void applyPythonCode();
void applyPythonCode() override;
static void pointCallback(void * ud, SoEventCallback * n);
private Q_SLOTS:
@@ -345,9 +345,9 @@ class TaskPostScalarClip : public TaskPostBox {
public:
TaskPostScalarClip(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr);
virtual ~TaskPostScalarClip();
~TaskPostScalarClip() override;
virtual void applyPythonCode();
void applyPythonCode() override;
private Q_SLOTS:
void on_Slider_valueChanged(int v);
@@ -367,9 +367,9 @@ class TaskPostWarpVector : public TaskPostBox {
public:
TaskPostWarpVector(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr);
virtual ~TaskPostWarpVector();
~TaskPostWarpVector() override;
virtual void applyPythonCode();
void applyPythonCode() override;
private Q_SLOTS:
void on_Slider_valueChanged(int v);
@@ -390,9 +390,9 @@ class TaskPostCut : public TaskPostBox {
public:
TaskPostCut(Gui::ViewProviderDocumentObject* view, App::PropertyLink* function, QWidget* parent = nullptr);
virtual ~TaskPostCut();
~TaskPostCut() override;
virtual void applyPythonCode();
void applyPythonCode() override;
private Q_SLOTS:
void on_CreateButton_triggered(QAction*);

2
src/Mod/Fem/Gui/TaskTetParameter.h
View File

@@ -56,7 +56,7 @@ class TaskTetParameter : public Gui::TaskView::TaskBox
public:
TaskTetParameter(Fem::FemMeshShapeNetgenObject *pcObject,QWidget *parent = nullptr);
~TaskTetParameter();
~TaskTetParameter() override;
void setInfo();
bool touched;

38
src/Mod/Fem/Gui/ViewProviderAnalysis.h
View File

@@ -56,53 +56,53 @@ public:
ViewProviderFemAnalysis();
/// destructor.
virtual ~ViewProviderFemAnalysis();
~ViewProviderFemAnalysis() override;
virtual void attach(App::DocumentObject*);
virtual bool doubleClicked();
void attach(App::DocumentObject*) override;
bool doubleClicked() override;
virtual std::vector<App::DocumentObject*> claimChildren()const;
std::vector<App::DocumentObject*> claimChildren()const override;
// handling when object is deleted
virtual bool onDelete(const std::vector<std::string>&);
bool onDelete(const std::vector<std::string>&) override;
/// Asks the view provider if the given object can be deleted.
virtual bool canDelete(App::DocumentObject* obj) const;
bool canDelete(App::DocumentObject* obj) const override;
//virtual std::vector<App::DocumentObject*> claimChildren3D(void)const;
void setupContextMenu(QMenu*, QObject*, const char*);
void setupContextMenu(QMenu*, QObject*, const char*) override;
/// A list of all possible display modes
virtual std::vector<std::string> getDisplayModes() const;
std::vector<std::string> getDisplayModes() const override;
// shows solid in the tree
virtual bool isShow() const {
bool isShow() const override {
return Visibility.getValue();
}
/// Hide the object in the view
virtual void hide();
void hide() override;
/// Show the object in the view
virtual void show();
void show() override;
void highlightView(Gui::ViewProviderDocumentObject*);
/** @name Drag and drop */
//@{
/// Returns true if the view provider generally supports dragging objects
bool canDragObjects() const;
bool canDragObjects() const override;
/// Check whether the object can be removed from the view provider by drag and drop
bool canDragObject(App::DocumentObject*) const;
bool canDragObject(App::DocumentObject*) const override;
/// Starts to drag the object
void dragObject(App::DocumentObject*);
void dragObject(App::DocumentObject*) override;
/// Returns true if the view provider generally accepts dropping of objects
bool canDropObjects() const;
bool canDropObjects() const override;
/// Check whether the object can be dropped to the view provider by drag and drop
bool canDropObject(App::DocumentObject*) const;
bool canDropObject(App::DocumentObject*) const override;
/// If the dropped object type is accepted the object will be added as child
void dropObject(App::DocumentObject*);
void dropObject(App::DocumentObject*) override;
//@}
protected:
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
private:
ViewProviderFemHighlighter extension;

20
src/Mod/Fem/Gui/ViewProviderFemConstraint.h
View File

@@ -49,7 +49,7 @@ class FemGuiExport ViewProviderFemConstraint : public Gui::ViewProviderGeometryO
public:
/// Constructor
ViewProviderFemConstraint();
virtual ~ViewProviderFemConstraint();
~ViewProviderFemConstraint() override;
// Display properties
App::PropertyColor TextColor;
@@ -59,13 +59,13 @@ public:
App::PropertyFloat DistFactor;
App::PropertyBool Mirror;
void attach(App::DocumentObject *);
virtual void updateData(const App::Property* prop) { Gui::ViewProviderGeometryObject::updateData(prop); }
std::vector<std::string> getDisplayModes() const;
void setDisplayMode(const char* ModeName);
void attach(App::DocumentObject *) override;
void updateData(const App::Property* prop) override { Gui::ViewProviderGeometryObject::updateData(prop); }
std::vector<std::string> getDisplayModes() const override;
void setDisplayMode(const char* ModeName) override;
std::vector<App::DocumentObject*> claimChildren()const;
void setupContextMenu(QMenu*, QObject*, const char*);
std::vector<App::DocumentObject*> claimChildren()const override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
/// Highlight the references that have been selected
virtual void highlightReferences(const bool /* on */) {}
@@ -74,9 +74,9 @@ public:
static std::string gethideMeshShowPartStr(const std::string showConstr);
protected:
void onChanged(const App::Property* prop);
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
void onChanged(const App::Property* prop) override;
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
static void createPlacement(SoSeparator* sep, const SbVec3f &base, const SbRotation &r);
static void updatePlacement(const SoSeparator* sep, const int idx, const SbVec3f &base, const SbRotation &r);

6
src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.h
View File

@@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintBearing : public FemGui::ViewProvide
public:
/// Constructor
ViewProviderFemConstraintBearing();
virtual ~ViewProviderFemConstraintBearing();
~ViewProviderFemConstraintBearing() override;
virtual void updateData(const App::Property*);
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
} //namespace FemGui

6
src/Mod/Fem/Gui/ViewProviderFemConstraintContact.h
View File

@@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintContact : public FemGui::ViewProvide
public:
ViewProviderFemConstraintContact();
virtual ~ViewProviderFemConstraintContact();
virtual void updateData(const App::Property*);
~ViewProviderFemConstraintContact() override;
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
}

6
src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.h
View File

@@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintDisplacement : public FemGui::ViewPr
public:
ViewProviderFemConstraintDisplacement();
virtual ~ViewProviderFemConstraintDisplacement();
virtual void updateData(const App::Property*);
~ViewProviderFemConstraintDisplacement() override;
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
}

6
src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.h
View File

@@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintFixed : public FemGui::ViewProviderF
public:
/// Constructor
ViewProviderFemConstraintFixed();
virtual ~ViewProviderFemConstraintFixed();
~ViewProviderFemConstraintFixed() override;
virtual void updateData(const App::Property*);
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
} //namespace FemGui

6
src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.h
View File

@@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintFluidBoundary : public FemGui::ViewP
public:
/// Constructor
ViewProviderFemConstraintFluidBoundary();
virtual ~ViewProviderFemConstraintFluidBoundary();
~ViewProviderFemConstraintFluidBoundary() override;
virtual void updateData(const App::Property*);
void updateData(const App::Property*) override;
//virtual void onChanged(const App::Property*); //no further property for viewProvider
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
} //namespace FemGui

6
src/Mod/Fem/Gui/ViewProviderFemConstraintForce.h
View File

@@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintForce : public FemGui::ViewProviderF
public:
/// Constructor
ViewProviderFemConstraintForce();
virtual ~ViewProviderFemConstraintForce();
~ViewProviderFemConstraintForce() override;
virtual void updateData(const App::Property*);
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
private:
/// Direction of the force

6
src/Mod/Fem/Gui/ViewProviderFemConstraintGear.h
View File

@@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintGear : public FemGui::ViewProviderFe
public:
/// Constructor
ViewProviderFemConstraintGear();
virtual ~ViewProviderFemConstraintGear();
~ViewProviderFemConstraintGear() override;
virtual void updateData(const App::Property*);
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
} //namespace FemGui

6
src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.h
View File

@@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintHeatflux : public FemGui::ViewProvid
public:
ViewProviderFemConstraintHeatflux();
virtual ~ViewProviderFemConstraintHeatflux();
virtual void updateData(const App::Property*);
~ViewProviderFemConstraintHeatflux() override;
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
}

6
src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.h
View File

@@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintInitialTemperature : public FemGui::
public:
ViewProviderFemConstraintInitialTemperature();
virtual ~ViewProviderFemConstraintInitialTemperature();
virtual void updateData(const App::Property*);
~ViewProviderFemConstraintInitialTemperature() override;
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
}

2
src/Mod/Fem/Gui/ViewProviderFemConstraintOnBoundary.h
View File

@@ -36,7 +36,7 @@ class FemGuiExport ViewProviderFemConstraintOnBoundary : public FemGui::ViewProv
public:
ViewProviderFemConstraintOnBoundary();
virtual ~ViewProviderFemConstraintOnBoundary();
~ViewProviderFemConstraintOnBoundary() override;
void highlightReferences(const bool on) override;

6
src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.h
View File

@@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintPlaneRotation : public FemGui::ViewP
public:
ViewProviderFemConstraintPlaneRotation();
virtual ~ViewProviderFemConstraintPlaneRotation();
virtual void updateData(const App::Property*);
~ViewProviderFemConstraintPlaneRotation() override;
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
}

6
src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.h
View File

@@ -34,11 +34,11 @@ class FemGuiExport ViewProviderFemConstraintPressure : public FemGui::ViewProvid
public:
ViewProviderFemConstraintPressure();
virtual ~ViewProviderFemConstraintPressure();
virtual void updateData(const App::Property*);
~ViewProviderFemConstraintPressure() override;
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
}

6
src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.h
View File

@@ -37,12 +37,12 @@ class FemGuiExport ViewProviderFemConstraintPulley : public FemGui::ViewProvider
public:
/// Constructor
ViewProviderFemConstraintPulley();
virtual ~ViewProviderFemConstraintPulley();
~ViewProviderFemConstraintPulley() override;
virtual void updateData(const App::Property*);
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
} //namespace FemGui

6
src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.h
View File

@@ -34,11 +34,11 @@ class FemGuiExport ViewProviderFemConstraintSpring : public FemGui::ViewProvider
public:
ViewProviderFemConstraintSpring();
virtual ~ViewProviderFemConstraintSpring();
virtual void updateData(const App::Property*);
~ViewProviderFemConstraintSpring() override;
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
}

6
src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.h
View File

@@ -36,11 +36,11 @@ class FemGuiExport ViewProviderFemConstraintTemperature : public FemGui::ViewPro
public:
ViewProviderFemConstraintTemperature();
virtual ~ViewProviderFemConstraintTemperature();
virtual void updateData(const App::Property*);
~ViewProviderFemConstraintTemperature() override;
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
}

6
src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.h
View File

@@ -37,11 +37,11 @@ class FemGuiExport ViewProviderFemConstraintTransform : public FemGui::ViewProvi
public:
ViewProviderFemConstraintTransform();
virtual ~ViewProviderFemConstraintTransform();
virtual void updateData(const App::Property*);
~ViewProviderFemConstraintTransform() override;
void updateData(const App::Property*) override;
protected:
virtual bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};
}

26
src/Mod/Fem/Gui/ViewProviderFemMesh.h
View File

@@ -42,8 +42,8 @@ class ViewProviderFEMMeshBuilder : public Gui::ViewProviderBuilder
{
public:
ViewProviderFEMMeshBuilder(){}
virtual ~ViewProviderFEMMeshBuilder(){}
virtual void buildNodes(const App::Property*, std::vector<SoNode*>&) const;
~ViewProviderFEMMeshBuilder() override{}
void buildNodes(const App::Property*, std::vector<SoNode*>&) const override;
void createMesh(const App::Property*,
SoCoordinate3*,
SoIndexedFaceSet*,
@@ -65,7 +65,7 @@ public:
ViewProviderFemMesh();
/// destructor.
virtual ~ViewProviderFemMesh();
~ViewProviderFemMesh() override;
// Display properties
App::PropertyColor PointColor;
@@ -75,10 +75,10 @@ public:
App::PropertyBool ShowInner;
App::PropertyInteger MaxFacesShowInner;
void attach(App::DocumentObject *pcObject);
void setDisplayMode(const char* ModeName);
std::vector<std::string> getDisplayModes() const;
void updateData(const App::Property*);
void attach(App::DocumentObject *pcObject) override;
void setDisplayMode(const char* ModeName) override;
std::vector<std::string> getDisplayModes() const override;
void updateData(const App::Property*) override;
/** @name Selection handling
* This group of methods do the selection handling.
@@ -87,12 +87,12 @@ public:
*/
//@{
/// indicates if the ViewProvider use the new Selection model
virtual bool useNewSelectionModel() const {return true;}
bool useNewSelectionModel() const override {return true;}
/// return a hit element to the selection path or 0
virtual std::string getElement(const SoDetail*) const;
virtual SoDetail* getDetail(const char*) const;
std::string getElement(const SoDetail*) const override;
SoDetail* getDetail(const char*) const override;
/// return the highlight lines for a given element or the whole shape
virtual std::vector<Base::Vector3d> getSelectionShape(const char* Element) const;
std::vector<Base::Vector3d> getSelectionShape(const char* Element) const override;
//@}
// interface methods
@@ -128,7 +128,7 @@ public:
const std::vector<unsigned long> &getVisibleElementFaces()const{return vFaceElementIdx;}
PyObject *getPyObject();
PyObject *getPyObject() override;
private:
static App::PropertyFloatConstraint::Constraints floatRange;
@@ -137,7 +137,7 @@ private:
protected:
/// get called by the container whenever a property has been changed
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
void setColorByNodeIdHelper(const std::vector<App::Color> &);
void setDisplacementByNodeIdHelper(const std::vector<Base::Vector3d>& DispVector,long startId);

2
src/Mod/Fem/Gui/ViewProviderFemMeshShape.h
View File

@@ -38,7 +38,7 @@ public:
ViewProviderFemMeshShape();
/// destructor.
virtual ~ViewProviderFemMeshShape();
~ViewProviderFemMeshShape() override;
};
} //namespace FemGui

8
src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h
View File

@@ -37,13 +37,13 @@ public:
ViewProviderFemMeshShapeNetgen();
/// destructor.
virtual ~ViewProviderFemMeshShapeNetgen();
~ViewProviderFemMeshShapeNetgen() override;
virtual void updateData(const App::Property*);
void updateData(const App::Property*) override;
protected:
virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member);
virtual bool setEdit(int ModNum);
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
bool setEdit(int ModNum) override;
};
} //namespace FemGui

24
src/Mod/Fem/Gui/ViewProviderFemPostFilter.h
View File

@@ -36,10 +36,10 @@ class FemGuiExport ViewProviderFemPostClip : public ViewProviderFemPostObject {
public:
/// constructor.
ViewProviderFemPostClip();
~ViewProviderFemPostClip();
~ViewProviderFemPostClip() override;
protected:
virtual void setupTaskDialog(TaskDlgPost* dlg);
void setupTaskDialog(TaskDlgPost* dlg) override;
};
class FemGuiExport ViewProviderFemPostDataAlongLine : public ViewProviderFemPostObject {
@@ -49,10 +49,10 @@ class FemGuiExport ViewProviderFemPostDataAlongLine : public ViewProviderFemPost
public:
/// constructor.
ViewProviderFemPostDataAlongLine();
~ViewProviderFemPostDataAlongLine();
~ViewProviderFemPostDataAlongLine() override;
protected:
virtual void setupTaskDialog(TaskDlgPost* dlg);
void setupTaskDialog(TaskDlgPost* dlg) override;
};
class FemGuiExport ViewProviderFemPostDataAtPoint: public ViewProviderFemPostObject {
@@ -64,10 +64,10 @@ public:
ViewProviderFemPostDataAtPoint();
void show() override;
void onSelectionChanged(const Gui::SelectionChanges &) override;
~ViewProviderFemPostDataAtPoint();
~ViewProviderFemPostDataAtPoint() override;
protected:
virtual void setupTaskDialog(TaskDlgPost* dlg);
void setupTaskDialog(TaskDlgPost* dlg) override;
};
class FemGuiExport ViewProviderFemPostScalarClip : public ViewProviderFemPostObject {
@@ -76,10 +76,10 @@ class FemGuiExport ViewProviderFemPostScalarClip : public ViewProviderFemPostObj
public:
/// constructor.
ViewProviderFemPostScalarClip();
~ViewProviderFemPostScalarClip();
~ViewProviderFemPostScalarClip() override;
protected:
virtual void setupTaskDialog(TaskDlgPost* dlg);
void setupTaskDialog(TaskDlgPost* dlg) override;
};
class FemGuiExport ViewProviderFemPostWarpVector : public ViewProviderFemPostObject {
@@ -89,10 +89,10 @@ class FemGuiExport ViewProviderFemPostWarpVector : public ViewProviderFemPostObj
public:
/// constructor.
ViewProviderFemPostWarpVector();
~ViewProviderFemPostWarpVector();
~ViewProviderFemPostWarpVector() override;
protected:
virtual void setupTaskDialog(TaskDlgPost* dlg);
void setupTaskDialog(TaskDlgPost* dlg) override;
};
class FemGuiExport ViewProviderFemPostCut : public ViewProviderFemPostObject {
@@ -102,10 +102,10 @@ class FemGuiExport ViewProviderFemPostCut : public ViewProviderFemPostObject {
public:
/// constructor.
ViewProviderFemPostCut();
~ViewProviderFemPostCut();
~ViewProviderFemPostCut() override;
protected:
virtual void setupTaskDialog(TaskDlgPost* dlg);
void setupTaskDialog(TaskDlgPost* dlg) override;
};
} //namespace FemGui

68
src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
View File

@@ -50,7 +50,7 @@ class FemGuiExport FunctionWidget : public QWidget {
Q_OBJECT
public:
FunctionWidget() : m_block(false), m_view(nullptr), m_object(nullptr) {}
virtual ~FunctionWidget() {}
~FunctionWidget() override {}
virtual void applyPythonCode() = 0;
virtual void setViewProvider(ViewProviderFemPostFunction* view);
@@ -78,22 +78,22 @@ class FemGuiExport ViewProviderFemPostFunctionProvider : public Gui::ViewProvide
public:
ViewProviderFemPostFunctionProvider();
virtual ~ViewProviderFemPostFunctionProvider();
~ViewProviderFemPostFunctionProvider() override;
App::PropertyFloat SizeX;
App::PropertyFloat SizeY;
App::PropertyFloat SizeZ;
// handling when object is deleted
virtual bool onDelete(const std::vector<std::string>&);
bool onDelete(const std::vector<std::string>&) override;
/// asks view provider if the given object can be deleted
virtual bool canDelete(App::DocumentObject* obj) const;
bool canDelete(App::DocumentObject* obj) const override;
protected:
virtual std::vector< App::DocumentObject* > claimChildren() const;
virtual std::vector< App::DocumentObject* > claimChildren3D() const;
virtual void onChanged(const App::Property* prop);
virtual void updateData(const App::Property*);
std::vector< App::DocumentObject* > claimChildren() const override;
std::vector< App::DocumentObject* > claimChildren3D() const override;
void onChanged(const App::Property* prop) override;
void updateData(const App::Property*) override;
void updateSize();
};
@@ -105,24 +105,24 @@ class FemGuiExport ViewProviderFemPostFunction : public Gui::ViewProviderDocumen
public:
/// constructor.
ViewProviderFemPostFunction();
~ViewProviderFemPostFunction();
~ViewProviderFemPostFunction() override;
App::PropertyFloat AutoScaleFactorX;
App::PropertyFloat AutoScaleFactorY;
App::PropertyFloat AutoScaleFactorZ;
void attach(App::DocumentObject *pcObject);
bool doubleClicked();
std::vector<std::string> getDisplayModes() const;
void attach(App::DocumentObject *pcObject) override;
bool doubleClicked() override;
std::vector<std::string> getDisplayModes() const override;
//creates the widget used in the task dalogs, either for the function itself or for
//the filter using it
virtual FunctionWidget* createControlWidget() {return nullptr;}
protected:
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
virtual void onChanged(const App::Property* prop);
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
void onChanged(const App::Property* prop) override;
void setAutoScale(bool value) {m_autoscale = value;}
bool autoScale() {return m_autoscale;}
@@ -157,11 +157,11 @@ class FemGuiExport PlaneWidget : public FunctionWidget {
Q_OBJECT
public:
PlaneWidget();
virtual ~PlaneWidget();
~PlaneWidget() override;
virtual void applyPythonCode();
virtual void onChange(const App::Property& p);
virtual void setViewProvider(ViewProviderFemPostFunction* view);
void applyPythonCode() override;
void onChange(const App::Property& p) override;
void setViewProvider(ViewProviderFemPostFunction* view) override;
private Q_SLOTS:
void originChanged(double);
@@ -177,17 +177,17 @@ class FemGuiExport ViewProviderFemPostPlaneFunction : public ViewProviderFemPost
public:
ViewProviderFemPostPlaneFunction();
virtual ~ViewProviderFemPostPlaneFunction();
~ViewProviderFemPostPlaneFunction() override;
App::PropertyFloatConstraint Scale;
virtual SoTransformManip* setupManipulator();
virtual FunctionWidget* createControlWidget();
SoTransformManip* setupManipulator() override;
FunctionWidget* createControlWidget() override;
protected:
virtual void draggerUpdate(SoDragger* mat);
virtual void updateData(const App::Property*);
virtual void onChanged(const App::Property*);
void draggerUpdate(SoDragger* mat) override;
void updateData(const App::Property*) override;
void onChanged(const App::Property*) override;
private:
bool m_detectscale;
@@ -200,11 +200,11 @@ class FemGuiExport SphereWidget : public FunctionWidget {
Q_OBJECT
public:
SphereWidget();
virtual ~SphereWidget();
~SphereWidget() override;
virtual void applyPythonCode();
virtual void onChange(const App::Property& p);
virtual void setViewProvider(ViewProviderFemPostFunction* view);
void applyPythonCode() override;
void onChange(const App::Property& p) override;
void setViewProvider(ViewProviderFemPostFunction* view) override;
private Q_SLOTS:
void centerChanged(double);
@@ -220,14 +220,14 @@ class FemGuiExport ViewProviderFemPostSphereFunction : public ViewProviderFemPos
public:
ViewProviderFemPostSphereFunction();
virtual ~ViewProviderFemPostSphereFunction();
~ViewProviderFemPostSphereFunction() override;
virtual SoTransformManip* setupManipulator();
virtual FunctionWidget* createControlWidget();
SoTransformManip* setupManipulator() override;
FunctionWidget* createControlWidget() override;
protected:
virtual void draggerUpdate(SoDragger* mat);
virtual void updateData(const App::Property*);
void draggerUpdate(SoDragger* mat) override;
void updateData(const App::Property*) override;
};
} //namespace FemGui

Some files were not shown because too many files have changed in this diff Show More