Mod: Use override etc 2

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

View File

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

View File

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

View File

@@ -37,15 +37,15 @@ class DlgPrefsTechDrawAnnotationImp : public Gui::Dialog::PreferencePage
public:
DlgPrefsTechDrawAnnotationImp( QWidget* parent = nullptr );
~DlgPrefsTechDrawAnnotationImp();
~DlgPrefsTechDrawAnnotationImp() override;
public Q_SLOTS:
void onLineGroupChanged(int);
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
int prefBalloonArrow() const;

View File

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

View File

@@ -37,12 +37,12 @@ class DlgPrefsTechDrawDimensionsImp : public Gui::Dialog::PreferencePage
public:
DlgPrefsTechDrawDimensionsImp( QWidget* parent = nullptr );
~DlgPrefsTechDrawDimensionsImp();
~DlgPrefsTechDrawDimensionsImp() override;
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
int prefArrowStyle() const;

View File

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

View File

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

View File

@@ -37,15 +37,15 @@ class DlgPrefsTechDrawScaleImp : public Gui::Dialog::PreferencePage
public:
DlgPrefsTechDrawScaleImp( QWidget* parent = nullptr );
~DlgPrefsTechDrawScaleImp();
~DlgPrefsTechDrawScaleImp() override;
protected Q_SLOTS:
void onScaleTypeChanged(int index);
protected:
void saveSettings();
void loadSettings();
void changeEvent(QEvent *e);
void saveSettings() override;
void loadSettings() override;
void changeEvent(QEvent *e) override;
private:
std::unique_ptr<Ui_DlgPrefsTechDrawScaleImp> ui;

View File

@@ -37,18 +37,18 @@ class DlgTemplateField : public QDialog
public:
DlgTemplateField( QWidget *parent = nullptr );
virtual ~DlgTemplateField() = default;
~DlgTemplateField() override = default;
void setFieldName(std::string name);
void setFieldContent(std::string content);
QString getFieldContent();
public Q_SLOTS:
void accept();
void reject();
void accept() override;
void reject() override;
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
private:
std::shared_ptr<Ui_dlgTemplateField> ui;

View File

@@ -61,13 +61,13 @@ class TechDrawGuiExport MDIViewPage : public Gui::MDIView, public Gui::Selection
public:
MDIViewPage(ViewProviderPage *page, Gui::Document* doc, QWidget* parent = nullptr);
virtual ~MDIViewPage();
~MDIViewPage() override;
void addChildrenToPage();
/// Observer message from the Tree Selection mechanism
void onSelectionChanged(const Gui::SelectionChanges& msg);
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
void preSelectionChanged(const QPoint &pos);
/// QGraphicsScene selection routines
@@ -80,14 +80,14 @@ public:
void fixOrphans(bool force = false);
void matchSceneRectToTemplate();
bool onMsg(const char* pMsg,const char** ppReturn);
bool onHasMsg(const char* pMsg) const;
bool onMsg(const char* pMsg,const char** ppReturn) override;
bool onHasMsg(const char* pMsg) const override;
void print();
void print(QPrinter* printer);
void printPdf();
void print() override;
void print(QPrinter* printer) override;
void printPdf() override;
void printPdf(std::string file);
void printPreview();
void printPreview() override;
void saveSVG(std::string file);
void saveDXF(std::string file);
@@ -95,7 +95,7 @@ public:
void setDocumentObject(const std::string&);
void setDocumentName(const std::string&);
PyObject* getPyObject();
PyObject* getPyObject() override;
TechDraw::DrawPage * getPage() { return m_vpPage->getDrawPage(); }
QGVPage* getQGVPage() {return m_view;}
@@ -113,10 +113,10 @@ public:
bool addView(const App::DocumentObject *obj);
static MDIViewPage *getFromScene(const QGSPage *scene);
void contextMenuEvent(QContextMenuEvent *event);
void contextMenuEvent(QContextMenuEvent *event) override;
public Q_SLOTS:
void viewAll();
void viewAll() override;
void saveSVG();
void saveDXF();
void savePDF();
@@ -134,7 +134,7 @@ protected:
/// Attaches view of obj to m_scene. Returns true on success, false otherwise
bool attachView(App::DocumentObject *obj);
void closeEvent(QCloseEvent*);
void closeEvent(QCloseEvent*) override;
void setDimensionGroups();
void setBalloonGroups();
@@ -183,10 +183,10 @@ public:
static void init_type();
MDIViewPagePy(MDIViewPage *mdi);
~MDIViewPagePy();
~MDIViewPagePy() override;
Py::Object repr();
Py::Object getattr(const char *);
Py::Object repr() override;
Py::Object getattr(const char *) override;
Py::Object getPage(const Py::Tuple&);
Py::Object cast_to_base(const Py::Tuple&);

View File

@@ -43,13 +43,13 @@ class TechDrawGuiExport QGCustomClip : public QGraphicsItemGroup
{
public:
explicit QGCustomClip();
~QGCustomClip() {}
~QGCustomClip() override {}
enum {Type = QGraphicsItem::UserType + 132};
int type() const { return Type;}
virtual QRectF boundingRect() const;
int type() const override { return Type;}
QRectF boundingRect() const override;
void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr );
void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override;
virtual void centerAt(QPointF centerPos);
virtual void centerAt(double cX, double cY);
virtual void setRect(QRectF r);

View File

