From 29b751b5a23884b108ec0a36ce8aef0c46ce7bb8 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 16 Apr 2018 13:15:16 +0300 Subject: [PATCH] Refactoring. Remove duplicated blocks of code. --HG-- branch : develop --- src/libs/vwidgets/vmaingraphicsview.cpp | 55 ++++++++++++------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/src/libs/vwidgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp index 84a7a0363..adf2145dd 100644 --- a/src/libs/vwidgets/vmaingraphicsview.cpp +++ b/src/libs/vwidgets/vmaingraphicsview.cpp @@ -67,6 +67,29 @@ const int GraphicsViewZoom::updateInterval = 40; const qreal maxSceneSize = ((20.0 * 1000.0) / 25.4) * PrintDPI; // 20 meters in pixels +namespace +{ +int ScrollingSteps(QWheelEvent* wheel_event) +{ + SCASSERT(wheel_event != nullptr) + + const QPoint numPixels = wheel_event->pixelDelta(); + const QPoint numDegrees = wheel_event->angleDelta() / 8; + int numSteps = 0; + + if (not numPixels.isNull()) + { + numSteps = wheel_event->orientation() == Qt::Vertical ? numPixels.y() : numPixels.x(); + } + else if (not numDegrees.isNull()) + { + numSteps = (wheel_event->orientation() == Qt::Vertical ? numDegrees.y() : numDegrees.x()) / 15; + } + + return numSteps; +} +} + //--------------------------------------------------------------------------------------------------------------------- GraphicsViewZoom::GraphicsViewZoom(QGraphicsView* view) : QObject(view), @@ -292,21 +315,9 @@ void GraphicsViewZoom::FictiveSceneRect(QGraphicsScene *sc, QGraphicsView *view) //--------------------------------------------------------------------------------------------------------------------- bool GraphicsViewZoom::StartVerticalScrollings(QWheelEvent *wheel_event) { - SCASSERT(wheel_event != nullptr) + const int numSteps = ScrollingSteps(wheel_event); - const QPoint numPixels = wheel_event->pixelDelta(); - const QPoint numDegrees = wheel_event->angleDelta() / 8; - int numSteps; - - if (not numPixels.isNull()) - { - numSteps = wheel_event->orientation() == Qt::Vertical ? numPixels.y() : numPixels.x(); - } - else if (not numDegrees.isNull()) - { - numSteps = (wheel_event->orientation() == Qt::Vertical ? numDegrees.y() : numDegrees.x()) / 15; - } - else + if (numSteps == 0) { return true;//Just ignore } @@ -327,21 +338,9 @@ bool GraphicsViewZoom::StartVerticalScrollings(QWheelEvent *wheel_event) //--------------------------------------------------------------------------------------------------------------------- bool GraphicsViewZoom::StartHorizontalScrollings(QWheelEvent *wheel_event) { - SCASSERT(wheel_event != nullptr) + const int numSteps = ScrollingSteps(wheel_event); - const QPoint numPixels = wheel_event->pixelDelta(); - const QPoint numDegrees = wheel_event->angleDelta() / 8; - int numSteps; - - if (not numPixels.isNull()) - { - numSteps = wheel_event->orientation() == Qt::Vertical ? numPixels.y() : numPixels.x(); - } - else if (not numDegrees.isNull()) - { - numSteps = (wheel_event->orientation() == Qt::Vertical ? numDegrees.y() : numDegrees.x()) / 15; - } - else + if (numSteps == 0) { return true;//Just ignore }