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

4
src/Mod/Mesh/App/AppMeshPy.cpp
View File

@@ -138,10 +138,10 @@ public:
"\n");
}
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/Mesh/App/Core/Algorithm.h
View File

@@ -354,8 +354,8 @@ class MeshExport PointCollector : public MeshCollector
{
public:
PointCollector(std::vector<PointIndex>& ind) : indices(ind){}
virtual ~PointCollector(){}
virtual void Append(const MeshCore::MeshKernel& kernel, FacetIndex index)
~PointCollector() override{}
void Append(const MeshCore::MeshKernel& kernel, FacetIndex index) override
{
PointIndex ulP1, ulP2, ulP3;
kernel.GetFacetPoints(index, ulP1, ulP2, ulP3);
@@ -372,8 +372,8 @@ class MeshExport FacetCollector : public MeshCollector
{
public:
FacetCollector(std::vector<FacetIndex>& ind) : indices(ind){}
virtual ~FacetCollector(){}
void Append(const MeshCore::MeshKernel&, FacetIndex index)
~FacetCollector() override{}
void Append(const MeshCore::MeshKernel&, FacetIndex index) override
{
indices.push_back(index);
}

24
src/Mod/Mesh/App/Core/Approximation.h
View File

@@ -194,7 +194,7 @@ public:
/**
* Destruction
*/
virtual ~PlaneFit();
~PlaneFit() override;
Base::Vector3f GetBase() const;
Base::Vector3f GetDirU() const;
Base::Vector3f GetDirV() const;
@@ -207,7 +207,7 @@ public:
* Fit a plane into the given points. We must have at least three non-collinear points
* to succeed. If the fit fails FLOAT_MAX is returned.
*/
float Fit();
float Fit() override;
/**
* Returns the distance from the point \a rcPoint to the fitted plane. If Fit() has not been
* called FLOAT_MAX is returned.
@@ -274,7 +274,7 @@ public:
/**
* Destruction
*/
virtual ~QuadraticFit(){}
~QuadraticFit() override{}
/**
* Get the quadric coefficients
* @param ulIndex Number of coefficient (0..9)
@@ -291,7 +291,7 @@ public:
* Invocation of fitting algorithm
* @return float Quality of fit.
*/
float Fit();
float Fit() override;
void CalcZValues(double x, double y, double &dZ1, double &dZ2) const;
/**
@@ -349,12 +349,12 @@ public:
/**
* Destruction
*/
virtual ~SurfaceFit(){}
~SurfaceFit() override{}
bool GetCurvatureInfo(double x, double y, double z, double &rfCurv0, double &rfCurv1,
Base::Vector3f &rkDir0, Base::Vector3f &rkDir1, double &dDistance);
bool GetCurvatureInfo(double x, double y, double z, double &rfCurv0, double &rfcurv1);
float Fit();
float Fit() override;
double Value(double x, double y) const;
void GetCoefficients(double& a,double& b,double& c,double& d,double& e,double& f) const;
/**
@@ -393,7 +393,7 @@ public:
/**
* Destruction
*/
virtual ~CylinderFit();
~CylinderFit() override;
float GetRadius() const;
Base::Vector3f GetBase() const;
void SetInitialValues(const Base::Vector3f&, const Base::Vector3f&);
@@ -409,7 +409,7 @@ public:
/**
* Fit a cylinder into the given points. If the fit fails FLOAT_MAX is returned.
*/
float Fit();
float Fit() override;
/**
* Returns the distance from the point \a rcPoint to the fitted cylinder. If Fit() has not been
* called FLOAT_MAX is returned.
@@ -452,13 +452,13 @@ public:
/**
* Destruction
*/
virtual ~SphereFit();
~SphereFit() override;
float GetRadius() const;
Base::Vector3f GetCenter() const;
/**
* Fit a sphere into the given points. If the fit fails FLOAT_MAX is returned.
*/
float Fit();
float Fit() override;
/**
* Returns the distance from the point \a rcPoint to the fitted sphere. If Fit() has not been
* called FLOAT_MAX is returned.
@@ -662,8 +662,8 @@ public:
/**
* Destruction
*/
virtual ~PolynomialFit();
float Fit();
~PolynomialFit() override;
float Fit() override;
float Value(float x, float y) const;
protected:

2
src/Mod/Mesh/App/Core/Curvature.cpp
View File

@@ -344,7 +344,7 @@ class FitPointCollector : public MeshCollector
{
public:
FitPointCollector(std::set<PointIndex>& ind) : indices(ind){}
virtual void Append(const MeshCore::MeshKernel& kernel, FacetIndex index)
void Append(const MeshCore::MeshKernel& kernel, FacetIndex index) override
{
PointIndex ulP1, ulP2, ulP3;
kernel.GetFacetPoints(index, ulP1, ulP2, ulP3);

4
src/Mod/Mesh/App/Core/CylinderFit.h
View File

@@ -52,7 +52,7 @@ public:
/**
* Destruction
*/
virtual ~CylinderFit();
~CylinderFit() override;
/**
* Set approximations before calling Fit()
@@ -87,7 +87,7 @@ public:
/**
* Fit a cylinder into the given points. If the fit fails FLOAT_MAX is returned.
*/
float Fit();
float Fit() override;
/**
* Returns the distance from the point \a rcPoint to the fitted cylinder. If Fit() has not been
* called FLOAT_MAX is returned.

124
src/Mod/Mesh/App/Core/Degeneration.h
View File

@@ -54,11 +54,11 @@ public:
/**
* Destruction.
*/
~MeshEvalInvalids () { }
~MeshEvalInvalids () override { }
/**
* Searches for as 'Invalid' marked points or facets.
*/
bool Evaluate ();
bool Evaluate () override;
/**
* Returns the indices of all invalid facets or facets whose points are invalid.
*/
@@ -80,11 +80,11 @@ public:
/**
* Destruction.
*/
~MeshFixInvalids () { }
~MeshFixInvalids () override { }
/**
* Remove invalid elements.
*/
bool Fixup ();
bool Fixup () override;
};
/**
@@ -105,11 +105,11 @@ public:
/**
* Destruction.
*/
~MeshEvalDuplicatePoints () { }
~MeshEvalDuplicatePoints () override { }
/**
* Merges points to one if the distance between them is less than the global \a MeshDefinitions::_fMinPointDistanceD1.
*/
bool Evaluate ();
bool Evaluate () override;
/**
* Returns the indices of all duplicated points.
*/
@@ -131,11 +131,11 @@ public:
/**
* Destruction.
*/
~MeshFixDuplicatePoints () { }
~MeshFixDuplicatePoints () override { }
/**
* Merges duplicated points.
*/
bool Fixup ();
bool Fixup () override;
};
/**
@@ -153,11 +153,11 @@ public:
/**
* Destruction.
*/
~MeshEvalNaNPoints () { }
~MeshEvalNaNPoints () override { }
/**
* Returns false if a point with NaN coordinate is found.
*/
bool Evaluate ();
bool Evaluate () override;
/**
* Returns the indices of all NaN points.
*/
@@ -179,11 +179,11 @@ public:
/**
* Destruction.
*/
~MeshFixNaNPoints () { }
~MeshFixNaNPoints () override { }
/**
* Merges duplicated points.
*/
bool Fixup ();
bool Fixup () override;
};
/**
@@ -203,11 +203,11 @@ public:
/**
* Destruction.
*/
~MeshEvalDuplicateFacets () { }
~MeshEvalDuplicateFacets () override { }
/**
* Searches for duplicated facets.
*/
bool Evaluate ();
bool Evaluate () override;
/**
* Returns the indices of all duplicated facets.
*/
@@ -229,11 +229,11 @@ public:
/**
* Destruction.
*/
~MeshFixDuplicateFacets () { }
~MeshFixDuplicateFacets () override { }
/**
* Removes duplicated facets.
*/
bool Fixup ();
bool Fixup () override;
};
/**
@@ -250,11 +250,11 @@ public:
/**
* Destruction.
*/
~MeshEvalInternalFacets () { }
~MeshEvalInternalFacets () override { }
/**
* Identify internal facets.
*/
bool Evaluate ();
bool Evaluate () override;
/**
* Return the indices.
*/
@@ -285,11 +285,11 @@ public:
/**
* Destruction.
*/
~MeshEvalDegeneratedFacets () { }
~MeshEvalDegeneratedFacets () override { }
/**
* Searches degenerated facets.
*/
bool Evaluate ();
bool Evaluate () override;
/**
* Returns the number of facets with an edge smaller than \a fMinEdgeLength.
*/
@@ -319,11 +319,11 @@ public:
/**
* Destruction.
*/
~MeshFixDegeneratedFacets () { }
~MeshFixDegeneratedFacets () override { }
/**
* Removes degenerated facets.
*/
bool Fixup ();
bool Fixup () override;
private:
float fEpsilon;
@@ -350,12 +350,12 @@ public:
/**
* Destruction.
*/
~MeshRemoveNeedles () { }
~MeshRemoveNeedles () override { }
/**
* Removes all facets with an edge smaller than \a fMinEdgeLength without leaving holes or gaps
* in the mesh.
*/
bool Fixup ();
bool Fixup () override;
private:
float fMinEdgeLength;
@@ -382,10 +382,10 @@ public:
/**
* Destruction.
*/
~MeshFixCaps () { }
~MeshFixCaps () override { }
/**
*/
bool Fixup ();
bool Fixup () override;
private:
float fMaxAngle;
@@ -409,11 +409,11 @@ public:
/**
* Destruction.
*/
~MeshEvalDeformedFacets () { }
~MeshEvalDeformedFacets () override { }
/**
* Searches deformed facets.
*/
bool Evaluate ();
bool Evaluate () override;
/**
* Returns the indices of deformed facets.
*/
@@ -443,11 +443,11 @@ public:
/**
* Destruction.
*/
~MeshFixDeformedFacets () { }
~MeshFixDeformedFacets () override { }
/**
* Removes deformed facets.
*/
bool Fixup ();
bool Fixup () override;
private:
float fMinAngle; /**< If an angle of a facet is lower than fMinAngle it's considered as deformed. */
@@ -475,11 +475,11 @@ public:
/**
* Destruction.
*/
~MeshFixMergeFacets () { }
~MeshFixMergeFacets () override { }
/**
* Removes deformed facets.
*/
bool Fixup ();
bool Fixup () override;
};
/**
@@ -490,9 +490,9 @@ class MeshExport MeshEvalDentsOnSurface : public MeshEvaluation
{
public:
MeshEvalDentsOnSurface (const MeshKernel &rclM) : MeshEvaluation( rclM ) { }
~MeshEvalDentsOnSurface() {}
~MeshEvalDentsOnSurface() override {}
bool Evaluate();
bool Evaluate() override;
std::vector<FacetIndex> GetIndices() const;
private:
@@ -503,9 +503,9 @@ class MeshExport MeshFixDentsOnSurface : public MeshValidation
{
public:
MeshFixDentsOnSurface (MeshKernel &rclM) : MeshValidation( rclM ) { }
~MeshFixDentsOnSurface() {}
~MeshFixDentsOnSurface() override {}
bool Fixup();
bool Fixup() override;
};
/**
@@ -517,9 +517,9 @@ class MeshExport MeshEvalFoldsOnSurface : public MeshEvaluation
{
public:
MeshEvalFoldsOnSurface (const MeshKernel &rclM) : MeshEvaluation( rclM ) { }
~MeshEvalFoldsOnSurface() {}
~MeshEvalFoldsOnSurface() override {}
bool Evaluate();
bool Evaluate() override;
std::vector<FacetIndex> GetIndices() const;
private:
@@ -536,9 +536,9 @@ class MeshExport MeshEvalFoldsOnBoundary : public MeshEvaluation
{
public:
MeshEvalFoldsOnBoundary (const MeshKernel &rclM) : MeshEvaluation( rclM ) { }
~MeshEvalFoldsOnBoundary() {}
~MeshEvalFoldsOnBoundary() override {}
bool Evaluate();
bool Evaluate() override;
std::vector<FacetIndex> GetIndices() const;
private:
@@ -549,9 +549,9 @@ class MeshExport MeshFixFoldsOnBoundary : public MeshValidation
{
public:
MeshFixFoldsOnBoundary (MeshKernel &rclM) : MeshValidation( rclM ) { }
~MeshFixFoldsOnBoundary() {}
~MeshFixFoldsOnBoundary() override {}
bool Fixup();
bool Fixup() override;
};
/**
@@ -562,9 +562,9 @@ class MeshExport MeshEvalFoldOversOnSurface : public MeshEvaluation
{
public:
MeshEvalFoldOversOnSurface (const MeshKernel &rclM) : MeshEvaluation( rclM ) { }
~MeshEvalFoldOversOnSurface() {}
~MeshEvalFoldOversOnSurface() override {}
bool Evaluate();
bool Evaluate() override;
std::vector<FacetIndex> GetIndices() const
{ return this->indices; }
@@ -582,8 +582,8 @@ class MeshExport MeshEvalBorderFacet : public MeshEvaluation
public:
MeshEvalBorderFacet (const MeshKernel &rclB, std::vector<FacetIndex>& f)
: MeshEvaluation(rclB), _facets(f) {}
virtual ~MeshEvalBorderFacet () {}
bool Evaluate();
~MeshEvalBorderFacet () override {}
bool Evaluate() override;
protected:
std::vector<FacetIndex>& _facets;
@@ -610,11 +610,11 @@ public:
/**
* Destruction.
*/
~MeshEvalRangeFacet () { }
~MeshEvalRangeFacet () override { }
/**
* Searches for facets that has neighbour facet indices out of range.
*/
bool Evaluate ();
bool Evaluate () override;
/**
* Returns the indices of all facets with invalid neighbour indices.
*/
@@ -636,11 +636,11 @@ public:
/**
* Destruction.
*/
~MeshFixRangeFacet () { }
~MeshFixRangeFacet () override { }
/**
* Fixes facets with neighbour indices out of range.
*/
bool Fixup ();
bool Fixup () override;
};
/**
@@ -658,11 +658,11 @@ public:
/**
* Destruction.
*/
~MeshEvalRangePoint () { }
~MeshEvalRangePoint () override { }
/**
* Searches for facets that has point indices out of range.
*/
bool Evaluate ();
bool Evaluate () override;
/**
* Returns the indices of all facets with invalid point indices.
*/
@@ -684,11 +684,11 @@ public:
/**
* Destruction.
*/
~MeshFixRangePoint () { }
~MeshFixRangePoint () override { }
/**
* Fixes facets with point indices out of range.
*/
bool Fixup ();
bool Fixup () override;
};
/**
@@ -707,11 +707,11 @@ public:
/**
* Destruction.
*/
~MeshEvalCorruptedFacets () { }
~MeshEvalCorruptedFacets () override { }
/**
* Searches for corrupted facets.
*/
bool Evaluate ();
bool Evaluate () override;
/**
* Returns the indices of all corrupt facets.
*/
@@ -734,11 +734,11 @@ public:
/**
* Destruction.
*/
~MeshFixCorruptedFacets () { }
~MeshFixCorruptedFacets () override { }
/**
* Removes corrupted facets.
*/
bool Fixup ();
bool Fixup () override;
};
/**
@@ -756,11 +756,11 @@ public:
/**
* Destruction.
*/
~MeshEvalPointOnEdge () { }
~MeshEvalPointOnEdge () override { }
/**
* Searches for points that lie on edge of triangle.
*/
bool Evaluate ();
bool Evaluate () override;
/**
* Returns the indices of all points on edge.
*/
@@ -790,11 +790,11 @@ public:
/**
* Destruction.
*/
~MeshFixPointOnEdge () { }
~MeshFixPointOnEdge () override { }
/**
* Removes points that lie on edges of triangles.
*/
bool Fixup ();
bool Fixup () override;
private:
void MarkBoundaries(const std::vector<FacetIndex>& facetsIndices);