@@ -45,12 +45,12 @@ class TechDrawGuiExport QGCustomImage : public QGraphicsPixmapItem
{
public:
explicit QGCustomImage();
~QGCustomImage();
~QGCustomImage() override;
enum {Type = QGraphicsItem::UserType + 201};
int type() const override { return Type;}
virtual void paint( QPainter *painter,
void paint( QPainter *painter,
const QStyleOptionGraphicsItem *option,
QWidget *widget = nullptr ) override;
virtual void centerAt(QPointF centerPos);

View File

@@ -52,13 +52,13 @@ class QGIFace : public QGIPrimPath
{
public:
explicit QGIFace(int index = -1);
~QGIFace();
~QGIFace() override;
enum {Type = QGraphicsItem::UserType + 104};
int type() const override { return Type;}
QRectF boundingRect() const override;
QPainterPath shape() const override;
virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override;
void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override;
public:
enum fillMode {
@@ -74,9 +74,9 @@ public:
int getProjIndex() const { return projIndex; }
void draw();
virtual void setPrettyNormal() override;
virtual void setPrettyPre() override;
virtual void setPrettySel() override;
void setPrettyNormal() override;
void setPrettyPre() override;
void setPrettySel() override;
void setDrawEdges(bool b);
virtual void setOutline(const QPainterPath& path);

View File

@@ -57,17 +57,17 @@ public:
enum {Type = QGraphicsItem::UserType + 232};
explicit QGILeaderLine();
~QGILeaderLine() = default;
~QGILeaderLine() override = default;
int type() const override { return Type;}
virtual void paint( QPainter * painter,
void paint( QPainter * painter,
const QStyleOptionGraphicsItem * option,
QWidget * widget = nullptr ) override;
virtual QRectF boundingRect() const override;
virtual QPainterPath shape() const override;
QRectF boundingRect() const override;
QPainterPath shape() const override;
virtual void drawBorder() override;
virtual void updateView(bool update = false) override;
void drawBorder() override;
void updateView(bool update = false) override;
virtual TechDraw::DrawLeaderLine* getFeature();
@@ -80,11 +80,11 @@ public:
double getLineWidth();
double getEdgeFuzz() const;
virtual void mousePressEvent(QGraphicsSceneMouseEvent * event) override;
void mousePressEvent(QGraphicsSceneMouseEvent * event) override;
//void mouseMoveEvent(QGraphicsSceneMouseEvent * event) override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override;
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override;
void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
void setPrettyNormal();
void setPrettyPre();
@@ -94,18 +94,18 @@ public:
public Q_SLOTS:
void onLineEditFinished(QPointF attach, std::vector<QPointF> deltas); //QGEPath is finished editing points
virtual void onSourceChange(TechDraw::DrawView* newParent) override;
void onSourceChange(TechDraw::DrawView* newParent) override;
Q_SIGNALS:
void editComplete(); //tell caller that edit session is finished
protected:
virtual void draw() override;
void draw() override;
QPainterPath makeLeaderPath(std::vector<QPointF> qPoints);
std::vector<QPointF> getWayPointsFromFeature();
QPointF getAttachFromFeature();
virtual QVariant itemChange( GraphicsItemChange change,
QVariant itemChange( GraphicsItemChange change,
const QVariant &value ) override;
std::vector<QPointF> m_pathPoints;

View File

@@ -43,13 +43,13 @@ class TechDrawGuiExport QGIMatting : public QGraphicsItemGroup
{
public:
explicit QGIMatting();
~QGIMatting() {}
~QGIMatting() override {}
enum {Type = QGraphicsItem::UserType + 205};
int type() const { return Type;}
int type() const override { return Type;}
virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr );
virtual QRectF boundingRect() const;
void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override;
QRectF boundingRect() const override;
virtual void setSize(double w, double h) {m_height = h; m_width = w;}
//virtual void setHoleStyle(int hs) {m_holeStyle = hs;}

View File

@@ -42,25 +42,25 @@ public:
QGIProjGroup();
// TODO: if the QGIVO is deleted, should we clean up any remaining QGIVParts??
~QGIProjGroup() = default;
~QGIProjGroup() override = default;
enum {Type = QGraphicsItem::UserType + 113};
int type() const override { return Type;}
void alignTo(QGIProjGroup *, const QString &alignment);
virtual void updateView(bool update = false) override;
virtual void rotateView() override;
void updateView(bool update = false) override;
void rotateView() override;
virtual void drawBorder() override;
void drawBorder() override;
protected:
virtual bool sceneEventFilter(QGraphicsItem* watched, QEvent *event) override;
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
bool sceneEventFilter(QGraphicsItem* watched, QEvent *event) override;
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
// Mouse handling
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event ) override;
virtual void mousePressEvent(QGraphicsSceneMouseEvent * event) override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override;
void mouseMoveEvent(QGraphicsSceneMouseEvent * event ) override;
void mousePressEvent(QGraphicsSceneMouseEvent * event) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override;
QGIView * getAnchorQItem() const;
private:

View File

@@ -75,12 +75,12 @@ class TechDrawGuiExport QGIView : public QObject, public QGraphicsItemGroup
Q_OBJECT
public:
QGIView();
virtual ~QGIView();
~QGIView() override;
enum {Type = QGraphicsItem::UserType + 101};
int type() const override { return Type;}
virtual QRectF boundingRect() const override;
virtual void paint( QPainter *painter,
QRectF boundingRect() const override;
void paint( QPainter *painter,
const QStyleOptionGraphicsItem *option,
QWidget *widget = nullptr ) override;

View File

@@ -41,22 +41,22 @@ public:
explicit QGIViewAnnotation();
/// m_textItem belongs to this group and will be deleted by Qt
~QGIViewAnnotation() = default;
~QGIViewAnnotation() override = default;
enum {Type = QGraphicsItem::UserType + 120};
int type() const override { return Type;}
virtual void updateView(bool update = false) override;
void updateView(bool update = false) override;
void setViewAnnoFeature(TechDraw::DrawViewAnnotation *obj);
virtual void draw() override;
virtual void rotateView() override;
void draw() override;
void rotateView() override;
protected:
void drawAnnotation();
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
QGCustomText *m_textItem;
QColor m_colNormal;

View File

@@ -59,14 +59,14 @@ Q_OBJECT
public:
QGIBalloonLabel();
virtual ~QGIBalloonLabel() = default;
~QGIBalloonLabel() override = default;
enum {Type = QGraphicsItem::UserType + 141};
int type() const override { return Type;}
virtual QRectF boundingRect() const override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
virtual void paint( QPainter *painter,
QRectF boundingRect() const override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
void paint( QPainter *painter,
const QStyleOptionGraphicsItem *option,
QWidget *widget = nullptr ) override;
void setLabelCenter();
@@ -100,12 +100,12 @@ Q_SIGNALS:
void dragFinished();
protected:
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
// virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override;
QGCustomText* m_labelText;
@@ -129,14 +129,14 @@ public:
enum {Type = QGraphicsItem::UserType + 140};
explicit QGIViewBalloon();
virtual ~QGIViewBalloon() = default;
~QGIViewBalloon() override = default;
void setViewPartFeature(TechDraw::DrawViewBalloon *obj);
int type() const override { return Type;}
virtual void drawBorder() override;
virtual void updateView(bool update = false) override;
virtual void paint( QPainter * painter,
void drawBorder() override;
void updateView(bool update = false) override;
void paint( QPainter * painter,
const QStyleOptionGraphicsItem * option,
QWidget * widget = nullptr ) override;
@@ -147,10 +147,10 @@ public:
void setPrettySel();
void setPrettyNormal();
virtual void setGroupSelection(bool b) override;
void setGroupSelection(bool b) override;
virtual QGIBalloonLabel* getBalloonLabel() { return balloonLabel; }
virtual QColor getNormalColor() override;
QColor getNormalColor() override;
int prefDefaultArrow() const;
bool prefOrthoPyramid() const;
@@ -163,13 +163,13 @@ public Q_SLOTS:
void updateBalloon(bool obtuse = false);
protected:
virtual void mousePressEvent( QGraphicsSceneMouseEvent * event) override;
virtual void mouseMoveEvent( QGraphicsSceneMouseEvent * event) override;
virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override;
void mousePressEvent( QGraphicsSceneMouseEvent * event) override;
void mouseMoveEvent( QGraphicsSceneMouseEvent * event) override;
void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override;
void draw() override;
void drawBalloon(bool dragged = false);
virtual QVariant itemChange( GraphicsItemChange change,
QVariant itemChange( GraphicsItemChange change,
const QVariant &value ) override;
virtual void setSvgPens();
virtual void setPens();

View File

@@ -35,20 +35,20 @@ class TechDrawGuiExport QGIViewClip : public QGIView
public:
QGIViewClip();
~QGIViewClip() = default;
~QGIViewClip() override = default;
enum {Type = QGraphicsItem::UserType + 123};
int type() const override { return Type;}
virtual void updateView(bool update = false) override;
void updateView(bool update = false) override;
virtual void draw() override;
void draw() override;
QGCustomRect* getFrame() {return m_frame;}
QGCustomClip* getClipArea() {return m_cliparea;}
protected:
void drawClip();
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
private:
QGCustomRect* m_frame;

View File

@@ -37,16 +37,16 @@ class TechDrawGuiExport QGIViewCollection : public QGIView
{
public:
QGIViewCollection();
~QGIViewCollection() = default;
~QGIViewCollection() override = default;
enum {Type = QGraphicsItem::UserType + 110};
int type() const override { return Type;}
virtual void updateView(bool update = false) override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override;
void updateView(bool update = false) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent * event) override;
protected:
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
};

View File

@@ -61,14 +61,14 @@ Q_OBJECT
public:
QGIDatumLabel();
virtual ~QGIDatumLabel() = default;
~QGIDatumLabel() override = default;
enum {Type = QGraphicsItem::UserType + 107};
int type() const override { return Type;}
virtual QRectF boundingRect() const override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
virtual void paint( QPainter *painter,
QRectF boundingRect() const override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
void paint( QPainter *painter,
const QStyleOptionGraphicsItem *option,
QWidget *widget = nullptr ) override;
void setLabelCenter();
@@ -115,12 +115,12 @@ Q_SIGNALS:
void dragFinished();
protected:
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) override;
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) override;
// virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override;
QGCustomText* m_dimText;
@@ -150,25 +150,25 @@ public:
enum {Type = QGraphicsItem::UserType + 106};
explicit QGIViewDimension();
~QGIViewDimension() = default;
~QGIViewDimension() override = default;
void setViewPartFeature(TechDraw::DrawViewDimension *obj);
int type() const override { return Type;}
virtual QRectF boundingRect() const override;
virtual void paint( QPainter * painter,
QRectF boundingRect() const override;
void paint( QPainter * painter,
const QStyleOptionGraphicsItem * option,
QWidget * widget = nullptr ) override;
TechDraw::DrawViewDimension *dvDimension;
virtual void drawBorder() override;
virtual void updateView(bool update = false) override;
void drawBorder() override;
void updateView(bool update = false) override;
virtual QColor prefNormalColor();
QString getLabelText();
void setPrettyPre();
void setPrettySel();
void setPrettyNormal();
virtual void setGroupSelection(bool b) override;
void setGroupSelection(bool b) override;
virtual QGIDatumLabel* getDatumLabel() { return datumLabel; }
void setNormalColorAll();
@@ -183,9 +183,9 @@ public Q_SLOTS:
protected:
virtual void mousePressEvent( QGraphicsSceneMouseEvent * event) override;
virtual void mouseMoveEvent( QGraphicsSceneMouseEvent * event) override;
virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override;
void mousePressEvent( QGraphicsSceneMouseEvent * event) override;
void mouseMoveEvent( QGraphicsSceneMouseEvent * event) override;
void mouseReleaseEvent( QGraphicsSceneMouseEvent * event) override;
static double getAnglePlacementFactor(double testAngle, double endAngle, double startRotation);
static int compareAngleStraightness(double straightAngle, double leftAngle, double rightAngle,
@@ -257,7 +257,7 @@ protected:
void drawDiameter(TechDraw::DrawViewDimension *dimension, ViewProviderDimension *viewProvider) const;
void drawAngle(TechDraw::DrawViewDimension *dimension, ViewProviderDimension *viewProvider) const;
virtual QVariant itemChange( GraphicsItemChange change,
QVariant itemChange( GraphicsItemChange change,
const QVariant &value ) override;
virtual void setSvgPens();
virtual void setPens();

View File

@@ -38,16 +38,16 @@ class TechDrawGuiExport QGIViewImage : public QGIView
{
public:
QGIViewImage();
~QGIViewImage();
~QGIViewImage() override;
enum {Type = QGraphicsItem::UserType + 200};
int type() const override { return Type;}
virtual void updateView(bool update = false) override;
void updateView(bool update = false) override;
void setViewImageFeature(TechDraw::DrawViewImage *obj);
virtual void draw() override;
virtual void rotateView() override;
void draw() override;
void rotateView() override;
protected:
virtual void drawImage();

View File

@@ -49,11 +49,11 @@ class TechDrawGuiExport QGIViewPart : public QGIView
public:
explicit QGIViewPart();
~QGIViewPart();
~QGIViewPart() override;
enum {Type = QGraphicsItem::UserType + 102};
int type() const override { return Type;}
virtual void paint( QPainter * painter,
void paint( QPainter * painter,
const QStyleOptionGraphicsItem * option,
QWidget * widget = nullptr ) override;
@@ -61,9 +61,9 @@ public:
void toggleCache(bool state) override;
void toggleCosmeticLines(bool state);
void setViewPartFeature(TechDraw::DrawViewPart *obj);
virtual void updateView(bool update = false) override;
void updateView(bool update = false) override;
void tidy();
virtual QRectF boundingRect() const override;
QRectF boundingRect() const override;
virtual void drawAllSectionLines();
virtual void drawSectionLine(TechDraw::DrawViewSection* s, bool b);
virtual void drawCenterLines(bool b);
@@ -71,8 +71,8 @@ public:
virtual void drawMatting();
bool showSection;
virtual void draw() override;
virtual void rotateView() override;
void draw() override;
void rotateView() override;
static QPainterPath geomToPainterPath(TechDraw::BaseGeomPtr baseGeom, double rotation = 0.0);
@@ -99,7 +99,7 @@ protected:
void drawViewPart();
QGIFace* drawFace(TechDraw::FacePtr f, int idx);
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
TechDraw::DrawHatch* faceIsHatched(int i,std::vector<TechDraw::DrawHatch*> hatchObjs) const;
TechDraw::DrawGeomHatch* faceIsGeomHatched(int i,std::vector<TechDraw::DrawGeomHatch*> geomObjs) const;

View File

@@ -33,10 +33,10 @@ class TechDrawGuiExport QGIViewSection : public QGIViewPart
public:
QGIViewSection() = default;
~QGIViewSection() = default;
~QGIViewSection() override = default;
virtual void draw() override;
virtual void updateView(bool update = false) override;
void draw() override;
void updateView(bool update = false) override;
enum {Type = QGraphicsItem::UserType + 108};
int type() const override { return Type;}
void drawSectionLine(TechDraw::DrawViewSection* s, bool b) override;

View File

@@ -36,7 +36,7 @@ class TechDrawGuiExport QGIViewSpreadsheet : public QGIViewSymbol
{
public:
QGIViewSpreadsheet();
~QGIViewSpreadsheet() = default;
~QGIViewSpreadsheet() override = default;
enum {Type = QGraphicsItem::UserType + 124};
int type() const override { return Type;}

View File

@@ -42,16 +42,16 @@ class TechDrawGuiExport QGIViewSymbol : public QGIView
{
public:
QGIViewSymbol();
~QGIViewSymbol();
~QGIViewSymbol() override;
enum {Type = QGraphicsItem::UserType + 121};
int type() const override { return Type;}
virtual void updateView(bool update = false) override;
void updateView(bool update = false) override;
void setViewSymbolFeature(TechDraw::DrawViewSymbol *obj);
virtual void draw() override;
virtual void rotateView() override;
void draw() override;
void rotateView() override;
protected:

View File

@@ -61,18 +61,18 @@ public:
enum {Type = QGraphicsItem::UserType + 340};
explicit QGIWeldSymbol(QGILeaderLine* myParent = nullptr);
~QGIWeldSymbol() = default;
~QGIWeldSymbol() override = default;
int type() const override { return Type;}
virtual void paint( QPainter * painter,
void paint( QPainter * painter,
const QStyleOptionGraphicsItem * option,
QWidget * widget = nullptr ) override;
virtual QRectF boundingRect() const override;
virtual QPainterPath shape() const override;
QRectF boundingRect() const override;
QPainterPath shape() const override;
double getEdgeFuzz() const;
virtual void drawBorder() override;
virtual void updateView(bool update = false) override;
void drawBorder() override;
void updateView(bool update = false) override;
virtual TechDraw::DrawWeldSymbol* getFeature();
virtual void setFeature(TechDraw::DrawWeldSymbol* feat);
@@ -88,12 +88,12 @@ public:
void getTileFeats();
protected:
virtual QVariant itemChange( GraphicsItemChange change,
QVariant itemChange( GraphicsItemChange change,
const QVariant &value ) override;
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
virtual void draw() override;
void draw() override;
void drawTile(TechDraw::DrawTileWeld* tileFeat);
void drawAllAround();
void drawTailText();

View File

@@ -70,7 +70,7 @@ class TechDrawGuiExport QGSPage : public QGraphicsScene
public:
QGSPage(ViewProviderPage *vp, QWidget *parent = nullptr);
virtual ~QGSPage();
~QGSPage() override;
QGIView * addViewDimension(TechDraw::DrawViewDimension *dim);
QGIView * addViewBalloon(TechDraw::DrawViewBalloon *balloon);

View File

@@ -49,15 +49,15 @@ public:
enum TrackerMode { None, Line, Circle, Rectangle, Point };
explicit QGTracker(QGSPage* scene = nullptr, QGTracker::TrackerMode m = QGTracker::TrackerMode::None);
~QGTracker();
~QGTracker() override;
enum {Type = QGraphicsItem::UserType + 210};
int type() const override { return Type;}
virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override;
virtual QPainterPath shape() const override;
virtual QRectF boundingRect() const override;
void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override;
QPainterPath shape() const override;
QRectF boundingRect() const override;
void onMousePress(QPointF);
void onMouseMove(QPointF pos);
@@ -82,15 +82,15 @@ Q_SIGNALS:
void qViewPicked(QPointF pos, TechDrawGui::QGIView* qgParent);
protected:
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
virtual void hoverMoveEvent(QGraphicsSceneHoverEvent* event) override;
virtual void keyPressEvent(QKeyEvent * event) override;
void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
void hoverMoveEvent(QGraphicsSceneHoverEvent* event) override;
void keyPressEvent(QKeyEvent * event) override;
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
void getPickedQGIV(QPointF pos);
QColor getTrackerColor();

View File

@@ -62,7 +62,7 @@ class TechDrawGuiExport QGVNavStyle : public Base::BaseClass
{
public:
QGVNavStyle(QGVPage* qgvp);
virtual ~QGVNavStyle();
~QGVNavStyle() override;
void setViewer(QGVPage* qgvp) { m_viewer = qgvp;} ;
QGVPage* getViewer() { return m_viewer;};

View File

@@ -36,15 +36,15 @@ class TechDrawGuiExport QGVNavStyleBlender : public QGVNavStyle
{
public:
QGVNavStyleBlender(QGVPage* qgvp);
virtual ~QGVNavStyleBlender();
~QGVNavStyleBlender() override;
virtual void handleKeyReleaseEvent(QKeyEvent *event) override;
virtual void handleMousePressEvent(QMouseEvent *event) override;
virtual void handleMouseMoveEvent(QMouseEvent *event) override;
virtual void handleMouseReleaseEvent(QMouseEvent *event) override;
void handleKeyReleaseEvent(QKeyEvent *event) override;
void handleMousePressEvent(QMouseEvent *event) override;
void handleMouseMoveEvent(QMouseEvent *event) override;
void handleMouseReleaseEvent(QMouseEvent *event) override;
//context menu (RMB) prevents pan mode 2 (LMB + RMB)
virtual bool allowContextMenu(QContextMenuEvent *event) override;
bool allowContextMenu(QContextMenuEvent *event) override;
protected:
private:

View File

@@ -36,15 +36,15 @@ class TechDrawGuiExport QGVNavStyleCAD : public QGVNavStyle
{
public:
QGVNavStyleCAD(QGVPage* qgvp);
virtual ~QGVNavStyleCAD();
~QGVNavStyleCAD() override;
virtual void handleKeyReleaseEvent(QKeyEvent *event) override;
virtual void handleMousePressEvent(QMouseEvent *event) override;
virtual void handleMouseMoveEvent(QMouseEvent *event) override;
virtual void handleMouseReleaseEvent(QMouseEvent *event) override;
void handleKeyReleaseEvent(QKeyEvent *event) override;
void handleMousePressEvent(QMouseEvent *event) override;
void handleMouseMoveEvent(QMouseEvent *event) override;
void handleMouseReleaseEvent(QMouseEvent *event) override;
//context menu (RMB) prevents pan mode 2 (LMB + RMB)
virtual bool allowContextMenu(QContextMenuEvent *event) override;
bool allowContextMenu(QContextMenuEvent *event) override;
protected:
private:

View File

@@ -36,13 +36,13 @@ class TechDrawGuiExport QGVNavStyleGesture : public QGVNavStyle
{
public:
QGVNavStyleGesture(QGVPage* qgvp);
virtual ~QGVNavStyleGesture();
~QGVNavStyleGesture() override;
virtual void handleMousePressEvent(QMouseEvent *event) override;
virtual void handleMouseMoveEvent(QMouseEvent *event) override;
virtual void handleMouseReleaseEvent(QMouseEvent *event) override;
void handleMousePressEvent(QMouseEvent *event) override;
void handleMouseMoveEvent(QMouseEvent *event) override;
void handleMouseReleaseEvent(QMouseEvent *event) override;
virtual bool allowContextMenu(QContextMenuEvent *event) override;
bool allowContextMenu(QContextMenuEvent *event) override;
protected:
private:

View File

@@ -36,11 +36,11 @@ class TechDrawGuiExport QGVNavStyleInventor : public QGVNavStyle
{
public:
QGVNavStyleInventor(QGVPage* qgvp);
virtual ~QGVNavStyleInventor();
~QGVNavStyleInventor() override;
virtual void handleMousePressEvent(QMouseEvent *event) override;
virtual void handleMouseMoveEvent(QMouseEvent *event) override;
virtual void handleMouseReleaseEvent(QMouseEvent *event) override;
void handleMousePressEvent(QMouseEvent *event) override;
void handleMouseMoveEvent(QMouseEvent *event) override;
void handleMouseReleaseEvent(QMouseEvent *event) override;
protected:
private:

View File

@@ -36,14 +36,14 @@ class TechDrawGuiExport QGVNavStyleMaya : public QGVNavStyle
{
public:
QGVNavStyleMaya(QGVPage* qgvp);
virtual ~QGVNavStyleMaya();
~QGVNavStyleMaya() override;
virtual void handleKeyReleaseEvent(QKeyEvent *event) override;
virtual void handleMousePressEvent(QMouseEvent *event) override;
virtual void handleMouseMoveEvent(QMouseEvent *event) override;
virtual void handleMouseReleaseEvent(QMouseEvent *event) override;
void handleKeyReleaseEvent(QKeyEvent *event) override;
void handleMousePressEvent(QMouseEvent *event) override;
void handleMouseMoveEvent(QMouseEvent *event) override;
void handleMouseReleaseEvent(QMouseEvent *event) override;
virtual bool allowContextMenu(QContextMenuEvent *event) override;
bool allowContextMenu(QContextMenuEvent *event) override;
protected:
private:

View File

@@ -36,15 +36,15 @@ class TechDrawGuiExport QGVNavStyleOCC : public QGVNavStyle
{
public:
QGVNavStyleOCC(QGVPage* qgvp);
virtual ~QGVNavStyleOCC();
~QGVNavStyleOCC() override;
virtual void handleKeyReleaseEvent(QKeyEvent *event) override;
virtual void handleMousePressEvent(QMouseEvent *event) override;
virtual void handleMouseMoveEvent(QMouseEvent *event) override;
virtual void handleMouseReleaseEvent(QMouseEvent *event) override;
void handleKeyReleaseEvent(QKeyEvent *event) override;
void handleMousePressEvent(QMouseEvent *event) override;
void handleMouseMoveEvent(QMouseEvent *event) override;
void handleMouseReleaseEvent(QMouseEvent *event) override;
//context menu (RMB) prevents pan mode 2 (RMB or CNTL+RMB)
virtual bool allowContextMenu(QContextMenuEvent *event) override;
bool allowContextMenu(QContextMenuEvent *event) override;
protected:
private:

View File

@@ -36,14 +36,14 @@ class TechDrawGuiExport QGVNavStyleOpenSCAD : public QGVNavStyle
{
public:
QGVNavStyleOpenSCAD(QGVPage* qgvp);
virtual ~QGVNavStyleOpenSCAD();
~QGVNavStyleOpenSCAD() override;
virtual void handleKeyReleaseEvent(QKeyEvent *event) override;
virtual void handleMouseMoveEvent(QMouseEvent *event) override;
virtual void handleMousePressEvent(QMouseEvent *event) override;
virtual void handleMouseReleaseEvent(QMouseEvent *event) override;
void handleKeyReleaseEvent(QKeyEvent *event) override;
void handleMouseMoveEvent(QMouseEvent *event) override;
void handleMousePressEvent(QMouseEvent *event) override;
void handleMouseReleaseEvent(QMouseEvent *event) override;
virtual bool allowContextMenu(QContextMenuEvent *event) override;
bool allowContextMenu(QContextMenuEvent *event) override;
protected:
private:

View File

@@ -36,13 +36,13 @@ class TechDrawGuiExport QGVNavStyleRevit : public QGVNavStyle
{
public:
QGVNavStyleRevit(QGVPage* qgvp);
virtual ~QGVNavStyleRevit();
~QGVNavStyleRevit() override;
virtual void handleMousePressEvent(QMouseEvent *event) override;
virtual void handleMouseMoveEvent(QMouseEvent *event) override;
virtual void handleMouseReleaseEvent(QMouseEvent *event) override;
void handleMousePressEvent(QMouseEvent *event) override;
void handleMouseMoveEvent(QMouseEvent *event) override;
void handleMouseReleaseEvent(QMouseEvent *event) override;
virtual bool allowContextMenu(QContextMenuEvent *event) override;
bool allowContextMenu(QContextMenuEvent *event) override;
protected:
private:

View File

@@ -38,11 +38,11 @@ class TechDrawGuiExport QGVNavStyleTinkerCAD : public QGVNavStyle
public:
QGVNavStyleTinkerCAD(QGVPage* qgvp);
virtual ~QGVNavStyleTinkerCAD();
~QGVNavStyleTinkerCAD() override;
virtual void handleMouseMoveEvent(QMouseEvent *event) override;
virtual void handleMousePressEvent(QMouseEvent *event) override;
virtual void handleMouseReleaseEvent(QMouseEvent *event) override;
void handleMouseMoveEvent(QMouseEvent *event) override;
void handleMousePressEvent(QMouseEvent *event) override;
void handleMouseReleaseEvent(QMouseEvent *event) override;
protected:
private:

View File

@@ -36,14 +36,14 @@ class TechDrawGuiExport QGVNavStyleTouchpad : public QGVNavStyle
{
public:
QGVNavStyleTouchpad(QGVPage* qgvp);
virtual ~QGVNavStyleTouchpad();
~QGVNavStyleTouchpad() override;
virtual void handleKeyPressEvent(QKeyEvent *event) override;
virtual void handleKeyReleaseEvent(QKeyEvent *event) override;
virtual void handleMouseMoveEvent(QMouseEvent *event) override;
void handleKeyPressEvent(QKeyEvent *event) override;
void handleKeyReleaseEvent(QKeyEvent *event) override;
void handleMouseMoveEvent(QMouseEvent *event) override;
protected:
virtual void setAnchor() override;
void setAnchor() override;
private:

View File

@@ -77,7 +77,7 @@ public:
enum RendererType { Native, OpenGL, Image };
QGVPage(ViewProviderPage *vp, QGSPage* s, QWidget *parent = nullptr);
virtual ~QGVPage();
~QGVPage() override;
void setRenderer(RendererType type = Native);
void drawBackground(QPainter *p, const QRectF &rect) override;

View File

@@ -90,24 +90,24 @@ class TaskDlgActiveView : public Gui::TaskView::TaskDialog
public:
TaskDlgActiveView(TechDraw::DrawPage* pageFeat);
~TaskDlgActiveView();
~TaskDlgActiveView() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();
void modifyStandardButtons(QDialogButtonBox* box);
void modifyStandardButtons(QDialogButtonBox* box) override;
protected:

View File

@@ -39,7 +39,7 @@ class TaskBalloon : public QWidget
public:
TaskBalloon(QGIViewBalloon *parent, ViewProviderBalloon *balloonVP);
~TaskBalloon();
~TaskBalloon() override;
public:
virtual bool accept();
@@ -70,20 +70,20 @@ class TaskDlgBalloon : public Gui::TaskView::TaskDialog
public:
TaskDlgBalloon(QGIViewBalloon *parent, ViewProviderBalloon *balloonVP);
~TaskDlgBalloon();
~TaskDlgBalloon() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();

View File

@@ -68,7 +68,7 @@ public:
TechDraw::DrawPage* page,
std::string edgeName,
bool editMode);
~TaskCenterLine();
~TaskCenterLine() override;
public Q_SLOTS:
@@ -85,7 +85,7 @@ public:
protected Q_SLOTS:
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void setUiConnect();
void setUiPrimary();
void setUiEdit();
@@ -140,24 +140,24 @@ public:
TechDraw::DrawPage* page,
std::string edgeName,
bool editMode);
~TaskDlgCenterLine();
~TaskDlgCenterLine() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();
void modifyStandardButtons(QDialogButtonBox* box);
void modifyStandardButtons(QDialogButtonBox* box) override;
protected:

View File

@@ -64,7 +64,7 @@ class TaskCosVertex : public QWidget
public:
TaskCosVertex(TechDraw::DrawViewPart* baseFeat,
TechDraw::DrawPage* page);
~TaskCosVertex();
~TaskCosVertex() override;
public Q_SLOTS:
void onTrackerClicked(bool b);
@@ -79,7 +79,7 @@ public:
void enableTaskButtons(bool b);
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void startTracker();
void removeTracker();
void abandonEditSession();
@@ -126,24 +126,24 @@ class TaskDlgCosVertex : public Gui::TaskView::TaskDialog
public:
TaskDlgCosVertex(TechDraw::DrawViewPart* baseFeat,
TechDraw::DrawPage* page);
~TaskDlgCosVertex();
~TaskDlgCosVertex() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();
void modifyStandardButtons(QDialogButtonBox* box);
void modifyStandardButtons(QDialogButtonBox* box) override;
protected:

View File

@@ -58,7 +58,7 @@ public:
std::vector<bool> is3d);
TaskCosmeticLine(TechDraw::DrawViewPart* baseFeat,
std::string edgeName);
~TaskCosmeticLine();
~TaskCosmeticLine() override;
public Q_SLOTS:
@@ -70,7 +70,7 @@ public:
protected Q_SLOTS:
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void setUiPrimary();
void setUiEdit();
@@ -103,20 +103,20 @@ public:
std::vector<bool> is3d);
TaskDlgCosmeticLine(TechDraw::DrawViewPart* baseFeat,
std::string edgeName);
~TaskDlgCosmeticLine();
~TaskDlgCosmeticLine() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();

View File

@@ -61,7 +61,7 @@ class TaskCustomizeFormat : public QWidget
public:
TaskCustomizeFormat(App::DocumentObject * object);
~TaskCustomizeFormat();
~TaskCustomizeFormat() override;
public Q_SLOTS:
@@ -77,7 +77,7 @@ private Q_SLOTS:
protected Q_SLOTS:
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void setUiEdit();
@@ -94,20 +94,20 @@ class TaskDlgCustomizeFormat : public Gui::TaskView::TaskDialog
public:
TaskDlgCustomizeFormat(App::DocumentObject * object);
~TaskDlgCustomizeFormat();
~TaskDlgCustomizeFormat() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();

View File

@@ -62,7 +62,7 @@ class TaskDetail : public QWidget
public:
TaskDetail(TechDraw::DrawViewPart* baseFeat);
TaskDetail(TechDraw::DrawViewDetail* detailFeat);
~TaskDetail();
~TaskDetail() override;
public Q_SLOTS:
void onDraggerClicked(bool b);
@@ -83,7 +83,7 @@ public:
void enableTaskButtons(bool b);
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void startDragger();
void createDetail();
@@ -144,24 +144,24 @@ class TaskDlgDetail : public Gui::TaskView::TaskDialog
public:
TaskDlgDetail(TechDraw::DrawViewPart* baseFeat);
TaskDlgDetail(TechDraw::DrawViewDetail* detailFeat);
~TaskDlgDetail();
~TaskDlgDetail() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();
void modifyStandardButtons(QDialogButtonBox* box);
void modifyStandardButtons(QDialogButtonBox* box) override;
protected:

View File

@@ -38,7 +38,7 @@ class TaskDimension : public QWidget
public:
TaskDimension(QGIViewDimension *parent, ViewProviderDimension *dimensionVP);
~TaskDimension();
~TaskDimension() override;
public:
virtual bool accept();
@@ -80,20 +80,20 @@ class TaskDlgDimension : public Gui::TaskView::TaskDialog
public:
TaskDlgDimension(QGIViewDimension *parent, ViewProviderDimension *dimensionVP);
~TaskDlgDimension();
~TaskDlgDimension() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();

View File

@@ -49,7 +49,7 @@ class TaskGeomHatch : public QWidget
public:
TaskGeomHatch(TechDraw::DrawGeomHatch* inHatch,TechDrawGui::ViewProviderGeomHatch* inVp, bool mode);
~TaskGeomHatch();
~TaskGeomHatch() override;
public:
virtual bool accept();
@@ -61,7 +61,7 @@ protected Q_SLOTS:
void onFileChanged();
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void initUi();
// bool resetUi();
void updateValues();
@@ -100,21 +100,21 @@ class TaskDlgGeomHatch : public Gui::TaskView::TaskDialog
public:
TaskDlgGeomHatch(TechDraw::DrawGeomHatch* inHatch,TechDrawGui::ViewProviderGeomHatch* inVp, bool mode);
~TaskDlgGeomHatch();
~TaskDlgGeomHatch() override;
const ViewProviderGeomHatch * getViewProvider() const { return viewProvider; }
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void setCreateMode(bool b);

View File

@@ -50,7 +50,7 @@ class TaskHatch : public QWidget
public:
TaskHatch(TechDraw::DrawViewPart* inDvp, std::vector<std::string> subs);
TaskHatch(TechDrawGui::ViewProviderHatch* inVp);
~TaskHatch();
~TaskHatch() override;
public:
virtual bool accept();
@@ -62,7 +62,7 @@ protected Q_SLOTS:
void onColorChanged();
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void apply(bool forceUpdate = false);
void createHatch();
@@ -99,20 +99,20 @@ class TaskDlgHatch : public Gui::TaskView::TaskDialog
public:
TaskDlgHatch(TechDraw::DrawViewPart* inDvp, std::vector<std::string> subs);
TaskDlgHatch(TechDrawGui::ViewProviderHatch* inVp);
~TaskDlgHatch();
~TaskDlgHatch() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();

View File

@@ -66,7 +66,7 @@ public:
TaskLeaderLine(TechDraw::DrawView* baseFeat,
TechDraw::DrawPage* page);
TaskLeaderLine(TechDrawGui::ViewProviderLeader* leadVP);
~TaskLeaderLine();
~TaskLeaderLine() override;
public Q_SLOTS:
void onTrackerClicked(bool b);
@@ -90,7 +90,7 @@ protected Q_SLOTS:
protected:
void trackerPointsFromQPoints(std::vector<QPointF> pts);
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void startTracker();
void removeTracker();
void abandonEditSession();
@@ -171,24 +171,24 @@ public:
TaskDlgLeaderLine(TechDraw::DrawView* baseFeat,
TechDraw::DrawPage* page);
TaskDlgLeaderLine(TechDrawGui::ViewProviderLeader* leadVP);
~TaskDlgLeaderLine();
~TaskDlgLeaderLine() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();
void modifyStandardButtons(QDialogButtonBox* box);
void modifyStandardButtons(QDialogButtonBox* box) override;
protected:

View File

@@ -45,7 +45,7 @@ class TaskLineDecor : public QWidget
public:
TaskLineDecor(TechDraw::DrawViewPart* partFeat,
std::vector<std::string> edgeNames);
~TaskLineDecor();
~TaskLineDecor() override;
public:
virtual bool accept();
@@ -60,7 +60,7 @@ protected Q_SLOTS:
void onVisibleChanged();
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void initUi();
void applyDecorations();
void getDefaults();
@@ -83,7 +83,7 @@ class TaskRestoreLines : public QWidget
public:
TaskRestoreLines(TechDraw::DrawViewPart* partFeat,
TechDrawGui::TaskLineDecor* parent);
~TaskRestoreLines();
~TaskRestoreLines() override;
public:
virtual bool accept();
@@ -96,7 +96,7 @@ protected Q_SLOTS:
void onCenterPressed();
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void initUi();
int countInvisibleLines();
int countInvisibleGeoms();
@@ -121,20 +121,20 @@ class TaskDlgLineDecor : public Gui::TaskView::TaskDialog
public:
TaskDlgLineDecor(TechDraw::DrawViewPart* partFeat,
std::vector<std::string> edgeNames);
~TaskDlgLineDecor();
~TaskDlgLineDecor() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
protected:

View File

@@ -46,7 +46,7 @@ class TaskLinkDim : public QWidget
public:
TaskLinkDim(std::vector<App::DocumentObject*> parts,std::vector<std::string>& subs, TechDraw::DrawPage* page);
~TaskLinkDim();
~TaskLinkDim() override;
public:
bool accept();
@@ -56,7 +56,7 @@ protected Q_SLOTS:
void onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*);
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void loadAvailDims();
void updateDims();
void loadToTree(const TechDraw::DrawViewDimension* dim, const bool selected, Gui::Document* guiDoc);
@@ -75,20 +75,20 @@ class TaskDlgLinkDim : public Gui::TaskView::TaskDialog
public:
TaskDlgLinkDim(std::vector<App::DocumentObject*> parts,std::vector<std::string>& subs, TechDraw::DrawPage* page);
~TaskDlgLinkDim();
~TaskDlgLinkDim() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();

View File

@@ -47,7 +47,7 @@ class TaskProjGroup : public QWidget
public:
TaskProjGroup(TechDraw::DrawProjGroup* featView, bool mode);
~TaskProjGroup();
~TaskProjGroup() override;
public:
virtual bool accept();
@@ -81,7 +81,7 @@ protected Q_SLOTS:
void scaleManuallyChanged(int i);
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
/// Connects and updates state of view checkboxes to match the state of multiView
/*!
@@ -129,27 +129,27 @@ class TaskDlgProjGroup : public Gui::TaskView::TaskDialog
public:
TaskDlgProjGroup(TechDraw::DrawProjGroup* featView,bool mode);
~TaskDlgProjGroup();
~TaskDlgProjGroup() override;
const ViewProviderProjGroup * getViewProvider() const { return viewProvider; }
TechDraw::DrawProjGroup * getMultiView() const { return multiView; }
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
QDialogButtonBox::StandardButtons getStandardButtons() const override
{ return QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Cancel; }
virtual void modifyStandardButtons(QDialogButtonBox* box);
void modifyStandardButtons(QDialogButtonBox* box) override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void setCreateMode(bool b);

View File

@@ -45,7 +45,7 @@ class TaskProjection : public QWidget
public:
TaskProjection();
~TaskProjection();
~TaskProjection() override;
public:
bool accept();
@@ -66,19 +66,19 @@ class TaskDlgProjection : public Gui::TaskView::TaskDialog
public:
TaskDlgProjection();
~TaskDlgProjection();
~TaskDlgProjection() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if a button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
void helpRequested() override { return;}
void update();

View File

@@ -58,7 +58,7 @@ public:
TaskRichAnno(TechDraw::DrawView* baseFeat,
TechDraw::DrawPage* page);
TaskRichAnno(TechDrawGui::ViewProviderRichAnno* leadVP);
~TaskRichAnno();
~TaskRichAnno() override;
public Q_SLOTS:
void onEditorClicked(bool b);
@@ -80,7 +80,7 @@ protected Q_SLOTS:
void onEditorExit();
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void createAnnoFeature();
void updateAnnoFeature();
@@ -137,24 +137,24 @@ public:
TaskDlgRichAnno(TechDraw::DrawView* baseFeat,
TechDraw::DrawPage* page);
TaskDlgRichAnno(TechDrawGui::ViewProviderRichAnno* leadVP);
~TaskDlgRichAnno();
~TaskDlgRichAnno() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();
void modifyStandardButtons(QDialogButtonBox* box);
void modifyStandardButtons(QDialogButtonBox* box) override;
protected:

View File

@@ -44,7 +44,7 @@ class TaskSectionView : public QWidget
public:
TaskSectionView(TechDraw::DrawViewPart* base);
TaskSectionView(TechDraw::DrawViewSection* section);
~TaskSectionView();
~TaskSectionView() override;
public:
virtual bool accept();
@@ -64,7 +64,7 @@ protected Q_SLOTS:
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void saveSectionState();
void restoreSectionState();
@@ -124,29 +124,29 @@ class TaskDlgSectionView : public Gui::TaskView::TaskDialog
public:
TaskDlgSectionView(TechDraw::DrawViewPart* base);
TaskDlgSectionView(TechDraw::DrawViewSection* section);
~TaskDlgSectionView();
~TaskDlgSectionView() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
/* virtual void clicked(int);*/
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
void helpRequested() override { return;}
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
QDialogButtonBox::StandardButtons getStandardButtons() const override
{ return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; }
/* virtual void modifyStandardButtons(QDialogButtonBox* box);*/
void update();
virtual bool isAllowedAlterSelection() const
bool isAllowedAlterSelection() const override
{ return false; }
virtual bool isAllowedAlterDocument() const
bool isAllowedAlterDocument() const override
{ return false; }
protected:

View File

@@ -92,7 +92,7 @@ class TaskSelectLineAttributes : public QWidget
public:
TaskSelectLineAttributes(lineAttributes * ptActiveAttributes);
~TaskSelectLineAttributes();
~TaskSelectLineAttributes() override;
public Q_SLOTS:
@@ -104,7 +104,7 @@ public:
protected Q_SLOTS:
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void setUiEdit();
@@ -119,20 +119,20 @@ class TaskDlgSelectLineAttributes : public Gui::TaskView::TaskDialog
public:
TaskDlgSelectLineAttributes(lineAttributes * ptActiveAttributes);
~TaskDlgSelectLineAttributes();
~TaskDlgSelectLineAttributes() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();

View File

@@ -76,7 +76,7 @@ class TaskSurfaceFinishSymbols : public QWidget
public:
TaskSurfaceFinishSymbols(TechDraw::DrawViewPart* view);
~TaskSurfaceFinishSymbols();
~TaskSurfaceFinishSymbols() override;
public Q_SLOTS:
@@ -93,7 +93,7 @@ private Q_SLOTS:
protected Q_SLOTS:
protected:
void changeEvent(QEvent *e);
void changeEvent(QEvent *e) override;
void setUiEdit();
@@ -119,20 +119,20 @@ class TaskDlgSurfaceFinishSymbols : public Gui::TaskView::TaskDialog
public:
TaskDlgSurfaceFinishSymbols(TechDraw::DrawViewPart* view);
~TaskDlgSurfaceFinishSymbols();
~TaskDlgSurfaceFinishSymbols() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();

View File

@@ -175,24 +175,24 @@ class TaskDlgWeldingSymbol : public Gui::TaskView::TaskDialog
public:
TaskDlgWeldingSymbol(TechDraw::DrawLeaderLine* leader);
TaskDlgWeldingSymbol(TechDraw::DrawWeldSymbol* weld);
~TaskDlgWeldingSymbol();
~TaskDlgWeldingSymbol() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if an button is clicked which has no accept or reject role
virtual void clicked(int);
void clicked(int) override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user presses the help button
virtual void helpRequested() { return;}
virtual bool isAllowedAlterDocument() const
void helpRequested() override { return;}
bool isAllowedAlterDocument() const override
{ return false; }
void update();
void modifyStandardButtons(QDialogButtonBox* box);
void modifyStandardButtons(QDialogButtonBox* box) override;
protected:

View File

@@ -40,12 +40,12 @@ public:
/// constructor
ViewProviderAnnotation();
/// destructor
virtual ~ViewProviderAnnotation();
~ViewProviderAnnotation() override;
virtual bool useNewSelectionModel() const {return false;}
virtual void updateData(const App::Property*);
bool useNewSelectionModel() const override {return false;}
void updateData(const App::Property*) override;
virtual TechDraw::DrawViewAnnotation* getViewObject() const;
TechDraw::DrawViewAnnotation* getViewObject() const override;
};
} // namespace TechDrawGui

View File

@@ -42,7 +42,7 @@ public:
/// constructor
ViewProviderBalloon();
/// destructor
virtual ~ViewProviderBalloon();
~ViewProviderBalloon() override;
App::PropertyFont Font;
App::PropertyLength Fontsize;
@@ -50,18 +50,18 @@ public:
App::PropertyBool LineVisible;
App::PropertyColor Color;
virtual bool useNewSelectionModel() const {return false;}
virtual void updateData(const App::Property*);
virtual void onChanged(const App::Property* p);
virtual void setupContextMenu(QMenu*, QObject*, const char*);
virtual bool setEdit(int ModNum);
virtual bool doubleClicked();
virtual bool canDelete(App::DocumentObject* obj) const;
bool useNewSelectionModel() const override {return false;}
void updateData(const App::Property*) override;
void onChanged(const App::Property* p) override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
bool setEdit(int ModNum) override;
bool doubleClicked() override;
bool canDelete(App::DocumentObject* obj) const override;
virtual TechDraw::DrawViewBalloon* getViewObject() const;
TechDraw::DrawViewBalloon* getViewObject() const override;
protected:
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop);
void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override;
};
} // namespace TechDrawGui

View File

@@ -41,7 +41,7 @@ public:
/// constructor
ViewProviderDimension();
/// destructor
virtual ~ViewProviderDimension();
~ViewProviderDimension() override;
App::PropertyFont Font;
App::PropertyLength Fontsize;
@@ -67,25 +67,25 @@ public:
App::PropertyFloat GapFactorISO;
App::PropertyFloat GapFactorASME;
virtual void attach(App::DocumentObject *);
virtual bool useNewSelectionModel() const {return false;}
virtual void updateData(const App::Property*);
virtual void onChanged(const App::Property* p);
virtual void setupContextMenu(QMenu*, QObject*, const char*);
virtual bool setEdit(int ModNum);
virtual bool doubleClicked();
void attach(App::DocumentObject *) override;
bool useNewSelectionModel() const override {return false;}
void updateData(const App::Property*) override;
void onChanged(const App::Property* p) override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
bool setEdit(int ModNum) override;
bool doubleClicked() override;
virtual TechDraw::DrawViewDimension* getViewObject() const;
TechDraw::DrawViewDimension* getViewObject() const override;
App::Color prefColor() const;
std::string prefFont() const;
double prefFontSize() const;
double prefWeight() const;
int prefStandardAndStyle() const;
virtual bool canDelete(App::DocumentObject* obj) const;
bool canDelete(App::DocumentObject* obj) const override;
protected:
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop);
void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override;
private:
static const char *StandardAndStyleEnums[];

View File

@@ -48,29 +48,29 @@ public:
/// constructor
ViewProviderDrawingView();
/// destructor
virtual ~ViewProviderDrawingView();
~ViewProviderDrawingView() override;
App::PropertyBool KeepLabel;
virtual void attach(App::DocumentObject *) override;
virtual bool useNewSelectionModel() const override {return false;}
void attach(App::DocumentObject *) override;
bool useNewSelectionModel() const override {return false;}
/// Hide the object in the view
virtual void hide() override;
void hide() override;
/// Show the object in the view
virtual void show() override;
virtual bool isShow() const override;
void show() override;
bool isShow() const override;
virtual void onChanged(const App::Property *prop) override;
virtual void updateData(const App::Property*) override;
void onChanged(const App::Property *prop) override;
void updateData(const App::Property*) override;
QGIView* getQView();
MDIViewPage* getMDIViewPage() const;
virtual Gui::MDIView *getMDIView() const override;
Gui::MDIView *getMDIView() const override;
/** @name Restoring view provider from document load */
//@{
virtual void startRestoring() override;
virtual void finishRestoring() override;
void startRestoring() override;
void finishRestoring() override;
//@}
virtual TechDraw::DrawView* getViewObject() const;

View File

@@ -44,20 +44,20 @@ public:
/// constructor
ViewProviderHatch();
/// destructor
virtual ~ViewProviderHatch();
~ViewProviderHatch() override;
App::PropertyColor HatchColor;
App::PropertyFloatConstraint HatchScale;
virtual bool useNewSelectionModel() const override {return false;}
virtual void onChanged(const App::Property* prop) override;
virtual bool setEdit(int ModNum) override;
virtual bool doubleClicked() override;
virtual bool canDelete(App::DocumentObject* obj) const override;
bool useNewSelectionModel() const override {return false;}
void onChanged(const App::Property* prop) override;
bool setEdit(int ModNum) override;
bool doubleClicked() override;
bool canDelete(App::DocumentObject* obj) const override;
TechDraw::DrawHatch* getViewObject() const;
virtual Gui::MDIView *getMDIView() const override;
Gui::MDIView *getMDIView() const override;
private:
static App::PropertyFloatConstraint::Constraints scaleRange;

View File

@@ -39,16 +39,16 @@ public:
/// constructor
ViewProviderImage();
/// destructor
virtual ~ViewProviderImage();
~ViewProviderImage() override;
App::PropertyBool Crop; //crop to feature width x height
virtual bool useNewSelectionModel() const {return false;}
bool useNewSelectionModel() const override {return false;}
/// returns a list of all possible modes
virtual void updateData(const App::Property*);
virtual void onChanged(const App::Property *prop);
void updateData(const App::Property*) override;
void onChanged(const App::Property *prop) override;
virtual TechDraw::DrawViewImage* getViewObject() const;
TechDraw::DrawViewImage* getViewObject() const override;
};

View File

@@ -46,33 +46,33 @@ public:
/// constructor
ViewProviderLeader();
/// destructor
virtual ~ViewProviderLeader();
~ViewProviderLeader() override;
App::PropertyLength LineWidth;
App::PropertyEnumeration LineStyle;
App::PropertyColor Color;
/* virtual void setDisplayMode(const char* ModeName);*/
virtual bool useNewSelectionModel() const {return false;}
bool useNewSelectionModel() const override {return false;}
/* virtual std::vector<std::string> getDisplayModes(void) const;*/
virtual void updateData(const App::Property*);
virtual void onChanged(const App::Property* p);
virtual bool setEdit(int ModNum);
virtual bool doubleClicked();
virtual bool onDelete(const std::vector<std::string> &);
virtual bool canDelete(App::DocumentObject* obj) const;
void updateData(const App::Property*) override;
void onChanged(const App::Property* p) override;
bool setEdit(int ModNum) override;
bool doubleClicked() override;
bool onDelete(const std::vector<std::string> &) override;
bool canDelete(App::DocumentObject* obj) const override;
static const char* LineStyleEnums[];
std::vector<App::DocumentObject*> claimChildren() const;
std::vector<App::DocumentObject*> claimChildren() const override;
virtual TechDraw::DrawLeaderLine* getViewObject() const;
TechDraw::DrawLeaderLine* getViewObject() const override;
TechDraw::DrawLeaderLine* getFeature() const;
protected:
double getDefLineWeight();
App::Color getDefLineColor();
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop);
void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override;
private:
static App::PropertyIntegerConstraint::Constraints LineStyleRange;

View File

@@ -51,34 +51,34 @@ public:
/// constructor
ViewProviderPage();
/// destructor
virtual ~ViewProviderPage();
~ViewProviderPage() override;
App::PropertyBool ShowFrames;
App::PropertyBool ShowGrid;
App::PropertyDistance GridSpacing;
virtual void attach(App::DocumentObject *) override;
virtual void setDisplayMode(const char* ModeName) override;
virtual bool useNewSelectionModel() const override {return false;}
void attach(App::DocumentObject *) override;
void setDisplayMode(const char* ModeName) override;
bool useNewSelectionModel() const override {return false;}
/// returns a list of all possible modes
virtual std::vector<std::string> getDisplayModes() const override;
std::vector<std::string> getDisplayModes() const override;
/// Hides the view provider
virtual void hide() override;
void hide() override;
/// Shows the view provider
virtual void show() override;
virtual bool isShow() const override;
void show() override;
bool isShow() const override;
/// Claim all the views for the page
std::vector<App::DocumentObject*> claimChildren() const override;
/// Is called by the tree if the user double click on the object
virtual bool doubleClicked() override;
bool doubleClicked() override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
virtual bool onDelete(const std::vector<std::string> &) override;
virtual void onChanged(const App::Property *prop) override;
virtual void updateData(const App::Property* prop) override;
virtual void startRestoring() override;
virtual void finishRestoring() override;
bool onDelete(const std::vector<std::string> &) override;
void onChanged(const App::Property *prop) override;
void updateData(const App::Property* prop) override;
void startRestoring() override;
void finishRestoring() override;
bool isRestoring() {return !m_docReady;}
TechDraw::DrawPage* getDrawPage() const;
@@ -91,7 +91,7 @@ public:
bool showMDIViewPage();
void removeMDIView();
virtual Gui::MDIView *getMDIView() const override;
Gui::MDIView *getMDIView() const override;
bool getFrameState();
void setFrameState(bool state);
@@ -101,7 +101,7 @@ public:
QGSPage* getGraphicsScene() { return m_graphicsScene; }
void setGraphicsView(QGVPage* gv);
void setGraphicsScene(QGSPage* gs);
virtual bool canDelete(App::DocumentObject* obj) const override;
bool canDelete(App::DocumentObject* obj) const override;
void setGrid();
protected:

View File

@@ -37,26 +37,26 @@ class TechDrawGuiExport ViewProviderProjGroup : public ViewProviderDrawingView
public:
ViewProviderProjGroup(); /// constructor
~ViewProviderProjGroup(); /// destructor
~ViewProviderProjGroup() override; /// destructor
virtual bool useNewSelectionModel() const {return false;}
bool useNewSelectionModel() const override {return false;}
/// returns a list of all possible modes
virtual std::vector<std::string> getDisplayModes() const;
std::vector<std::string> getDisplayModes() const override;
/// Claim all the views for the page
std::vector<App::DocumentObject*> claimChildren() const;
std::vector<App::DocumentObject*> claimChildren() const override;
/// Is called by the tree if the user double click on the object
virtual bool doubleClicked();
void setupContextMenu(QMenu*, QObject*, const char*);
bool doubleClicked() override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
TechDraw::DrawProjGroup* getObject() const;
virtual TechDraw::DrawProjGroup* getViewObject() const;
virtual bool onDelete(const std::vector<std::string> &);
virtual bool canDelete(App::DocumentObject* obj) const;
TechDraw::DrawProjGroup* getViewObject() const override;
bool onDelete(const std::vector<std::string> &) override;
bool canDelete(App::DocumentObject* obj) const override;
protected:
bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};

View File

@@ -38,25 +38,25 @@ class TechDrawGuiExport ViewProviderProjGroupItem: public ViewProviderViewPart
public:
ViewProviderProjGroupItem();
~ViewProviderProjGroupItem();
~ViewProviderProjGroupItem() override;
virtual bool useNewSelectionModel() const {return false;}
bool useNewSelectionModel() const override {return false;}
/// returns a list of all possible modes
virtual std::vector<std::string> getDisplayModes() const;
std::vector<std::string> getDisplayModes() const override;
/// Is called by the tree if the user double click on the object
virtual bool doubleClicked();
void setupContextMenu(QMenu*, QObject*, const char*);
virtual void updateData(const App::Property*);
bool doubleClicked() override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
void updateData(const App::Property*) override;
virtual TechDraw::DrawProjGroupItem* getViewObject() const;
TechDraw::DrawProjGroupItem* getViewObject() const override;
TechDraw::DrawProjGroupItem* getObject() const;
void unsetEdit(int ModNum);
virtual bool onDelete(const std::vector<std::string> &);
virtual bool canDelete(App::DocumentObject* obj) const;
void unsetEdit(int ModNum) override;
bool onDelete(const std::vector<std::string> &) override;
bool canDelete(App::DocumentObject* obj) const override;
protected:
bool setEdit(int ModNum);
bool setEdit(int ModNum) override;
};

View File

@@ -44,22 +44,22 @@ public:
/// constructor
ViewProviderRichAnno();
/// destructor
virtual ~ViewProviderRichAnno();
~ViewProviderRichAnno() override;
App::PropertyLength LineWidth;
App::PropertyEnumeration LineStyle;
App::PropertyColor LineColor;
virtual bool useNewSelectionModel() const {return false;}
virtual void updateData(const App::Property*);
virtual void onChanged(const App::Property* p);
virtual bool setEdit(int ModNum);
virtual bool doubleClicked();
virtual bool canDelete(App::DocumentObject* obj) const;
bool useNewSelectionModel() const override {return false;}
void updateData(const App::Property*) override;
void onChanged(const App::Property* p) override;
bool setEdit(int ModNum) override;
bool doubleClicked() override;
bool canDelete(App::DocumentObject* obj) const override;
static const char* LineStyleEnums[];
virtual TechDraw::DrawRichAnno* getViewObject() const;
TechDraw::DrawRichAnno* getViewObject() const override;
TechDraw::DrawRichAnno* getFeature() const;
protected:
@@ -67,7 +67,7 @@ protected:
std::string getDefFont();
double getDefFontSize();
double getDefLineWeight();
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop);
void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override;
private:
static App::PropertyIntegerConstraint::Constraints LineStyleRange;

View File

@@ -39,11 +39,11 @@ public:
/// constructor
ViewProviderSpreadsheet();
/// destructor
virtual ~ViewProviderSpreadsheet();
~ViewProviderSpreadsheet() override;
virtual bool useNewSelectionModel() const {return false;}
bool useNewSelectionModel() const override {return false;}
virtual TechDraw::DrawViewSpreadsheet* getViewObject() const;
TechDraw::DrawViewSpreadsheet* getViewObject() const override;
};
} // namespace TechDrawGui

View File

@@ -41,12 +41,12 @@ public:
/// constructor
ViewProviderSymbol();
/// destructor
virtual ~ViewProviderSymbol();
~ViewProviderSymbol() override;
virtual bool useNewSelectionModel() const {return false;}
virtual void updateData(const App::Property*);
bool useNewSelectionModel() const override {return false;}
void updateData(const App::Property*) override;
virtual TechDraw::DrawViewSymbol* getViewObject() const;
TechDraw::DrawViewSymbol* getViewObject() const override;
};
class TechDrawGuiExport ViewProviderDraft : public ViewProviderSymbol
@@ -57,7 +57,7 @@ public:
/// constructor
ViewProviderDraft();
/// destructor
virtual ~ViewProviderDraft();
~ViewProviderDraft() override;
};
class TechDrawGuiExport ViewProviderArch : public ViewProviderSymbol
@@ -68,7 +68,7 @@ public:
/// constructor
ViewProviderArch();
/// destructor
virtual ~ViewProviderArch();
~ViewProviderArch() override;
};
} // namespace TechDrawGui

View File

@@ -36,10 +36,10 @@ public:
/// constructor
ViewProviderTile();
/// destructor
virtual ~ViewProviderTile();
~ViewProviderTile() override;
virtual bool useNewSelectionModel() const {return false;}
virtual bool canDelete(App::DocumentObject *obj) const;
bool useNewSelectionModel() const override {return false;}
bool canDelete(App::DocumentObject *obj) const override;
/* virtual TechDraw::DrawTile* getViewObject() const;*/
virtual TechDraw::DrawTile* getFeature() const;

View File

@@ -39,20 +39,20 @@ public:
/// constructor
ViewProviderViewClip();
/// destructor
virtual ~ViewProviderViewClip();
~ViewProviderViewClip() override;
virtual bool useNewSelectionModel() const {return false;}
bool useNewSelectionModel() const override {return false;}
virtual TechDraw::DrawViewClip* getViewObject() const;
TechDraw::DrawViewClip* getViewObject() const override;
TechDraw::DrawViewClip* getObject() const;
/// Hide the object in the view
virtual void hide();
void hide() override;
/// Show the object in the view
virtual void show();
std::vector<App::DocumentObject*> claimChildren() const;
void show() override;
std::vector<App::DocumentObject*> claimChildren() const override;
virtual bool canDelete(App::DocumentObject* obj) const;
bool canDelete(App::DocumentObject* obj) const override;
};
} // namespace TechDrawGui

View File

@@ -40,7 +40,7 @@ public:
/// constructor
ViewProviderViewPart();
/// destructor
virtual ~ViewProviderViewPart();
~ViewProviderViewPart() override;
App::PropertyLength LineWidth;
App::PropertyLength HiddenWidth;
@@ -60,24 +60,24 @@ public:
static const char* LineStyleEnums[];
virtual void attach(App::DocumentObject *);
virtual bool useNewSelectionModel(void) const {return false;}
virtual bool onDelete(const std::vector<std::string> &);
virtual bool canDelete(App::DocumentObject* obj) const;
virtual bool setEdit(int ModNum);
virtual bool doubleClicked(void);
void attach(App::DocumentObject *) override;
bool useNewSelectionModel(void) const override {return false;}
bool onDelete(const std::vector<std::string> &) override;
bool canDelete(App::DocumentObject* obj) const override;
bool setEdit(int ModNum) override;
bool doubleClicked(void) override;
public:
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;
App::Color prefSectionColor(void);
App::Color prefHighlightColor(void);
int prefHighlightStyle(void);
virtual std::vector<App::DocumentObject*> claimChildren(void) const;
std::vector<App::DocumentObject*> claimChildren(void) const override;
virtual TechDraw::DrawViewPart* getViewObject() const;
TechDraw::DrawViewPart* getViewObject() const override;
TechDraw::DrawViewPart* getViewPart() const;
};

View File

@@ -39,7 +39,7 @@ public:
/// constructor
ViewProviderViewSection();
/// destructor
virtual ~ViewProviderViewSection();
~ViewProviderViewSection() override;
App::PropertyBool ShowCutSurface; //obsolete - use CutSurfaceDisplay
App::PropertyColor CutSurfaceColor;
@@ -48,16 +48,16 @@ public:
App::PropertyColor GeomHatchColor;
App::PropertyFloat WeightPattern;
virtual void updateData(const App::Property*);
virtual void onChanged(const App::Property *prop);
virtual bool setEdit(int ModNum);
virtual bool doubleClicked();
void updateData(const App::Property*) override;
void onChanged(const App::Property *prop) override;
bool setEdit(int ModNum) override;
bool doubleClicked() override;
void updateGraphic();
void getParameters();
virtual bool canDelete(App::DocumentObject* obj) const;
bool canDelete(App::DocumentObject* obj) const override;
virtual TechDraw::DrawViewSection* getViewObject() const;
TechDraw::DrawViewSection* getViewObject() const override;
};
} // namespace TechDrawGui

View File

@@ -40,26 +40,26 @@ public:
/// constructor
ViewProviderWeld();
/// destructor
virtual ~ViewProviderWeld();
~ViewProviderWeld() override;
App::PropertyString Font;
App::PropertyLength FontSize;
App::PropertyLength TileFontSize;
virtual bool useNewSelectionModel() const {return false;}
virtual void onChanged(const App::Property* p);
virtual std::vector<App::DocumentObject*> claimChildren() const;
virtual bool setEdit(int ModNum);
virtual bool doubleClicked();
bool useNewSelectionModel() const override {return false;}
void onChanged(const App::Property* p) override;
std::vector<App::DocumentObject*> claimChildren() const override;
bool setEdit(int ModNum) override;
bool doubleClicked() override;
virtual TechDraw::DrawWeldSymbol* getViewObject() const;
TechDraw::DrawWeldSymbol* getViewObject() const override;
virtual TechDraw::DrawWeldSymbol* getFeature() const;
std::string prefFontName();
double prefFontSize();
double prefTileTextAdjust();
virtual bool onDelete(const std::vector<std::string> &);
virtual bool canDelete(App::DocumentObject* obj) const;
bool onDelete(const std::vector<std::string> &) override;
bool canDelete(App::DocumentObject* obj) const override;
};