Remove constrained rotation from hand tool, refactor further, and doc…

…ument
pencil2d · Jul 1, 2019 · f9dcc9c · f9dcc9c
1 parent c6f1f05
commit f9dcc9c
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 15 deletions.
diff --git a/core_lib/src/managers/selectionmanager.cpp b/core_lib/src/managers/selectionmanager.cpp
@@ -244,7 +244,7 @@ void SelectionManager::adjustSelection(const QPointF& currentPoint, qreal offset
     {
         mTempTransformedSelection = transformedSelection;
         QPointF anchorPoint = transformedSelection.center();
-        qreal rotatedAngle = rotatedAngleFromPos(currentPoint, anchorPoint, rotationOffset);
+        qreal rotatedAngle = MathUtils::radToDeg(MathUtils::getDifferenceAngle(anchorPoint, currentPoint)) - rotationOffset;
         if (rotationIncrement > 0) {
             mRotatedAngle = constrainRotationToAngle(rotatedAngle, rotationIncrement);
         } else {
@@ -262,12 +262,6 @@ int SelectionManager::constrainRotationToAngle(const qreal& rotatedAngle, const
     return qRound(rotatedAngle / rotationIncrement) * rotationIncrement;
 }
 
-qreal SelectionManager::rotatedAngleFromPos(const QPointF& currentPoint, const QPointF& anchorPoint, const qreal& currentRotatedOffset) const
-{
-    qreal deltaPoint = atan2( currentPoint.y() - anchorPoint.y(), currentPoint.x() - anchorPoint.x());
-    return MathUtils::radToDeg(deltaPoint) - currentRotatedOffset;
-}
-
 void SelectionManager::setSelection(QRectF rect)
 {
     resetSelectionTransformProperties();

diff --git a/core_lib/src/managers/selectionmanager.h b/core_lib/src/managers/selectionmanager.h
@@ -109,7 +109,6 @@ class SelectionManager : public BaseManager
 private:
 
     int constrainRotationToAngle(const qreal& rotatedAngle, const int& rotationIncrement) const;
-    qreal rotatedAngleFromPos(const QPointF& currentPoint, const QPointF& anchorPoint, const qreal& currentRotatedOffset) const;
 
     QRectF mSelection;
     QRectF mTempTransformedSelection;

diff --git a/core_lib/src/tool/handtool.cpp b/core_lib/src/tool/handtool.cpp
@@ -110,10 +110,6 @@ void HandTool::transformView(Qt::KeyboardModifiers keyMod, Qt::MouseButtons butt
 
         qreal angleOffset = static_cast<qreal>(atan2(curV.y(), curV.x()) - atan2(startV.y(), startV.x()));
         angleOffset = MathUtils::radToDeg(angleOffset);
-        if (keyMod & Qt::ShiftModifier)
-        {
-            angleOffset = qRound(angleOffset / 15) * 15;
-        }
         float newAngle = viewMgr->rotation() + static_cast<float>(angleOffset);
         viewMgr->rotate(newAngle);
     }

diff --git a/core_lib/src/tool/movetool.cpp b/core_lib/src/tool/movetool.cpp
@@ -29,6 +29,7 @@ GNU General Public License for more details.
 #include "scribblearea.h"
 #include "layervector.h"
 #include "layermanager.h"
+#include "mathutils.h"
 #include "vectorimage.h"
 
 
@@ -213,7 +214,7 @@ void MoveTool::beginInteraction(Qt::KeyboardModifiers keyMod, Layer* layer)
     if(selectMan->getMoveMode() == MoveMode::ROTATION) {
         QPointF curPoint = getCurrentPoint();
         QPointF anchorPoint = selectionRect.center();
-        mRotatedAngle = ( atan2( curPoint.y() - anchorPoint.y(), curPoint.x() - anchorPoint.x() ) ) * 180.0 / M_PI - selectMan->myRotation();
+        mRotatedAngle = MathUtils::radToDeg(MathUtils::getDifferenceAngle(anchorPoint, curPoint)) - selectMan->myRotation();
     }
 }
 

diff --git a/core_lib/src/util/mathutils.h b/core_lib/src/util/mathutils.h
@@ -1,14 +1,41 @@
 #ifndef MATHUTILS_H
 #define MATHUTILS_H
 
-#define M_PI 3.14159265358979323846264338327950288
+#include <QtMath>
+#include <QPoint>
 
 namespace MathUtils
 {
-    inline double radToDeg(const double& radians)
+    /** Convert angles from radians to degrees.
+     *
+     * \param radians Angle in radians.
+     * \return Angle in degrees.
+     */
+    inline qreal radToDeg(const qreal radians)
     {
         return radians * 180.0 / M_PI;
     }
+
+    /** Convert angles from degrees to radians.
+     *
+     * \param degrees Angle in degrees.
+     * \return Angle in radians.
+     */
+    inline qreal degToRad(const qreal degrees)
+    {
+        return degrees * M_PI / 180.0;
+    }
+
+    /** Get the angle from the difference vector a->b to the x-axis.
+     *
+     * \param a Start point of vector
+     * \param b End point of vector
+     * \return Angle in radians from [-pi,+pi]
+     */
+    inline qreal getDifferenceAngle(const QPointF a, const QPointF b)
+    {
+        return qAtan2(b.y() - a.y(), b.x() - a.x());
+    }
 }
 
 #endif // MATHUTILS_H