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/TechDraw/App/AppTechDrawPy.cpp
View File

@@ -191,10 +191,10 @@ public:
);
initialize("This is a module for making drawings"); // 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);

48
src/Mod/TechDraw/App/Cosmetic.h
View File

@@ -70,23 +70,23 @@ public:
CosmeticVertex();
CosmeticVertex(const CosmeticVertex* cv);
CosmeticVertex(Base::Vector3d loc);
virtual ~CosmeticVertex() = default;
~CosmeticVertex() override = default;
void move(Base::Vector3d newPos);
void moveRelative(Base::Vector3d movement);
std::string toString() const;
void dump(const char* title);
void dump(const char* title) override;
Base::Vector3d scaled(double factor);
static bool restoreCosmetic();
// Persistence implementer ---------------------
virtual unsigned int getMemSize() const;
virtual void Save(Base::Writer &/*writer*/) const;
virtual void Restore(Base::XMLReader &/*reader*/);
unsigned int getMemSize() const override;
void Save(Base::Writer &/*writer*/) const override;
void Restore(Base::XMLReader &/*reader*/) override;
virtual PyObject *getPyObject();
PyObject *getPyObject() override;
CosmeticVertex* copy() const;
CosmeticVertex* clone() const;
@@ -99,7 +99,7 @@ public:
bool visible; //base class vertex also has visible property
boost::uuids::uuid getTag() const;
virtual std::string getTagAsString() const;
std::string getTagAsString() const override;
protected:
//Uniqueness
@@ -128,21 +128,21 @@ public:
CosmeticEdge(Base::Vector3d p1, Base::Vector3d p2);
CosmeticEdge(TopoDS_Edge e);
CosmeticEdge(TechDraw::BaseGeomPtr g);
virtual ~CosmeticEdge();
~CosmeticEdge() override;
void initialize();
TopoDS_Edge TopoDS_EdgeFromVectors(Base::Vector3d pt1, Base::Vector3d pt2);
TechDraw::BaseGeomPtr scaledGeometry(double scale);
virtual std::string toString() const;
std::string toString() const override;
void dump(const char* title);
// Persistence implementer ---------------------
virtual unsigned int getMemSize() const;
virtual void Save(Base::Writer &/*writer*/) const;
virtual void Restore(Base::XMLReader &/*reader*/);
unsigned int getMemSize() const override;
void Save(Base::Writer &/*writer*/) const override;
void Restore(Base::XMLReader &/*reader*/) override;
virtual PyObject *getPyObject();
PyObject *getPyObject() override;
CosmeticEdge* copy() const;
CosmeticEdge* clone() const;
@@ -154,7 +154,7 @@ public:
LineFormat m_format;
boost::uuids::uuid getTag() const;
virtual std::string getTagAsString() const;
std::string getTagAsString() const override;
protected:
//Uniqueness
@@ -201,16 +201,16 @@ public:
double v = 0.0,
double r = 0.0,
double x = 0.0);
virtual ~CenterLine();
~CenterLine() override;
TechDraw::BaseGeomPtr BaseGeomPtrFromVectors(Base::Vector3d pt1, Base::Vector3d pt2);
// Persistence implementer ---------------------
virtual unsigned int getMemSize() const;
virtual void Save(Base::Writer &/*writer*/) const;
virtual void Restore(Base::XMLReader &/*reader*/);
unsigned int getMemSize() const override;
void Save(Base::Writer &/*writer*/) const override;
void Restore(Base::XMLReader &/*reader*/) override;
virtual PyObject *getPyObject();
PyObject *getPyObject() override;
CenterLine* copy() const;
CenterLine* clone() const;
@@ -309,14 +309,14 @@ public:
GeomFormat(TechDraw::GeomFormat* gf);
GeomFormat(int idx,
LineFormat fmt);
~GeomFormat();
~GeomFormat() override;
// Persistence implementer ---------------------
virtual unsigned int getMemSize() const;
virtual void Save(Base::Writer &/*writer*/) const;
virtual void Restore(Base::XMLReader &/*reader*/);
unsigned int getMemSize() const override;
void Save(Base::Writer &/*writer*/) const override;
void Restore(Base::XMLReader &/*reader*/) override;
virtual PyObject *getPyObject();
PyObject *getPyObject() override;
GeomFormat* copy() const;
GeomFormat* clone() const;

4
src/Mod/TechDraw/App/CosmeticExtension.h
View File