58
src/Mod/Mesh/App/Core/Evaluation.h
View File

@@ -95,7 +95,7 @@ public:
MeshOrientationVisitor();
/** Returns false after the first inconsistence is found, true otherwise. */
bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long );
bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long ) override;
bool HasNonUnifomOrientedFacets() const;
private:
@@ -114,7 +114,7 @@ public:
std::vector<FacetIndex>& aulComplement);
/** Returns always true and collects the indices with wrong orientation. */
bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long);
bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long) override;
private:
std::vector<FacetIndex>& _aulIndices;
@@ -129,7 +129,7 @@ class MeshExport MeshSameOrientationCollector : public MeshOrientationVisitor
public:
MeshSameOrientationCollector(std::vector<FacetIndex>& aulIndices);
/** Returns always true and collects the indices with wrong orientation. */
bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long);
bool Visit (const MeshFacet &, const MeshFacet &, FacetIndex , unsigned long) override;
private:
std::vector<FacetIndex>& _aulIndices;
@@ -143,8 +143,8 @@ class MeshExport MeshEvalOrientation : public MeshEvaluation
{
public:
MeshEvalOrientation (const MeshKernel& rclM);
~MeshEvalOrientation();
bool Evaluate ();
~MeshEvalOrientation() override;
bool Evaluate () override;
std::vector<FacetIndex> GetIndices() const;
private:
@@ -159,8 +159,8 @@ class MeshExport MeshFixOrientation : public MeshValidation
{
public:
MeshFixOrientation (MeshKernel& rclM);
~MeshFixOrientation();
bool Fixup();
~MeshFixOrientation() override;
bool Fixup() override;
};
// ----------------------------------------------------
@@ -173,8 +173,8 @@ class MeshExport MeshEvalSolid : public MeshEvaluation
{
public:
MeshEvalSolid (const MeshKernel& rclM);
~MeshEvalSolid();
bool Evaluate ();
~MeshEvalSolid() override;
bool Evaluate () override;
};
// ----------------------------------------------------
@@ -189,8 +189,8 @@ class MeshExport MeshEvalTopology : public MeshEvaluation
{
public:
MeshEvalTopology (const MeshKernel &rclB) : MeshEvaluation(rclB) {}
virtual ~MeshEvalTopology () {}
virtual bool Evaluate ();
~MeshEvalTopology () override {}
bool Evaluate () override;
void GetFacetManifolds (std::vector<FacetIndex> &raclFacetIndList) const;
unsigned long CountManifolds() const;
@@ -211,8 +211,8 @@ class MeshExport MeshFixTopology : public MeshValidation
public:
MeshFixTopology (MeshKernel &rclB, const std::list<std::vector<FacetIndex> >& mf)
: MeshValidation(rclB), nonManifoldList(mf) {}
virtual ~MeshFixTopology () {}
bool Fixup();
~MeshFixTopology () override {}
bool Fixup() override;
const std::vector<FacetIndex>& GetDeletedFaces() const { return deletedFaces; }
@@ -233,8 +233,8 @@ class MeshExport MeshEvalPointManifolds : public MeshEvaluation
{
public:
MeshEvalPointManifolds (const MeshKernel &rclB) : MeshEvaluation(rclB) {}
virtual ~MeshEvalPointManifolds () {}
virtual bool Evaluate ();
~MeshEvalPointManifolds () override {}
bool Evaluate () override;
void GetFacetIndices (std::vector<FacetIndex> &facets) const;
const std::list<std::vector<FacetIndex> >& GetFacetIndices () const { return facetsOfNonManifoldPoints; }
@@ -259,8 +259,8 @@ class MeshExport MeshEvalSingleFacet : public MeshEvalTopology
{
public:
MeshEvalSingleFacet (const MeshKernel &rclB) : MeshEvalTopology(rclB) {}
virtual ~MeshEvalSingleFacet () {}
bool Evaluate ();
~MeshEvalSingleFacet () override {}
bool Evaluate () override;
};
/**
@@ -272,8 +272,8 @@ class MeshExport MeshFixSingleFacet : public MeshValidation
public:
MeshFixSingleFacet (MeshKernel &rclB, const std::vector<std::list<FacetIndex> >& mf)
: MeshValidation(rclB), _raclManifoldList(mf) {}
virtual ~MeshFixSingleFacet () {}
bool Fixup();
~MeshFixSingleFacet () override {}
bool Fixup() override;
protected:
const std::vector<std::list<FacetIndex> >& _raclManifoldList;
@@ -289,9 +289,9 @@ class MeshExport MeshEvalSelfIntersection : public MeshEvaluation
{
public:
MeshEvalSelfIntersection (const MeshKernel &rclB) : MeshEvaluation(rclB) {}
virtual ~MeshEvalSelfIntersection () {}
~MeshEvalSelfIntersection () override {}
/// Evaluate the mesh and return if true if there are self intersections
bool Evaluate ();
bool Evaluate () override;
/// collect all intersection lines
void GetIntersections(const std::vector<std::pair<FacetIndex, FacetIndex> >&,
std::vector<std::pair<Base::Vector3f, Base::Vector3f> >&) const;
@@ -308,9 +308,9 @@ class MeshExport MeshFixSelfIntersection : public MeshValidation
public:
MeshFixSelfIntersection (MeshKernel &rclB, const std::vector<std::pair<FacetIndex, FacetIndex> >& si)
: MeshValidation(rclB), selfIntersectons(si) {}
virtual ~MeshFixSelfIntersection () {}
~MeshFixSelfIntersection () override {}
std::vector<FacetIndex> GetFacets() const;
bool Fixup();
bool Fixup() override;
private:
const std::vector<std::pair<FacetIndex, FacetIndex> >& selfIntersectons;
@@ -327,8 +327,8 @@ class MeshExport MeshEvalNeighbourhood : public MeshEvaluation
{
public:
MeshEvalNeighbourhood (const MeshKernel &rclB) : MeshEvaluation(rclB) {}
~MeshEvalNeighbourhood () {}
bool Evaluate ();
~MeshEvalNeighbourhood () override {}
bool Evaluate () override;
std::vector<FacetIndex> GetIndices() const;
};
@@ -340,8 +340,8 @@ class MeshExport MeshFixNeighbourhood : public MeshValidation
{
public:
MeshFixNeighbourhood (MeshKernel &rclB) : MeshValidation(rclB) {}
~MeshFixNeighbourhood () {}
bool Fixup();
~MeshFixNeighbourhood () override {}
bool Fixup() override;
};
// ----------------------------------------------------
@@ -358,7 +358,7 @@ class MeshExport MeshEigensystem : public MeshEvaluation
{
public:
MeshEigensystem (const MeshKernel &rclB);
virtual ~MeshEigensystem () {}
~MeshEigensystem () override {}
/** Returns the transformation matrix. */
Base::Matrix4D Transform() const;
@@ -367,7 +367,7 @@ public:
*/
Base::Vector3f GetBoundings() const;
bool Evaluate();
bool Evaluate() override;
/**
* Calculates the local coordinate system defined by \a u, \a v, \a w
* and \a c.

20
src/Mod/Mesh/App/Core/Grid.h
View File

@@ -194,7 +194,7 @@ public:
/// Construction
MeshFacetGrid (const MeshKernel &rclM, float fGridLen);
/// Destruction
virtual ~MeshFacetGrid () { }
~MeshFacetGrid () override { }
//@}
/** @name Search */
@@ -213,11 +213,11 @@ public:
//@}
/** Validates the grid structure and rebuilds it if needed. */
virtual void Validate (const MeshKernel &rclM);
void Validate (const MeshKernel &rclM) override;
/** Validates the grid structure and rebuilds it if needed. */
virtual void Validate ();
/** Verifies the grid structure and returns false if inconsistencies are found. */
virtual bool Verify() const;
bool Verify() const override;
protected:
/** Returns the grid numbers to the given point \a rclPoint. */
@@ -229,10 +229,10 @@ protected:
* the facet. */
inline void AddFacet (const MeshGeomFacet &rclFacet, ElementIndex ulFacetIndex, float fEpsilon = 0.0f);
/** Returns the number of stored elements. */
unsigned long HasElements () const
unsigned long HasElements () const override
{ return _pclMesh->CountFacets(); }
/** Rebuilds the grid structure. */
virtual void RebuildGrid ();
void RebuildGrid () override;
};
/**
@@ -255,17 +255,17 @@ public:
/// Construction
MeshPointGrid (const MeshKernel &rclM, unsigned long ulX, unsigned long ulY, unsigned long ulZ);
/// Destruction
virtual ~MeshPointGrid () {}
~MeshPointGrid () override {}
//@}
/** Finds all points that lie in the same grid as the point \a rclPoint. */
unsigned long FindElements(const Base::Vector3f &rclPoint, std::set<ElementIndex>& aulElements) const;
/** Validates the grid structure and rebuilds it if needed. */
virtual void Validate (const MeshKernel &rclM);
void Validate (const MeshKernel &rclM) override;
/** Validates the grid structure and rebuilds it if needed. */
virtual void Validate ();
/** Verifies the grid structure and returns false if inconsistencies are found. */
virtual bool Verify() const;
bool Verify() const override;
protected:
/** Adds a new point element to the grid structure. \a rclPt is the geometric point and \a ulPtIndex
@@ -274,10 +274,10 @@ protected:
/** Returns the grid numbers to the given point \a rclPoint. */
void Pos(const Base::Vector3f &rclPoint, unsigned long &rulX, unsigned long &rulY, unsigned long &rulZ) const;
/** Returns the number of stored elements. */
unsigned long HasElements () const
unsigned long HasElements () const override
{ return _pclMesh->CountPoints(); }
/** Rebuilds the grid structure. */
virtual void RebuildGrid ();
void RebuildGrid () override;
};
/**

98
src/Mod/Mesh/App/Core/Segmentation.h
View File

@@ -75,11 +75,11 @@ class MeshExport MeshDistancePlanarSegment : public MeshDistanceSurfaceSegment
{
public:
MeshDistancePlanarSegment(const MeshKernel& mesh, unsigned long minFacets, float tol);
virtual ~MeshDistancePlanarSegment();
bool TestFacet (const MeshFacet& rclFacet) const;
const char* GetType() const { return "Plane"; }
void Initialize(FacetIndex);
void AddFacet(const MeshFacet& rclFacet);
~MeshDistancePlanarSegment() override;
bool TestFacet (const MeshFacet& rclFacet) const override;
const char* GetType() const override { return "Plane"; }
void Initialize(FacetIndex) override;
void AddFacet(const MeshFacet& rclFacet) override;
protected:
Base::Vector3f basepoint;
@@ -107,15 +107,15 @@ class MeshExport PlaneSurfaceFit : public AbstractSurfaceFit
public:
PlaneSurfaceFit();
PlaneSurfaceFit(const Base::Vector3f& b, const Base::Vector3f& n);
~PlaneSurfaceFit();
const char* GetType() const { return "Plane"; }
void Initialize(const MeshGeomFacet&);
bool TestTriangle(const MeshGeomFacet&) const;
void AddTriangle(const MeshGeomFacet&);
bool Done() const;
float Fit();
float GetDistanceToSurface(const Base::Vector3f&) const;
std::vector<float> Parameters() const;
~PlaneSurfaceFit() override;
const char* GetType() const override { return "Plane"; }
void Initialize(const MeshGeomFacet&) override;
bool TestTriangle(const MeshGeomFacet&) const override;
void AddTriangle(const MeshGeomFacet&) override;
bool Done() const override;
float Fit() override;
float GetDistanceToSurface(const Base::Vector3f&) const override;
std::vector<float> Parameters() const override;
private:
Base::Vector3f basepoint;
@@ -128,15 +128,15 @@ class MeshExport CylinderSurfaceFit : public AbstractSurfaceFit
public:
CylinderSurfaceFit();
CylinderSurfaceFit(const Base::Vector3f& b, const Base::Vector3f& a, float r);
~CylinderSurfaceFit();
const char* GetType() const { return "Cylinder"; }
void Initialize(const MeshGeomFacet&);
bool TestTriangle(const MeshGeomFacet&) const;
void AddTriangle(const MeshGeomFacet&);
bool Done() const;
float Fit();
float GetDistanceToSurface(const Base::Vector3f&) const;
std::vector<float> Parameters() const;
~CylinderSurfaceFit() override;
const char* GetType() const override { return "Cylinder"; }
void Initialize(const MeshGeomFacet&) override;
bool TestTriangle(const MeshGeomFacet&) const override;
void AddTriangle(const MeshGeomFacet&) override;
bool Done() const override;
float Fit() override;
float GetDistanceToSurface(const Base::Vector3f&) const override;
std::vector<float> Parameters() const override;
private:
Base::Vector3f basepoint;
@@ -150,15 +150,15 @@ class MeshExport SphereSurfaceFit : public AbstractSurfaceFit
public:
SphereSurfaceFit();
SphereSurfaceFit(const Base::Vector3f& c, float r);
~SphereSurfaceFit();
const char* GetType() const { return "Sphere"; }
void Initialize(const MeshGeomFacet&);
bool TestTriangle(const MeshGeomFacet&) const;
void AddTriangle(const MeshGeomFacet&);
bool Done() const;
float Fit();
float GetDistanceToSurface(const Base::Vector3f&) const;
std::vector<float> Parameters() const;
~SphereSurfaceFit() override;
const char* GetType() const override { return "Sphere"; }
void Initialize(const MeshGeomFacet&) override;
bool TestTriangle(const MeshGeomFacet&) const override;
void AddTriangle(const MeshGeomFacet&) override;
bool Done() const override;
float Fit() override;
float GetDistanceToSurface(const Base::Vector3f&) const override;
std::vector<float> Parameters() const override;
private:
Base::Vector3f center;
@@ -171,12 +171,12 @@ class MeshExport MeshDistanceGenericSurfaceFitSegment : public MeshDistanceSurfa
public:
MeshDistanceGenericSurfaceFitSegment(AbstractSurfaceFit*, const MeshKernel& mesh,
unsigned long minFacets, float tol);
virtual ~MeshDistanceGenericSurfaceFitSegment();
bool TestFacet (const MeshFacet& rclFacet) const;
const char* GetType() const { return fitter->GetType(); }
void Initialize(FacetIndex);
bool TestInitialFacet(FacetIndex) const;
void AddFacet(const MeshFacet& rclFacet);
~MeshDistanceGenericSurfaceFitSegment() override;
bool TestFacet (const MeshFacet& rclFacet) const override;
const char* GetType() const override { return fitter->GetType(); }
void Initialize(FacetIndex) override;
bool TestInitialFacet(FacetIndex) const override;
void AddFacet(const MeshFacet& rclFacet) override;
std::vector<float> Parameters() const;
protected:
@@ -200,8 +200,8 @@ class MeshExport MeshCurvaturePlanarSegment : public MeshCurvatureSurfaceSegment
public:
MeshCurvaturePlanarSegment(const std::vector<CurvatureInfo>& ci, unsigned long minFacets, float tol)
: MeshCurvatureSurfaceSegment(ci, minFacets), tolerance(tol) {}
virtual bool TestFacet (const MeshFacet &rclFacet) const;
virtual const char* GetType() const { return "Plane"; }
bool TestFacet (const MeshFacet &rclFacet) const override;
const char* GetType() const override { return "Plane"; }
private:
float tolerance;
@@ -213,8 +213,8 @@ public:
MeshCurvatureCylindricalSegment(const std::vector<CurvatureInfo>& ci, unsigned long minFacets,
float tolMin, float tolMax, float curv)
: MeshCurvatureSurfaceSegment(ci, minFacets), toleranceMin(tolMin), toleranceMax(tolMax) { curvature = curv;}
virtual bool TestFacet (const MeshFacet &rclFacet) const;
virtual const char* GetType() const { return "Cylinder"; }
bool TestFacet (const MeshFacet &rclFacet) const override;
const char* GetType() const override { return "Cylinder"; }
private:
float curvature;
@@ -227,8 +227,8 @@ class MeshExport MeshCurvatureSphericalSegment : public MeshCurvatureSurfaceSegm
public:
MeshCurvatureSphericalSegment(const std::vector<CurvatureInfo>& ci, unsigned long minFacets, float tol, float curv)
: MeshCurvatureSurfaceSegment(ci, minFacets), tolerance(tol) { curvature = curv;}
virtual bool TestFacet (const MeshFacet &rclFacet) const;
virtual const char* GetType() const { return "Sphere"; }
bool TestFacet (const MeshFacet &rclFacet) const override;
const char* GetType() const override { return "Sphere"; }
private:
float curvature;
@@ -242,8 +242,8 @@ public:
float tolMin, float tolMax, float c1, float c2)
: MeshCurvatureSurfaceSegment(ci, minFacets), c1(c1), c2(c2),
toleranceMin(tolMin), toleranceMax(tolMax) {}
virtual bool TestFacet (const MeshFacet &rclFacet) const;
virtual const char* GetType() const { return "Freeform"; }
bool TestFacet (const MeshFacet &rclFacet) const override;
const char* GetType() const override { return "Freeform"; }
private:
float c1, c2;
@@ -255,11 +255,11 @@ class MeshExport MeshSurfaceVisitor : public MeshFacetVisitor
{
public:
MeshSurfaceVisitor (MeshSurfaceSegment& segm, std::vector<FacetIndex> &indices);
virtual ~MeshSurfaceVisitor ();
~MeshSurfaceVisitor () override;
bool AllowVisit (const MeshFacet& face, const MeshFacet&,
FacetIndex, unsigned long, unsigned short neighbourIndex);
FacetIndex, unsigned long, unsigned short neighbourIndex) override;
bool Visit (const MeshFacet & face, const MeshFacet &,
FacetIndex ulFInd, unsigned long);
FacetIndex ulFInd, unsigned long) override;
protected:
std::vector<FacetIndex> &indices;

4
src/Mod/Mesh/App/Core/SetOperations.h
View File

@@ -155,8 +155,8 @@ private:
Base::Builder3D& _builder;
CollectFacetVisitor (const MeshKernel& mesh, std::vector<FacetIndex>& facets, std::map<Edge, EdgeInfo>& edges, int side, float mult, Base::Builder3D& builder);
bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom, FacetIndex ulFInd, unsigned long ulLevel);
bool AllowVisit (const MeshFacet& rclFacet, const MeshFacet& rclFrom, FacetIndex ulFInd, unsigned long ulLevel, unsigned short neighbourIndex);
bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom, FacetIndex ulFInd, unsigned long ulLevel) override;
bool AllowVisit (const MeshFacet& rclFacet, const MeshFacet& rclFrom, FacetIndex ulFInd, unsigned long ulLevel, unsigned short neighbourIndex) override;
};
/** all points from cut */

18
src/Mod/Mesh/App/Core/Smoothing.h
View File

@@ -69,12 +69,12 @@ class MeshExport PlaneFitSmoothing : public AbstractSmoothing
{
public:
PlaneFitSmoothing(MeshKernel&);
virtual ~PlaneFitSmoothing();
~PlaneFitSmoothing() override;
void SetMaximum(float max) {
maximum = max;
}
void Smooth(unsigned int);
void SmoothPoints(unsigned int, const std::vector<PointIndex>&);
void Smooth(unsigned int) override;
void SmoothPoints(unsigned int, const std::vector<PointIndex>&) override;
private:
float maximum;
@@ -84,9 +84,9 @@ class MeshExport LaplaceSmoothing : public AbstractSmoothing
{
public:
LaplaceSmoothing(MeshKernel&);
virtual ~LaplaceSmoothing();
void Smooth(unsigned int);
void SmoothPoints(unsigned int, const std::vector<PointIndex>&);
~LaplaceSmoothing() override;
void Smooth(unsigned int) override;
void SmoothPoints(unsigned int, const std::vector<PointIndex>&) override;
void SetLambda(double l) { lambda = l;}
protected:
@@ -104,9 +104,9 @@ class MeshExport TaubinSmoothing : public LaplaceSmoothing
{
public:
TaubinSmoothing(MeshKernel&);
virtual ~TaubinSmoothing();
void Smooth(unsigned int);
void SmoothPoints(unsigned int, const std::vector<PointIndex>&);
~TaubinSmoothing() override;
void Smooth(unsigned int) override;
void SmoothPoints(unsigned int, const std::vector<PointIndex>&) override;
void SetMicro(double m) { micro = m;}
protected:

4
src/Mod/Mesh/App/Core/SphereFit.h
View File

@@ -45,7 +45,7 @@ public:
/**
* Destruction
*/
virtual ~SphereFit();
~SphereFit() override;
/**
* Set approximations before calling Fit()
@@ -75,7 +75,7 @@ public:
/**
* Fit a sphere onto the given points. If the fit fails FLOAT_MAX is returned.
*/
float Fit();
float Fit() override;
/**
* Returns the distance from the point \a rcPoint to the fitted sphere. If Fit() has not been
* called FLOAT_MAX is returned.

30
src/Mod/Mesh/App/Core/Triangulation.h
View File

@@ -47,12 +47,12 @@ public:
class MeshExport TriangulationVerifierV2 : public TriangulationVerifier
{
public:
virtual bool Accept(const Base::Vector3f& n,
bool Accept(const Base::Vector3f& n,
const Base::Vector3f& p1,
const Base::Vector3f& p2,
const Base::Vector3f& p3) const;
virtual bool MustFlip(const Base::Vector3f& n1,
const Base::Vector3f& n2) const;
const Base::Vector3f& p3) const override;
bool MustFlip(const Base::Vector3f& n1,
const Base::Vector3f& n2) const override;
};
class MeshExport AbstractPolygonTriangulator
@@ -149,10 +149,10 @@ class MeshExport EarClippingTriangulator : public AbstractPolygonTriangulator
{
public:
EarClippingTriangulator();
~EarClippingTriangulator();
~EarClippingTriangulator() override;
protected:
bool Triangulate();
bool Triangulate() override;
private:
/**
@@ -191,42 +191,42 @@ class MeshExport QuasiDelaunayTriangulator : public EarClippingTriangulator
{
public:
QuasiDelaunayTriangulator();
~QuasiDelaunayTriangulator();
~QuasiDelaunayTriangulator() override;
protected:
bool Triangulate();
bool Triangulate() override;
};
class MeshExport DelaunayTriangulator : public AbstractPolygonTriangulator
{
public:
DelaunayTriangulator();
~DelaunayTriangulator();
~DelaunayTriangulator() override;
protected:
bool Triangulate();
bool Triangulate() override;
};
class MeshExport FlatTriangulator : public AbstractPolygonTriangulator
{
public:
FlatTriangulator();
~FlatTriangulator();
~FlatTriangulator() override;
void PostProcessing(const std::vector<Base::Vector3f>&);
void PostProcessing(const std::vector<Base::Vector3f>&) override;
protected:
bool Triangulate();
bool Triangulate() override;
};
class MeshExport ConstraintDelaunayTriangulator : public AbstractPolygonTriangulator
{
public:
ConstraintDelaunayTriangulator(float area);
~ConstraintDelaunayTriangulator();
~ConstraintDelaunayTriangulator() override;
protected:
bool Triangulate();
bool Triangulate() override;
private:
float fMaxArea;

6
src/Mod/Mesh/App/Core/Visitor.h
View File

@@ -80,7 +80,7 @@ class MeshExport MeshSearchNeighbourFacetsVisitor : public MeshFacetVisitor
{
public:
MeshSearchNeighbourFacetsVisitor (const MeshKernel &rclMesh, float fRadius, FacetIndex ulStartFacetIdx);
virtual ~MeshSearchNeighbourFacetsVisitor () {}
~MeshSearchNeighbourFacetsVisitor () override {}
/** Checks the facet if it lies inside the search radius. */
inline bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom, FacetIndex ulFInd, unsigned long ulLevel);
/** Resets the VISIT flag of already visited facets. */
@@ -124,7 +124,7 @@ class MeshExport MeshTopFacetVisitor : public MeshFacetVisitor
{
public:
MeshTopFacetVisitor (std::vector<FacetIndex> &raulNB) : _raulNeighbours(raulNB) {}
virtual ~MeshTopFacetVisitor () {}
~MeshTopFacetVisitor () override {}
/** Collects the facet indices. */
virtual bool Visit (const MeshFacet &rclFacet, const MeshFacet &rclFrom,
FacetIndex ulFInd, unsigned long)
@@ -152,7 +152,7 @@ public:
FacetIndex index,
float deviation,
std::vector<FacetIndex> &indices);
virtual ~MeshPlaneVisitor ();
~MeshPlaneVisitor () override;
bool AllowVisit (const MeshFacet& face, const MeshFacet&,
FacetIndex, unsigned long, unsigned short neighbourIndex);
bool Visit (const MeshFacet & face, const MeshFacet &,

4
src/Mod/Mesh/App/Exporter.h
View File

@@ -77,7 +77,7 @@ class MergeExporter : public Exporter
{
public:
MergeExporter(std::string fileName, MeshCore::MeshIO::Format fmt);
~MergeExporter();
~MergeExporter() override;
bool addMesh(const char *name, const MeshObject & mesh) override;
@@ -103,7 +103,7 @@ class AmfExporter : public Exporter
bool compress = true);
/// Writes AMF footer
~AmfExporter();
~AmfExporter() override;
bool addMesh(const char *name, const MeshObject & mesh) override;

6
src/Mod/Mesh/App/FeatureMeshCurvature.h
View File

@@ -51,10 +51,10 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
/// returns the type name of the ViewProvider
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "MeshGui::ViewProviderMeshCurvature";
}
//@}

46
src/Mod/Mesh/App/FeatureMeshDefects.h
View File

@@ -42,7 +42,7 @@ class MeshExport FixDefects : public Mesh::Feature
public:
/// Constructor
FixDefects();
virtual ~FixDefects();
~FixDefects() override;
/** @name Properties */
//@{
@@ -53,8 +53,8 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
//@}
/// returns the type name of the ViewProvider
@@ -72,12 +72,12 @@ class MeshExport HarmonizeNormals : public Mesh::FixDefects
public:
/// Constructor
HarmonizeNormals();
virtual ~HarmonizeNormals();
~HarmonizeNormals() override;
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//@}
};
@@ -92,12 +92,12 @@ class MeshExport FlipNormals : public Mesh::FixDefects
public:
/// Constructor
FlipNormals();
virtual ~FlipNormals();
~FlipNormals() override;
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//@}
};
@@ -112,12 +112,12 @@ class MeshExport FixNonManifolds : public Mesh::FixDefects
public:
/// Constructor
FixNonManifolds();
virtual ~FixNonManifolds();
~FixNonManifolds() override;
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//@}
};
@@ -132,12 +132,12 @@ class MeshExport FixDuplicatedFaces : public Mesh::FixDefects
public:
/// Constructor
FixDuplicatedFaces();
virtual ~FixDuplicatedFaces();
~FixDuplicatedFaces() override;
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//@}
};
@@ -152,12 +152,12 @@ class MeshExport FixDuplicatedPoints : public Mesh::FixDefects
public:
/// Constructor
FixDuplicatedPoints();
virtual ~FixDuplicatedPoints();
~FixDuplicatedPoints() override;
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//@}
};
@@ -172,12 +172,12 @@ class MeshExport FixDegenerations : public Mesh::FixDefects
public:
/// Constructor
FixDegenerations();
virtual ~FixDegenerations();
~FixDegenerations() override;
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//@}
};
@@ -192,7 +192,7 @@ class MeshExport FixDeformations : public Mesh::FixDefects
public:
/// Constructor
FixDeformations();
virtual ~FixDeformations();
~FixDeformations() override;
/** @name Properties */
//@{
@@ -201,7 +201,7 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//@}
};
@@ -216,12 +216,12 @@ class MeshExport FixIndices : public Mesh::FixDefects
public:
/// Constructor
FixIndices();
virtual ~FixIndices();
~FixIndices() override;
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//@}
};
@@ -236,14 +236,14 @@ class MeshExport FillHoles : public Mesh::FixDefects
public:
/// Constructor
FillHoles();
virtual ~FillHoles();
~FillHoles() override;
App::PropertyInteger FillupHolesOfLength;
App::PropertyFloat MaxArea;
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//@}
};
@@ -258,13 +258,13 @@ class MeshExport RemoveComponents : public Mesh::FixDefects
public:
/// Constructor
RemoveComponents();
virtual ~RemoveComponents();
~RemoveComponents() override;
App::PropertyInteger RemoveCompOfSize;
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
//@}
};

