From 222492c912a465119cd24e0ce1211492d4e2f89e Mon Sep 17 00:00:00 2001 From: WandererFan Date: Fri, 22 Jul 2016 09:49:31 -0400 Subject: [PATCH] remove unneeded boundingRect methods --- src/Mod/TechDraw/Gui/QGIView.cpp | 4 ++++ src/Mod/TechDraw/Gui/QGIView.h | 1 + src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp | 5 ----- src/Mod/TechDraw/Gui/QGIViewAnnotation.h | 1 - src/Mod/TechDraw/Gui/QGIViewClip.cpp | 5 ----- src/Mod/TechDraw/Gui/QGIViewClip.h | 1 - src/Mod/TechDraw/Gui/QGIViewPart.cpp | 6 ------ src/Mod/TechDraw/Gui/QGIViewPart.h | 1 - src/Mod/TechDraw/Gui/QGIViewSymbol.cpp | 4 ---- src/Mod/TechDraw/Gui/QGIViewSymbol.h | 1 - 10 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp index 0422dc073..c13b43edb 100644 --- a/src/Mod/TechDraw/Gui/QGIView.cpp +++ b/src/Mod/TechDraw/Gui/QGIView.cpp @@ -373,6 +373,10 @@ QRectF QGIView::customChildrenBoundingRect() { return result; } +QRectF QGIView::boundingRect() const +{ + return m_border->rect().adjusted(-2.,-2.,2.,2.); //allow for border line width //TODO: fiddle brect if border off? +} QColor QGIView::getNormalColor() { Base::Reference hGrp = getParmGroupCol(); diff --git a/src/Mod/TechDraw/Gui/QGIView.h b/src/Mod/TechDraw/Gui/QGIView.h index c6e8633dd..d1b7bcc15 100644 --- a/src/Mod/TechDraw/Gui/QGIView.h +++ b/src/Mod/TechDraw/Gui/QGIView.h @@ -74,6 +74,7 @@ public: virtual void toggleCache(bool state); virtual void updateView(bool update = false); virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + virtual QRectF boundingRect() const override; //virtual QPainterPath shape(void) const; virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event); diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp index 6b7dde94c..32b91e532 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp @@ -163,8 +163,3 @@ void QGIViewAnnotation::drawAnnotation() m_textItem->setPos(0.,0.); } -QRectF QGIViewAnnotation::boundingRect() const -{ - return childrenBoundingRect(); -} - diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h index 85e3a611a..12ed6c3f8 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.h +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.h @@ -50,7 +50,6 @@ public: void setViewAnnoFeature(TechDraw::DrawViewAnnotation *obj); virtual void draw() override; - virtual QRectF boundingRect() const override; protected: void drawAnnotation(); diff --git a/src/Mod/TechDraw/Gui/QGIViewClip.cpp b/src/Mod/TechDraw/Gui/QGIViewClip.cpp index c5e0aeea8..2080b1b5f 100644 --- a/src/Mod/TechDraw/Gui/QGIViewClip.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewClip.cpp @@ -187,8 +187,3 @@ QGIView* QGIViewClip::getQGIVByName(std::string name) //should probably be meth } return 0; } - -QRectF QGIViewClip::boundingRect() const -{ - return childrenBoundingRect(); -} diff --git a/src/Mod/TechDraw/Gui/QGIViewClip.h b/src/Mod/TechDraw/Gui/QGIViewClip.h index 08df897dc..71e52e4ca 100644 --- a/src/Mod/TechDraw/Gui/QGIViewClip.h +++ b/src/Mod/TechDraw/Gui/QGIViewClip.h @@ -46,7 +46,6 @@ public: virtual void updateView(bool update = false) override; virtual void draw() override; - virtual QRectF boundingRect() const override; protected: void drawClip(); diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.cpp b/src/Mod/TechDraw/Gui/QGIViewPart.cpp index 85ccc7786..eda1516a9 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewPart.cpp @@ -575,12 +575,6 @@ TechDraw::DrawHatch* QGIViewPart::faceIsHatched(int i,std::vectorsetPos(0.,0.); } -QRectF QGIViewSymbol::boundingRect() const -{ - return childrenBoundingRect(); -} diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.h b/src/Mod/TechDraw/Gui/QGIViewSymbol.h index 9a18a3cf0..5eb54cbe6 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSymbol.h +++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.h @@ -54,7 +54,6 @@ public: void setViewSymbolFeature(TechDraw::DrawViewSymbol *obj); virtual void draw() override; - virtual QRectF boundingRect() const override; protected: virtual void drawSvg();