@@ -44,7 +44,7 @@ class TechDrawExport CosmeticExtension : public App::DocumentObjectExtension {
public:
CosmeticExtension();
virtual ~CosmeticExtension();
~CosmeticExtension() override;
TechDraw::PropertyCosmeticVertexList CosmeticVertexes;
TechDraw::PropertyCosmeticEdgeList CosmeticEdges;
@@ -82,7 +82,7 @@ public:
virtual void removeGeomFormat(std::string tag);
PyObject* getExtensionPyObject();
PyObject* getExtensionPyObject() override;
protected:
/* virtual void extHandleChangedPropertyName(Base::XMLReader &reader, */

16
src/Mod/TechDraw/App/DrawHatch.h
View File

@@ -44,22 +44,22 @@ class TechDrawExport DrawHatch : public App::DocumentObject
public:
DrawHatch();
virtual ~DrawHatch();
~DrawHatch() override;
App::PropertyLinkSub Source; // the dvp & face this hatch belongs to
App::PropertyFile HatchPattern;
App::PropertyFileIncluded SvgIncluded;
virtual App::DocumentObjectExecReturn *execute() override;
virtual short mustExecute() const override;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderHatch";
}
virtual void unsetupObject() override;
void unsetupObject() override;
//return PyObject as DrawHatchPy
virtual PyObject *getPyObject() override;
PyObject *getPyObject() override;
DrawViewPart* getSourceView() const;
bool affectsFace(int i);
@@ -75,8 +75,8 @@ public:
protected:
void onChanged(const App::Property* prop) override;
virtual void onDocumentRestored() override;
virtual void setupObject() override;
void onDocumentRestored() override;
void setupObject() override;
void setupFileIncluded();
void replaceFileIncluded(std::string newSvgFile);

14
src/Mod/TechDraw/App/DrawLeaderLine.h
View File

@@ -39,7 +39,7 @@ class TechDrawExport DrawLeaderLine : public TechDraw::DrawView
public:
DrawLeaderLine();
virtual ~DrawLeaderLine();
~DrawLeaderLine() override;
App::PropertyLink LeaderParent;
App::PropertyVectorList WayPoints;
@@ -52,14 +52,14 @@ public:
App::PropertyBool Scalable;
App::PropertyBool AutoHorizontal;
virtual short mustExecute() const override;
virtual App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
App::DocumentObjectExecReturn *execute() override;
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderLeader";
}
virtual PyObject *getPyObject() override;
virtual QRectF getRect() const override { return QRectF(0,0,1,1);}
PyObject *getPyObject() override;
QRectF getRect() const override { return QRectF(0,0,1,1);}
Base::Vector3d getAttachPoint();
DrawView* getBaseView() const;
@@ -75,7 +75,7 @@ public:
Base::Vector3d getTailPoint() const;
protected:
virtual void onChanged(const App::Property* prop) override;
void onChanged(const App::Property* prop) override;
private:
/* static const char* ArrowTypeEnums[];*/

12
src/Mod/TechDraw/App/DrawPage.h
View File

@@ -40,7 +40,7 @@ class TechDrawExport DrawPage: public App::DocumentObject
public:
DrawPage();
virtual ~DrawPage();
~DrawPage() override;
App::PropertyLinkList Views;
App::PropertyLink Template;
@@ -54,9 +54,9 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute() override;
App::DocumentObjectExecReturn *execute() override;
//@}
virtual void handleChangedPropertyType(
void handleChangedPropertyType(
Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
int addView(App::DocumentObject *docObj);
@@ -65,7 +65,7 @@ public:
boost::signals2::signal<void (const DrawPage*)> signalGuiPaint;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderPage";
}
@@ -108,8 +108,8 @@ public:
protected:
void onBeforeChange(const App::Property* prop) override;
void onChanged(const App::Property* prop) override;
virtual void onDocumentRestored() override;
virtual void unsetupObject() override;
void onDocumentRestored() override;
void unsetupObject() override;
bool m_forceRedraw;

12
src/Mod/TechDraw/App/DrawProjGroup.h
View File

@@ -53,7 +53,7 @@ class TechDrawExport DrawProjGroup : public TechDraw::DrawViewCollection
public:
/// Constructor
DrawProjGroup();
~DrawProjGroup();
~DrawProjGroup() override;
App::PropertyLinkList Source;
App::PropertyXLinkList XSource;
@@ -71,7 +71,7 @@ public:
Base::BoundBox3d getBoundingBox() const;
double calculateAutomaticScale() const;
virtual QRectF getRect() const override;
QRectF getRect() const override;
/// Check if container has a view of a specific type
bool hasProjection(const char *viewProjType) const;
@@ -97,15 +97,15 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute() override;
App::DocumentObjectExecReturn *execute() override;
//@}
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderProjGroup";
}
//return PyObject as DrawProjGroupPy
virtual PyObject *getPyObject() override;
PyObject *getPyObject() override;
/// Determines either "First Angle" or "Third Angle".
App::Enumeration usedProjectionType();
@@ -176,7 +176,7 @@ protected:
Base::Vector3d dir2vec(gp_Dir d);
gp_Dir vec2dir(Base::Vector3d v);
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override;
void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override;
bool m_lockScale;
};

34
src/Mod/TechDraw/App/DrawProjGroupItem.h
View File

@@ -55,50 +55,50 @@ class TechDrawExport DrawProjGroupItem : public TechDraw::DrawViewPart
public:
/// Constructor
DrawProjGroupItem();
virtual ~DrawProjGroupItem();
~DrawProjGroupItem() override;
App::PropertyEnumeration Type;
App::PropertyVector RotationVector; //this is superseded by dvp xdirection
short mustExecute() const override;
virtual void onDocumentRestored() override;
virtual void unsetupObject() override;
void onDocumentRestored() override;
void unsetupObject() override;
DrawProjGroup* getPGroup() const;
double getRotateAngle();
virtual Base::Vector3d getXDirection() const override;
virtual Base::Vector3d getLegacyX(const Base::Vector3d& pt,
Base::Vector3d getXDirection() const override;
Base::Vector3d getLegacyX(const Base::Vector3d& pt,
const Base::Vector3d& axis,
const bool flip = true) const override;
virtual App::DocumentObjectExecReturn *execute() override;
virtual const char* getViewProviderName() const override {
App::DocumentObjectExecReturn *execute() override;
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderProjGroupItem";
}
//return PyObject as DrawProjGroupItemPy
virtual PyObject *getPyObject() override;
PyObject *getPyObject() override;
//this doesn't override for dvp pointer??
virtual gp_Ax2 getViewAxis(const Base::Vector3d& pt,
gp_Ax2 getViewAxis(const Base::Vector3d& pt,
const Base::Vector3d& direction,
const bool flip=true) const override;
virtual double getScale() const override;
double getScale() const override;
void autoPosition();
bool isAnchor() const;
//DPGI always fits on page since DPG handles scaling
virtual bool checkFit() const override { return true; }
virtual bool checkFit(DrawPage*) const override { return true; }
bool checkFit() const override { return true; }
bool checkFit(DrawPage*) const override { return true; }
virtual int countParentPages() const override;
virtual DrawPage* findParentPage() const override;
virtual std::vector<DrawPage*> findAllParentPages() const override;
int countParentPages() const override;
DrawPage* findParentPage() const override;
std::vector<DrawPage*> findAllParentPages() const override;
protected:
void onChanged(const App::Property* prop) override;
virtual bool isLocked() const override;
virtual bool showLock() const override;
bool isLocked() const override;
bool showLock() const override;
private:
static const char* TypeEnums[];

14
src/Mod/TechDraw/App/DrawRichAnno.h
View File

@@ -38,25 +38,25 @@ class TechDrawExport DrawRichAnno : public TechDraw::DrawView
public:
DrawRichAnno();
virtual ~DrawRichAnno();
~DrawRichAnno() override;
App::PropertyLink AnnoParent;
App::PropertyString AnnoText;
App::PropertyBool ShowFrame;
App::PropertyFloat MaxWidth;
virtual short mustExecute() const;
virtual App::DocumentObjectExecReturn *execute();
short mustExecute() const override;
App::DocumentObjectExecReturn *execute() override;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderRichAnno";
}
virtual PyObject *getPyObject();
virtual QRectF getRect() const { return QRectF(0,0,1,1);}
PyObject *getPyObject() override;
QRectF getRect() const override { return QRectF(0,0,1,1);}
DrawView* getBaseView() const;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
private:
};

14
src/Mod/TechDraw/App/DrawTile.h
View File

@@ -37,25 +37,25 @@ class TechDrawExport DrawTile : public App::DocumentObject
public:
DrawTile();
virtual ~DrawTile();
~DrawTile() override;
App::PropertyLink TileParent; //eg DrawWeldSymbol
App::PropertyIntegerConstraint TileRow;
App::PropertyIntegerConstraint::Constraints TileRowConstraints;
App::PropertyInteger TileColumn;
virtual short mustExecute() const;
virtual App::DocumentObjectExecReturn *execute(void);
short mustExecute() const override;
App::DocumentObjectExecReturn *execute(void) override;
virtual const char* getViewProviderName(void) const {
const char* getViewProviderName(void) const override {
return "TechDrawGui::ViewProviderTile";
}
virtual PyObject *getPyObject(void);
PyObject *getPyObject(void) override;
virtual DrawView* getParent(void) const;
protected:
virtual void onChanged(const App::Property* prop);
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop);
void onChanged(const App::Property* prop) override;
void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override;
private:
};

16
src/Mod/TechDraw/App/DrawTileWeld.h
View File

@@ -40,7 +40,7 @@ class TechDrawExport DrawTileWeld : public TechDraw::DrawTile
public:
DrawTileWeld();
virtual ~DrawTileWeld();
~DrawTileWeld() override;
App::PropertyString LeftText;
App::PropertyString RightText;
@@ -48,15 +48,15 @@ public:
App::PropertyFile SymbolFile;
App::PropertyFileIncluded SymbolIncluded;
virtual short mustExecute() const;
virtual App::DocumentObjectExecReturn *execute();
virtual void onDocumentRestored();
virtual void setupObject();
short mustExecute() const override;
App::DocumentObjectExecReturn *execute() override;
void onDocumentRestored() override;
void setupObject() override;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderTile";
}
virtual PyObject *getPyObject();
PyObject *getPyObject() override;
virtual QRectF getRect() const { return QRectF(0,0,1,1);}
void replaceSymbolIncluded(std::string newSymbolFile);
@@ -66,7 +66,7 @@ public:
std::string prefSymbol();
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
private:
};

16
src/Mod/TechDraw/App/DrawView.h
View File

@@ -52,7 +52,7 @@ class TechDrawExport DrawView : public App::DocumentObject
public:
/// Constructor
DrawView();
virtual ~DrawView();
~DrawView() override;
App::PropertyDistance X;
App::PropertyDistance Y;
@@ -66,22 +66,22 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute() override;
virtual void onDocumentRestored() override;
virtual short mustExecute() const override;
App::DocumentObjectExecReturn *execute() override;
void onDocumentRestored() override;
short mustExecute() const override;
//@}
virtual void handleChangedPropertyType(
void handleChangedPropertyType(
Base::XMLReader &reader, const char * TypeName, App::Property * prop) override;
bool isInClip();
DrawViewClip* getClipGroup();
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderDrawingView";
}
//return PyObject as DrawViewPy
virtual PyObject *getPyObject() override;
PyObject *getPyObject() override;
virtual DrawPage* findParentPage() const;
virtual std::vector<DrawPage*> findAllParentPages() const;
@@ -105,7 +105,7 @@ public:
void setScaleAttribute();
protected:
virtual void onChanged(const App::Property* prop) override;
void onChanged(const App::Property* prop) override;
virtual void validateScale();
std::string pageFeatName;
bool autoPos;

12
src/Mod/TechDraw/App/DrawViewAnnotation.h
View File