6
src/Mod/Mesh/App/FeatureMeshExport.h
View File

@@ -48,15 +48,15 @@ public:
App::PropertyLink Source;
App::PropertyString FileName;
App::PropertyString Format;
const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "MeshGui::ViewProviderExport";
}
/** @name methods override feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
//@}
};

4
src/Mod/Mesh/App/FeatureMeshImport.h
View File

@@ -49,8 +49,8 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
//@}
};

4
src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h
View File

@@ -56,8 +56,8 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
//@}
};

4
src/Mod/Mesh/App/FeatureMeshSetOperations.h
View File

@@ -54,8 +54,8 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
//@}
};

36
src/Mod/Mesh/App/FeatureMeshSolid.h
View File

@@ -48,9 +48,9 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
//@}
};
@@ -70,9 +70,9 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
//@}
};
@@ -94,9 +94,9 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
//@}
};
@@ -119,9 +119,9 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
//@}
};
@@ -141,9 +141,9 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
//@}
};
@@ -163,9 +163,9 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
App::DocumentObjectExecReturn *execute();
short mustExecute() const;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
//@}
};

4
src/Mod/Mesh/App/FeatureMeshTransform.h
View File

@@ -52,9 +52,9 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "MeshGui::ViewProviderMeshTransform";
}
//@}

4
src/Mod/Mesh/App/FeatureMeshTransformDemolding.h
View File

@@ -51,9 +51,9 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
App::DocumentObjectExecReturn *execute() override;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "MeshGui::ViewProviderMeshTransformDemolding";
}
//@}

42
src/Mod/Mesh/App/Mesh.h
View File

@@ -66,7 +66,7 @@ class MeshExport MeshSegment : public Data::Segment
TYPESYSTEM_HEADER();
public:
virtual std::string getName() const {
std::string getName() const override {
return "MeshSegment";
}
@@ -101,7 +101,7 @@ public:
explicit MeshObject(const MeshCore::MeshKernel& Kernel);
explicit MeshObject(const MeshCore::MeshKernel& Kernel, const Base::Matrix4D &Mtrx);
MeshObject(const MeshObject&);
virtual ~MeshObject();
~MeshObject() override;
void operator = (const MeshObject&);
@@ -111,21 +111,21 @@ public:
* List of different subelement types
* its 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;
/** Get faces from segment */
virtual void getFacesFromSubElement(
void getFacesFromSubElement(
const Data::Segment*,
std::vector<Base::Vector3d> &Points,
std::vector<Base::Vector3d> &PointNormals,
std::vector<Facet> &faces) const;
std::vector<Facet> &faces) const override;
//@}
void setTransform(const Base::Matrix4D& rclTrf);
Base::Matrix4D getTransform() const;
void transformGeometry(const Base::Matrix4D &rclMat);
void setTransform(const Base::Matrix4D& rclTrf) override;
Base::Matrix4D getTransform() const override;
void transformGeometry(const Base::Matrix4D &rclMat) override;
/**
* Swaps the content of \a Kernel and the internal mesh kernel.
@@ -148,11 +148,11 @@ public:
double getSurface() const;
double getVolume() const;
/** Get points from object with given accuracy */
virtual void getPoints(std::vector<Base::Vector3d> &Points,
void getPoints(std::vector<Base::Vector3d> &Points,
std::vector<Base::Vector3d> &Normals,
float Accuracy, uint16_t flags=0) const;
virtual void getFaces(std::vector<Base::Vector3d> &Points,std::vector<Facet> &Topo,
float Accuracy, uint16_t flags=0) const;
float Accuracy, uint16_t flags=0) const override;
void getFaces(std::vector<Base::Vector3d> &Points,std::vector<Facet> &Topo,
float Accuracy, uint16_t flags=0) const override;
std::vector<PointIndex> getPointsFromFacets(const std::vector<FacetIndex>& facets) const;
bool nearestFacetOnRay(const TRay& ray, double maxAngle, TFaceSection& output) const;
std::vector<TFaceSection> foraminate(const TRay& ray, double maxAngle) const;
@@ -164,17 +164,17 @@ public:
const MeshCore::MeshKernel& getKernel() const
{ return _kernel; }
virtual Base::BoundBox3d getBoundBox() const;
virtual bool getCenterOfGravity(Base::Vector3d& center) const;
Base::BoundBox3d getBoundBox() const override;
bool getCenterOfGravity(Base::Vector3d& center) const override;
/** @name I/O */
//@{
// Implemented from Persistence
unsigned int getMemSize () const;
void Save (Base::Writer &writer) const;
void SaveDocFile (Base::Writer &writer) const;
void Restore(Base::XMLReader &reader);
void RestoreDocFile(Base::Reader &reader);
unsigned int getMemSize () const override;
void Save (Base::Writer &writer) const override;
void SaveDocFile (Base::Writer &writer) const override;
void Restore(Base::XMLReader &reader) override;
void RestoreDocFile(Base::Reader &reader) override;
void save(const char* file,MeshCore::MeshIO::Format f=MeshCore::MeshIO::Undefined,
const MeshCore::Material* mat = nullptr,
const char* objectname = nullptr) const;

