diff --git a/GUI/View/Overlay/EllipseOverlay.cpp b/GUI/View/Overlay/EllipseOverlay.cpp index a3450b5d1d1509879f2744455e780150439bd4df..e2ed2caeee1c1bc387d15f337e0c7cd94e39a714 100644 --- a/GUI/View/Overlay/EllipseOverlay.cpp +++ b/GUI/View/Overlay/EllipseOverlay.cpp @@ -71,7 +71,7 @@ void EllipseOverlay::resizeY(double yl, double yh) //! updates position of view using item properties -void EllipseOverlay::update_position() +void EllipseOverlay::updatePosition() { setX(x2pix(m_item->xCenter())); setY(y2pix(m_item->yCenter())); @@ -80,7 +80,7 @@ void EllipseOverlay::update_position() setTransform(QTransform().rotate(-1 * m_item->angle())); } -QRectF EllipseOverlay::mask_rectangle() +QRectF EllipseOverlay::maskRectangle() { return QRectF(-width() / 2, -height() / 2, width(), height()); } diff --git a/GUI/View/Overlay/EllipseOverlay.h b/GUI/View/Overlay/EllipseOverlay.h index 738fecb841dfbd8fa579a167273a5062e74588f2..9b1d92497697f03fb425d762f988d3d93e535cc7 100644 --- a/GUI/View/Overlay/EllipseOverlay.h +++ b/GUI/View/Overlay/EllipseOverlay.h @@ -41,8 +41,8 @@ private slots: private: QPainterPath shape() const override; - void update_position() override; - QRectF mask_rectangle() override; + void updatePosition() override; + QRectF maskRectangle() override; qreal width() const override; qreal height() const override; diff --git a/GUI/View/Overlay/IRectangularOverlay.cpp b/GUI/View/Overlay/IRectangularOverlay.cpp index ef92064652dd89f8a1d416e8e1405268b6250526..e9575a607e18b9ac97ed356d91612b344192471d 100644 --- a/GUI/View/Overlay/IRectangularOverlay.cpp +++ b/GUI/View/Overlay/IRectangularOverlay.cpp @@ -104,7 +104,7 @@ void IRectangularOverlay::update_view() { prepareGeometryChange(); update_bounding_rect(); - update_position(); + updatePosition(); } //! updates view's bounding rectangle using item properties @@ -112,7 +112,7 @@ void IRectangularOverlay::update_view() void IRectangularOverlay::update_bounding_rect() { if (parameterizedItem()) { - m_mask_rect = mask_rectangle(); + m_mask_rect = maskRectangle(); if (is_true_mask()) m_bounding_rect = m_mask_rect.marginsAdded( QMarginsF(bbox_margins, bbox_margins, bbox_margins, bbox_margins)); diff --git a/GUI/View/Overlay/IRectangularOverlay.h b/GUI/View/Overlay/IRectangularOverlay.h index 800b3ab6ca9d584f4cfef56eb77e140153f9038e..5a23fe5a57df59998bbc24abcf4de27b866215c2 100644 --- a/GUI/View/Overlay/IRectangularOverlay.h +++ b/GUI/View/Overlay/IRectangularOverlay.h @@ -34,8 +34,8 @@ public slots: protected: void update_view() override; - virtual void update_position() = 0; - virtual QRectF mask_rectangle() = 0; + virtual void updatePosition() = 0; + virtual QRectF maskRectangle() = 0; //... Item properties to scene coordinates virtual qreal width() const = 0; diff --git a/GUI/View/Overlay/RectangleOverlay.cpp b/GUI/View/Overlay/RectangleOverlay.cpp index 98147699a7b8637ab0a7fa07bd064a6b6c11ecf0..9e5a7414d4525219ece8507478774dfc058d89ce 100644 --- a/GUI/View/Overlay/RectangleOverlay.cpp +++ b/GUI/View/Overlay/RectangleOverlay.cpp @@ -69,13 +69,13 @@ void RectangleOverlay::resizeY(double yl, double yh) } //! updates position of view using item properties -void RectangleOverlay::update_position() +void RectangleOverlay::updatePosition() { setX(x2pix(m_item->xLow())); setY(y2pix(m_item->yUp())); } -QRectF RectangleOverlay::mask_rectangle() +QRectF RectangleOverlay::maskRectangle() { return {0, 0, width(), height()}; } diff --git a/GUI/View/Overlay/RectangleOverlay.h b/GUI/View/Overlay/RectangleOverlay.h index 6de057559dd84169bd540d39f04a7c470638d68e..6a84595b64d325494925ca6511a42c4337505320 100644 --- a/GUI/View/Overlay/RectangleOverlay.h +++ b/GUI/View/Overlay/RectangleOverlay.h @@ -41,8 +41,8 @@ private slots: private: QPainterPath shape() const override; - void update_position() override; - QRectF mask_rectangle() override; + void updatePosition() override; + QRectF maskRectangle() override; qreal width() const override; qreal height() const override;