@@ -42,7 +42,7 @@ class TechDrawExport DrawViewAnnotation : public TechDraw::DrawView
public:
/// Constructor
DrawViewAnnotation();
virtual ~DrawViewAnnotation();
~DrawViewAnnotation() override;
App::PropertyStringList Text;
App::PropertyFont Font;
@@ -52,22 +52,22 @@ public:
App::PropertyEnumeration TextStyle; // Plain,Bold,Italic,Bold-Italic
App::PropertyLength MaxWidth;
virtual QRectF getRect() const;
QRectF getRect() const override;
/** @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 "TechDrawGui::ViewProviderAnnotation";
}
protected:
virtual void onChanged(const App::Property* prop);
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop);
void onChanged(const App::Property* prop) override;
void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override;
private:
static const char* TextStyleEnums[];

8
src/Mod/TechDraw/App/DrawViewArch.h
View File

@@ -40,7 +40,7 @@ class TechDrawExport DrawViewArch : public TechDraw::DrawViewSymbol
public:
/// Constructor
DrawViewArch();
virtual ~DrawViewArch();
~DrawViewArch() override;
App::PropertyLink Source;
App::PropertyBool AllOn;
@@ -56,15 +56,15 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute() override;
App::DocumentObjectExecReturn *execute() override;
//@}
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderArch";
}
virtual short mustExecute() const override;
short mustExecute() const override;
protected:

10
src/Mod/TechDraw/App/DrawViewBalloon.h
View File

@@ -46,7 +46,7 @@ class TechDrawExport DrawViewBalloon : public TechDraw::DrawView
public:
/// Constructor
DrawViewBalloon();
virtual ~DrawViewBalloon();
~DrawViewBalloon() override;
App::PropertyLink SourceView;
App::PropertyString Text;
@@ -68,9 +68,9 @@ public:
//virtual PyObject *getPyObject(void);
virtual App::DocumentObjectExecReturn *execute() override;
App::DocumentObjectExecReturn *execute() override;
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderBalloon";
}
@@ -87,10 +87,10 @@ public:
protected:
void onChanged(const App::Property* prop) override;
virtual void handleChangedPropertyType(Base::XMLReader &reader,
void handleChangedPropertyType(Base::XMLReader &reader,
const char *TypeName,
App::Property * prop) override;
virtual void handleChangedPropertyName(Base::XMLReader &reader,
void handleChangedPropertyName(Base::XMLReader &reader,
const char * TypeName,
const char *PropName) override;

14
src/Mod/TechDraw/App/DrawViewClip.h
View File

@@ -42,7 +42,7 @@ class TechDrawExport DrawViewClip: public TechDraw::DrawView
public:
/// Constructor
DrawViewClip();
virtual ~DrawViewClip();
~DrawViewClip() override;
App::PropertyLength Width;
App::PropertyLength Height;
@@ -51,28 +51,28 @@ public:
void addView(DrawView *view);
void removeView(DrawView *view);
short mustExecute() const;
short mustExecute() const override;
/** @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 "TechDrawGui::ViewProviderViewClip";
}
//return PyObject as DrawViewClipPy
virtual PyObject *getPyObject();
PyObject *getPyObject() override;
std::vector<std::string> getChildViewNames();
bool isViewInClip(App::DocumentObject* view);
virtual QRectF getRect() const { return QRectF(0,0,Width.getValue(),Height.getValue()); }
QRectF getRect() const override { return QRectF(0,0,Width.getValue(),Height.getValue()); }
protected:
void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
};
typedef App::FeaturePythonT<DrawViewClip> DrawViewClipPython;

16
src/Mod/TechDraw/App/DrawViewCollection.h
View File

@@ -43,8 +43,8 @@ public:
public:
/// Constructor
DrawViewCollection();
virtual ~DrawViewCollection();
short mustExecute() const;
~DrawViewCollection() override;
short mustExecute() const override;
int addView(DrawView *view);
int removeView(DrawView *view);
@@ -54,18 +54,18 @@ public:
int countChildren();
void lockChildren();
virtual void onDocumentRestored();
virtual App::DocumentObjectExecReturn *execute();
virtual void unsetupObject();
void onDocumentRestored() override;
App::DocumentObjectExecReturn *execute() override;
void unsetupObject() override;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderViewCollection";
}
virtual QRectF getRect() const;
QRectF getRect() const override;
protected:
void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
bool nowUnsetting;
};

14
src/Mod/TechDraw/App/DrawViewDetail.h
View File

@@ -51,20 +51,20 @@ class TechDrawExport DrawViewDetail : public DrawViewPart
public:
/// Constructor
DrawViewDetail();
virtual ~DrawViewDetail();
~DrawViewDetail() override;
App::PropertyLink BaseView;
App::PropertyVector AnchorPoint;
App::PropertyFloat Radius;
App::PropertyString Reference;
virtual short mustExecute() const override;
virtual App::DocumentObjectExecReturn *execute() override;
virtual void onChanged(const App::Property* prop) override;
virtual const char* getViewProviderName() const override {
short mustExecute() const override;
App::DocumentObjectExecReturn *execute() override;
void onChanged(const App::Property* prop) override;
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderViewPart";
}
virtual void unsetupObject() override;
void unsetupObject() override;
void detailExec(TopoDS_Shape s,
@@ -73,7 +73,7 @@ public:
double getFudgeRadius();
TopoDS_Shape projectEdgesOntoFace(TopoDS_Shape edgeShape, TopoDS_Face projFace, gp_Dir projDir);
virtual std::vector<DrawViewDetail*> getDetailRefs() const override;
std::vector<DrawViewDetail*> getDetailRefs() const override;
protected:
Base::Vector3d toR3(const gp_Ax2 fromSystem, const Base::Vector3d fromPoint);

16
src/Mod/TechDraw/App/DrawViewDimExtent.h
View File

@@ -40,7 +40,7 @@ class TechDrawExport DrawViewDimExtent : public TechDraw::DrawViewDimension
public:
/// Constructor
DrawViewDimExtent();
virtual ~DrawViewDimExtent();
~DrawViewDimExtent() override;
App::PropertyLinkSubList Source; //DrawViewPart & SubElements(Edges)
//Cosmetic End points are stored in DVD::References2d
@@ -48,19 +48,19 @@ public:
App::PropertyInteger DirExtent; //Horizontal, Vertical, TBD
App::PropertyStringList CosmeticTags; //id of cosmetic end points.
virtual App::DocumentObjectExecReturn *execute();
virtual short mustExecute() const;
virtual void unsetupObject();
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
void unsetupObject() override;
virtual bool checkReferences2D() const;
bool checkReferences2D() const override;
//return PyObject as DrawViewDimExtentPy
virtual PyObject *getPyObject();
PyObject *getPyObject() override;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
std::vector<std::string> getSubNames();
virtual pointPair getPointsTwoVerts();
pointPair getPointsTwoVerts() override;
private:
};

18
src/Mod/TechDraw/App/DrawViewDimension.h
View File

@@ -130,7 +130,7 @@ class TechDrawExport DrawViewDimension : public TechDraw::DrawView
public:
/// Constructor
DrawViewDimension();
virtual ~DrawViewDimension();
~DrawViewDimension() override;
App::PropertyEnumeration MeasureType; //True/Projected
App::PropertyLinkSubList References2D; //Points to Projection SubFeatures
@@ -170,15 +170,15 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute() override;
App::DocumentObjectExecReturn *execute() override;
//@}
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderDimension";
}
//return PyObject as DrawViewDimensionPy
virtual PyObject *getPyObject() override;
PyObject *getPyObject() override;
virtual std::string getFormattedToleranceValue(int partial);
virtual std::pair<std::string, std::string> getFormattedToleranceValues(int partial = 0);
@@ -191,7 +191,7 @@ public:
QStringList getPrefixSuffixSpec(QString fSpec);
virtual DrawViewPart* getViewPart() const;
virtual QRectF getRect() const override { return QRectF(0,0,1,1);} //pretend dimensions always fit!
QRectF getRect() const override { return QRectF(0,0,1,1);} //pretend dimensions always fit!
virtual int getRefType() const; //Vertex-Vertex, Edge, Edge-Edge
static int getRefTypeSubElements(const std::vector<std::string> &); //Vertex-Vertex, Edge, Edge-Edge
void setAll3DMeasurement();
@@ -213,10 +213,10 @@ public:
bool useDecimals() const;
protected:
virtual void handleChangedPropertyType(Base::XMLReader &, const char * , App::Property * ) override;
virtual void Restore(Base::XMLReader& reader) override;
virtual void onChanged(const App::Property* prop) override;
virtual void onDocumentRestored() override;
void handleChangedPropertyType(Base::XMLReader &, const char * , App::Property * ) override;
void Restore(Base::XMLReader& reader) override;
void onChanged(const App::Property* prop) override;
void onDocumentRestored() override;
std::string getPrefix() const;
std::string getDefaultFormatSpec(bool isToleranceFormat = false) const;
virtual pointPair getPointsOneEdge();

8
src/Mod/TechDraw/App/DrawViewDraft.h
View File

@@ -41,7 +41,7 @@ class TechDrawExport DrawViewDraft : public TechDraw::DrawViewSymbol
public:
/// Constructor
DrawViewDraft();
virtual ~DrawViewDraft();
~DrawViewDraft() override;
App::PropertyLink Source;
App::PropertyFloat LineWidth;
@@ -55,15 +55,15 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute() override;
App::DocumentObjectExecReturn *execute() override;
//@}
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderDraft";
}
virtual short mustExecute() const override;
short mustExecute() const override;
protected:
/* virtual void onChanged(const App::Property* prop) override;*/