12
src/Mod/Mesh/App/MeshFeature.h
View File

@@ -58,7 +58,7 @@ class MeshExport Feature : public App::GeoFeature
public:
/// Constructor
Feature();
virtual ~Feature();
~Feature() override;
/** @name Properties */
//@{
@@ -69,20 +69,20 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute();
virtual void onChanged(const App::Property* prop);
App::DocumentObjectExecReturn *execute() override;
void onChanged(const App::Property* prop) override;
//@}
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "MeshGui::ViewProviderMeshFaceSet";
}
virtual const App::PropertyComplexGeoData* getPropertyOfGeometry() const {
const App::PropertyComplexGeoData* getPropertyOfGeometry() const override {
return &Mesh;
}
/// handles the MeshPy object
virtual PyObject* getPyObject();
PyObject* getPyObject() override;
};
typedef App::FeatureCustomT<Feature> FeatureCustom;

80
src/Mod/Mesh/App/MeshProperties.h
View File

@@ -56,10 +56,10 @@ class MeshExport PropertyNormalList: public App::PropertyLists
public:
PropertyNormalList();
~PropertyNormalList();
~PropertyNormalList() override;
virtual void setSize(int newSize);
virtual int getSize() const;
void setSize(int newSize) override;
int getSize() const override;
void setValue(const Base::Vector3f&);
void setValue(float x, float y, float z);
@@ -78,19 +78,19 @@ public:
return _lValueList;
}
virtual PyObject *getPyObject();
virtual void setPyObject(PyObject *);
PyObject *getPyObject() override;
void setPyObject(PyObject *) override;
virtual void Save (Base::Writer &writer) const;
virtual void Restore(Base::XMLReader &reader);
void Save (Base::Writer &writer) const override;
void Restore(Base::XMLReader &reader) override;
virtual void SaveDocFile (Base::Writer &writer) const;
virtual void RestoreDocFile(Base::Reader &reader);
void SaveDocFile (Base::Writer &writer) const override;
void RestoreDocFile(Base::Reader &reader) override;
virtual App::Property *Copy() const;
virtual void Paste(const App::Property &from);
App::Property *Copy() const override;
void Paste(const App::Property &from) override;
virtual unsigned int getMemSize () const;
unsigned int getMemSize () const override;
void transformGeometry(const Base::Matrix4D &rclMat);
@@ -123,10 +123,10 @@ public:
public:
PropertyCurvatureList();
~PropertyCurvatureList();
~PropertyCurvatureList() override;
void setSize(int newSize){_lValueList.resize(newSize);}
int getSize() const {return _lValueList.size();}
void setSize(int newSize) override{_lValueList.resize(newSize);}
int getSize() const override {return _lValueList.size();}
std::vector<float> getCurvature( int tMode) const;
void setValue(const CurvatureInfo&);
void setValues(const std::vector<CurvatureInfo>&);
@@ -143,22 +143,22 @@ public:
}
void transformGeometry(const Base::Matrix4D &rclMat);
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;
/** @name Python interface */
//@{
PyObject* getPyObject();
void setPyObject(PyObject *value);
PyObject* getPyObject() override;
void setPyObject(PyObject *value) override;
//@}
App::Property *Copy() const;
void Paste(const App::Property &from);
App::Property *Copy() const override;
void Paste(const App::Property &from) override;
virtual unsigned int getMemSize () const{return _lValueList.size() * sizeof(CurvatureInfo);}
unsigned int getMemSize () const override{return _lValueList.size() * sizeof(CurvatureInfo);}
private:
std::vector<CurvatureInfo> _lValueList;
@@ -173,7 +173,7 @@ class MeshExport PropertyMeshKernel : public App::PropertyComplexGeoData
public:
PropertyMeshKernel();
~PropertyMeshKernel();
~PropertyMeshKernel() override;
/** @name Getter/setter */
//@{
@@ -199,14 +199,14 @@ public:
*/
const MeshObject &getValue() const;
const MeshObject *getValuePtr() const;
virtual unsigned int getMemSize () const;
unsigned int getMemSize () const override;
//@}
/** @name Getting basic geometric entities */
//@{
const Data::ComplexGeoData* getComplexData() const;
const Data::ComplexGeoData* getComplexData() const override;
/** Returns the bounding box around the underlying mesh kernel */
Base::BoundBox3d getBoundingBox() const;
Base::BoundBox3d getBoundingBox() const override;
//@}
/** @name Modification */
@@ -214,10 +214,10 @@ public:
MeshObject* startEditing();
void finishEditing();
/// Transform the real mesh data
void transformGeometry(const Base::Matrix4D &rclMat);
void transformGeometry(const Base::Matrix4D &rclMat) override;
void setPointIndices( const std::vector<std::pair<PointIndex, Base::Vector3f> >& );
void setTransform(const Base::Matrix4D& rclTrf);
Base::Matrix4D getTransform() const;
void setTransform(const Base::Matrix4D& rclTrf) override;
Base::Matrix4D getTransform() const override;
//@}
/** @name Python interface */
@@ -226,29 +226,29 @@ public:
* create a copy. However, the Python wrapper is marked as \a immutable so
* that the mesh object cannot be modified from outside.
*/
PyObject* getPyObject();
PyObject* getPyObject() override;
/** This method copies the content, hence creates an new mesh object
* to copy the data. The passed argument can be an instance of the Python
* wrapper for the mesh object or simply a list of triangles, i.e. a list
* of lists of three floats.
*/
void setPyObject(PyObject *value);
void setPyObject(PyObject *value) override;
//@}
const char* getEditorName() const {
const char* getEditorName() const override {
return "MeshGui::PropertyMeshKernelItem";
}
/** @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);
App::Property *Copy() const override;
void Paste(const App::Property &from) override;
//@}
private: