diff --git a/src/Mod/TechDraw/Gui/QGIEdge.h b/src/Mod/TechDraw/Gui/QGIEdge.h index 463ac8a9eb..6a31a3f3fb 100644 --- a/src/Mod/TechDraw/Gui/QGIEdge.h +++ b/src/Mod/TechDraw/Gui/QGIEdge.h @@ -77,7 +77,6 @@ protected: private: float strokeWidth; - float strokeScale; QPen m_pen; QColor m_colCurrent; QColor m_colNormal; diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp index ffaac2c27a..e7009faafe 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.cpp +++ b/src/Mod/TechDraw/Gui/QGIFace.cpp @@ -44,11 +44,7 @@ using namespace TechDrawGui; QGIFace::QGIFace(int ref) : - reference(ref), - m_fill(Qt::NoBrush) - //m_fill(Qt::CrossPattern) - //m_fill(Qt::Dense3Pattern) - //m_fill(Qt::Dense6Pattern) + reference(ref) { setCacheMode(QGraphicsItem::NoCache); setAcceptHoverEvents(true); diff --git a/src/Mod/TechDraw/Gui/QGIFace.h b/src/Mod/TechDraw/Gui/QGIFace.h index f7677142d8..5bd9187671 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.h +++ b/src/Mod/TechDraw/Gui/QGIFace.h @@ -71,7 +71,6 @@ private: QColor m_colNormal; QColor m_colPre; QColor m_colSel; - Qt::BrushStyle m_fill; }; } // namespace MDIViewPageGui diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h index a78ed0d6fe..343d1db34f 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h @@ -47,13 +47,13 @@ public: ~QGIViewAnnotation(); enum {Type = QGraphicsItem::UserType + 120}; - int type() const { return Type;} + int type() const override { return Type;} - void updateView(bool update = false); + void updateView(bool update = false) override; void setViewAnnoFeature(TechDraw::DrawViewAnnotation *obj); virtual void draw() override; - virtual QRectF boundingRect() const; + virtual QRectF boundingRect() const override; Q_SIGNALS: void hover(bool state); @@ -61,7 +61,7 @@ Q_SIGNALS: protected: void drawAnnotation(); - QVariant itemChange(GraphicsItemChange change, const QVariant &value); + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; protected: QGCustomText *m_textItem; diff --git a/src/Mod/TechDraw/Gui/QGIViewClip.h b/src/Mod/TechDraw/Gui/QGIViewClip.h index 01bfac76e0..81b2c50c33 100644 --- a/src/Mod/TechDraw/Gui/QGIViewClip.h +++ b/src/Mod/TechDraw/Gui/QGIViewClip.h @@ -47,12 +47,12 @@ public: ~QGIViewClip(); enum {Type = QGraphicsItem::UserType + 123}; - int type() const { return Type;} + int type() const override { return Type;} - virtual void updateView(bool update = false); + virtual void updateView(bool update = false) override; virtual void draw() override; - virtual QRectF boundingRect() const; + virtual QRectF boundingRect() const override; Q_SIGNALS: void selected(bool state); @@ -60,7 +60,7 @@ Q_SIGNALS: protected: void drawClip(); - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); + virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; QGIView* getQGIVByName(std::string name); private: diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.h b/src/Mod/TechDraw/Gui/QGIViewDimension.h index f2e41469a1..e86a4ca03f 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.h +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.h @@ -43,6 +43,7 @@ namespace TechDrawGui class QGIDatumLabel : public QGCustomText { Q_OBJECT + public: explicit QGIDatumLabel(int ref = -1, QGraphicsScene *scene = 0 ); ~QGIDatumLabel() {} @@ -69,13 +70,11 @@ protected: // Selection detection QVariant itemChange(GraphicsItemChange change, const QVariant &value); -protected: int reference; double posX; double posY; private: - int strokeWidth; QPen m_pen; QColor m_colNormal; QColor m_colPre; diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.h b/src/Mod/TechDraw/Gui/QGIViewPart.h index 420868c2ee..410aedd1be 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.h +++ b/src/Mod/TechDraw/Gui/QGIViewPart.h @@ -52,18 +52,18 @@ public: ~QGIViewPart(); enum {Type = QGraphicsItem::UserType + 102}; - int type() const { return Type;} + int type() const override { return Type;} - void toggleCache(bool state); + void toggleCache(bool state) override; void toggleCosmeticLines(bool state); void toggleVertices(bool state); void setViewPartFeature(TechDraw::DrawViewPart *obj); - virtual void updateView(bool update = false); + virtual void updateView(bool update = false) override; void tidy(); virtual void draw() override; - virtual QRectF boundingRect() const; + virtual QRectF boundingRect() const override; Q_SIGNALS: void selected(bool state); @@ -91,9 +91,8 @@ protected: void drawViewPart(); QGIFace* drawFace(TechDrawGeometry::Face* f); - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); + virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; -protected: QColor m_colHid; private: diff --git a/src/Mod/TechDraw/Gui/QGIViewSection.h b/src/Mod/TechDraw/Gui/QGIViewSection.h index f7785d0c41..3784f35fc1 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSection.h +++ b/src/Mod/TechDraw/Gui/QGIViewSection.h @@ -46,9 +46,9 @@ public: ~QGIViewSection(); virtual void draw() override; - void updateView(bool update = false); + void updateView(bool update = false) override; enum {Type = QGraphicsItem::UserType + 108}; - int type() const { return Type;} + int type() const override { return Type;} Q_SIGNALS: void dirty(); diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.h b/src/Mod/TechDraw/Gui/QGIViewSymbol.h index 34b0574865..dd66c0e758 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSymbol.h +++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.h @@ -50,13 +50,13 @@ public: ~QGIViewSymbol(); enum {Type = QGraphicsItem::UserType + 121}; - int type() const { return Type;} + int type() const override { return Type;} - void updateView(bool update = false); + void updateView(bool update = false) override; void setViewSymbolFeature(TechDraw::DrawViewSymbol *obj); virtual void draw() override; - virtual QRectF boundingRect() const; + virtual QRectF boundingRect() const override; Q_SIGNALS: void hover(bool state); @@ -66,7 +66,7 @@ protected: bool load(QByteArray *svgString); virtual void drawSvg(); void symbolToSvg(QString qs); - QVariant itemChange(GraphicsItemChange change, const QVariant &value); + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; QGCustomSvg *m_svgItem; QSvgRenderer *m_svgRender; diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp index 8514ecb754..ffacd302a2 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.cpp +++ b/src/Mod/TechDraw/Gui/QGVPage.cpp @@ -524,7 +524,10 @@ void QGVPage::saveSvg(QString filename) // resize all textItem before export? // postprocess generated file to mult all font-size attrib by 2.835 to get pts? // duplicate all textItems and only show the appropriate one for screen/print vs export? - svgGen.setResolution(25.4000508); // mm/inch?? docs say this is DPI + +// TODO: Was svgGen.setResolution(25.4000508); // mm/inch?? docs say this is DPI + svgGen.setResolution(25); // mm/inch?? docs say this is DPI + //svgGen.setResolution(600); // resulting page is ~12.5x9mm //svgGen.setResolution(96); // page is ~78x55mm svgGen.setTitle(QObject::tr("FreeCAD SVG Export"));