2
src/Mod/TechDraw/App/DrawViewImage.h
View File

@@ -43,7 +43,7 @@ class TechDrawExport DrawViewImage : public TechDraw::DrawView
public:
/// Constructor
DrawViewImage();
virtual ~DrawViewImage();
~DrawViewImage() override;
App::PropertyFile ImageFile;
App::PropertyFileIncluded ImageIncluded;

10
src/Mod/TechDraw/App/DrawViewMulti.h
View File

@@ -55,20 +55,20 @@ class TechDrawExport DrawViewMulti : public DrawViewPart
public:
/// Constructor
DrawViewMulti();
virtual ~DrawViewMulti();
~DrawViewMulti() override;
App::PropertyLinkList Sources;
virtual short mustExecute() const override;
short mustExecute() const override;
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute() override;
virtual void onChanged(const App::Property* prop) override;
App::DocumentObjectExecReturn *execute() override;
void onChanged(const App::Property* prop) override;
//@}
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderViewPart";
}

18
src/Mod/TechDraw/App/DrawViewPart.h
View File

@@ -81,7 +81,7 @@ class TechDrawExport DrawViewPart : public DrawView, public CosmeticExtension
public:
DrawViewPart();
virtual ~DrawViewPart();
~DrawViewPart() override;
App::PropertyLinkList Source;
App::PropertyXLinkList XSource;
@@ -103,13 +103,13 @@ public:
App::PropertyBool IsoHidden;
App::PropertyInteger IsoCount;
virtual short mustExecute() const override;
virtual void onDocumentRestored() override;
virtual App::DocumentObjectExecReturn *execute() override;
virtual const char* getViewProviderName() const override {
short mustExecute() const override;
void onDocumentRestored() override;
App::DocumentObjectExecReturn *execute() override;
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderViewPart";
}
virtual PyObject *getPyObject() override;
PyObject *getPyObject() override;
std::vector<TechDraw::DrawHatch*> getHatches() const;
std::vector<TechDraw::DrawGeomHatch*> getGeomHatches() const;
@@ -132,7 +132,7 @@ public:
virtual Base::BoundBox3d getBoundingBox() const;
double getBoxX() const;
double getBoxY() const;
virtual QRectF getRect() const override;
QRectF getRect() const override;
virtual std::vector<DrawViewSection*> getSectionRefs() const; //are there ViewSections based on this ViewPart?
virtual std::vector<DrawViewDetail*> getDetailRefs() const;
@@ -204,8 +204,8 @@ protected:
TechDraw::GeometryObject *geometryObject;
Base::BoundBox3d bbox;
virtual void onChanged(const App::Property* prop) override;
virtual void unsetupObject() override;
void onChanged(const App::Property* prop) override;
void unsetupObject() override;
virtual TechDraw::GeometryObject* buildGeometryObject(TopoDS_Shape shape, gp_Ax2 viewAxis); //const??
virtual TechDraw::GeometryObject* makeGeometryForShape(TopoDS_Shape shape); //const??

18
src/Mod/TechDraw/App/DrawViewSection.h
View File

@@ -62,7 +62,7 @@ class TechDrawExport DrawViewSection : public DrawViewPart
public:
DrawViewSection();
virtual ~DrawViewSection();
~DrawViewSection() override;
App::PropertyLink BaseView;
App::PropertyVector SectionNormal;
@@ -83,13 +83,13 @@ public:
bool isReallyInBox (const Base::Vector3d v, const Base::BoundBox3d bb) const;
bool isReallyInBox (const gp_Pnt p, const Bnd_Box& bb) const;
virtual App::DocumentObjectExecReturn *execute() override;
virtual void onChanged(const App::Property* prop) override;
virtual const char* getViewProviderName() const override {
App::DocumentObjectExecReturn *execute() override;
void onChanged(const App::Property* prop) override;
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderViewSection";
}
virtual void unsetupObject() override;
virtual short mustExecute() const override;
void unsetupObject() override;
short mustExecute() const override;
void sectionExec(TopoDS_Shape s);
@@ -102,7 +102,7 @@ public:
Base::Vector3d axis,
double degAngle) const;
gp_Ax2 getSectionCS() const;
virtual Base::Vector3d getXDirection() const override; //don't use XDirection.getValue()
Base::Vector3d getXDirection() const override; //don't use XDirection.getValue()
TechDraw::DrawViewPart* getBaseDVP() const;
TechDraw::DrawProjGroupItem* getBaseDPGI() const;
@@ -138,8 +138,8 @@ protected:
TopoDS_Shape m_cutShape;
virtual void onDocumentRestored() override;
virtual void setupObject() override;
void onDocumentRestored() override;
void setupObject() override;
void setupSvgIncluded();
void setupPatIncluded();
void replaceSvgIncluded(std::string newSvgFile);

10
src/Mod/TechDraw/App/DrawViewSpreadsheet.h
View File

@@ -39,7 +39,7 @@ class TechDrawExport DrawViewSpreadsheet : public TechDraw::DrawViewSymbol
public:
DrawViewSpreadsheet();
virtual ~DrawViewSpreadsheet();
~DrawViewSpreadsheet() override;
App::PropertyLink Source;
App::PropertyString CellStart;
App::PropertyString CellEnd;
@@ -49,16 +49,16 @@ public:
App::PropertyFloat TextSize;
virtual App::DocumentObjectExecReturn *execute();
virtual short mustExecute() const;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
std::string getSheetImage();
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderSpreadsheet";
}
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
std::vector<std::string> getAvailColumns();
std::string getSVGHead();
std::string getSVGTail();

14
src/Mod/TechDraw/App/DrawViewSymbol.h
View File

@@ -45,7 +45,7 @@ class TechDrawExport DrawViewSymbol : public TechDraw::DrawView
public:
/// Constructor
DrawViewSymbol();
virtual ~DrawViewSymbol();
~DrawViewSymbol() override;
App::PropertyString Symbol;
App::PropertyStringList EditableTexts;
@@ -53,21 +53,21 @@ public:
/** @name methods override Feature */
//@{
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute() override;
App::DocumentObjectExecReturn *execute() override;
//@}
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderSymbol";
}
virtual QRectF getRect() const override;
virtual bool checkFit(TechDraw::DrawPage* p) const override;
QRectF getRect() const override;
bool checkFit(TechDraw::DrawPage* p) const override;
//return PyObject as DrawViewSymbolPy
virtual PyObject *getPyObject() override;
PyObject *getPyObject() override;
protected:
virtual void onChanged(const App::Property* prop) override;
void onChanged(const App::Property* prop) override;
Base::BoundBox3d bbox;
std::vector<std::string> getEditableFields();

16
src/Mod/TechDraw/App/DrawWeldSymbol.h
View File

@@ -40,7 +40,7 @@ class TechDrawExport DrawWeldSymbol : public TechDraw::DrawView
public:
DrawWeldSymbol();
virtual ~DrawWeldSymbol();
~DrawWeldSymbol() override;
App::PropertyLink Leader;
App::PropertyBool AllAround;
@@ -48,21 +48,21 @@ public:
App::PropertyBool AlternatingWeld;
App::PropertyString TailText;
virtual short mustExecute() const;
virtual App::DocumentObjectExecReturn *execute();
virtual void onSettingDocument();
short mustExecute() const override;
App::DocumentObjectExecReturn *execute() override;
void onSettingDocument() override;
virtual const char* getViewProviderName() const {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderWeld";
}
virtual PyObject *getPyObject();
virtual QRectF getRect() const { return QRectF(0,0,1,1);}
PyObject *getPyObject() override;
QRectF getRect() const override { return QRectF(0,0,1,1);}
bool isTailRightSide();
std::vector<DrawTileWeld*> getTiles() const;
protected:
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
private:
};

32
src/Mod/TechDraw/App/Geometry.h
View File

@@ -163,12 +163,12 @@ class TechDrawExport Circle: public BaseGeom
Circle();
Circle(const TopoDS_Edge &e);
Circle(Base::Vector3d center, double radius);
virtual ~Circle() = default;
~Circle() override = default;
public:
virtual std::string toString() const override;
virtual void Save(Base::Writer& w) const override;
virtual void Restore(Base::XMLReader& r) override;
std::string toString() const override;
void Save(Base::Writer& w) const override;
void Restore(Base::XMLReader& r) override;
Base::Vector3d center;
double radius;
@@ -179,7 +179,7 @@ class TechDrawExport Ellipse: public BaseGeom
public:
Ellipse(const TopoDS_Edge &e);
Ellipse(Base::Vector3d c, double mnr, double mjr);
virtual ~Ellipse() = default;
~Ellipse() override = default;
public:
Base::Vector3d center;
@@ -194,7 +194,7 @@ class TechDrawExport AOE: public Ellipse
{
public:
AOE(const TopoDS_Edge &e);
~AOE() = default;
~AOE() override = default;
public:
Base::Vector3d startPnt; //TODO: The points are used for drawing, the angles for bounding box calcs - seems redundant
@@ -218,12 +218,12 @@ class TechDrawExport AOC: public Circle
AOC(const TopoDS_Edge &e);
AOC(Base::Vector3d c, double r, double s, double e);
AOC();
~AOC() = default;
~AOC() override = default;
public:
virtual std::string toString() const override;
virtual void Save(Base::Writer& w) const override;
virtual void Restore(Base::XMLReader& r) override;
std::string toString() const override;
void Save(Base::Writer& w) const override;
void Restore(Base::XMLReader& r) override;
Base::Vector3d startPnt;
Base::Vector3d endPnt;
@@ -249,7 +249,7 @@ class TechDrawExport BezierSegment: public BaseGeom
public:
BezierSegment(const TopoDS_Edge &e);
BezierSegment() { poles = degree = 0; }
~BezierSegment() = default;
~BezierSegment() override = default;
int poles;
int degree;
@@ -261,7 +261,7 @@ class TechDrawExport BSpline: public BaseGeom
{
public:
BSpline(const TopoDS_Edge &e);
~BSpline() = default;
~BSpline() override = default;
public:
Base::Vector3d startPnt;
@@ -286,11 +286,11 @@ class TechDrawExport Generic: public BaseGeom
public:
Generic(const TopoDS_Edge &e);
Generic();
~Generic() = default;
~Generic() override = default;
virtual std::string toString() const override;
virtual void Save(Base::Writer& w) const override;
virtual void Restore(Base::XMLReader& r) override;
std::string toString() const override;
void Save(Base::Writer& w) const override;
void Restore(Base::XMLReader& r) override;
Base::Vector3d asVector();
double slope();
Base::Vector3d apparentInter(GenericPtr g);

22
src/Mod/TechDraw/App/LandmarkDimension.h
View File

@@ -46,30 +46,30 @@ class TechDrawExport LandmarkDimension : public TechDraw::DrawViewDimension
public:
/// Constructor
LandmarkDimension();
virtual ~LandmarkDimension();
~LandmarkDimension() override;
App::PropertyStringList ReferenceTags; //tags of 2d vertices in DVP
virtual App::DocumentObjectExecReturn *execute() override;
App::DocumentObjectExecReturn *execute() override;
short mustExecute() const override;
virtual void unsetupObject() override;
void unsetupObject() override;
virtual const char* getViewProviderName() const override {
const char* getViewProviderName() const override {
return "TechDrawGui::ViewProviderDimension"; }
/* virtual PyObject *getPyObject(void) override;*/
virtual bool checkReferences2D() const override;
virtual bool has2DReferences() const override;
virtual pointPair getPointsTwoVerts() override;
bool checkReferences2D() const override;
bool has2DReferences() const override;
pointPair getPointsTwoVerts() override;
std::vector<Base::Vector3d> get2DPoints() const;
virtual DrawViewPart* getViewPart() const override;
virtual int getRefType() const override;
DrawViewPart* getViewPart() const override;
int getRefType() const override;
gp_Ax2 getProjAxis() const;
protected:
virtual void onChanged(const App::Property* prop) override;
virtual void onDocumentRestored() override;
void onChanged(const App::Property* prop) override;
void onDocumentRestored() override;
Base::Vector3d projectPoint(const Base::Vector3d& pt, DrawViewPart* dvp) const;