Merge 4c7ae43e466d89e8962d24241eaec484e90e62ca into 74549aad26c3358101e88477d9dfa1caae013d72

python/PyQt6/core/auto_additions/qgis.py

@@ -11505,10 +11505,6 @@ Qgis.MouseHandlesAction.ResizeLeftUp.__doc__ = "Resize left up (Top left handle)
 Qgis.MouseHandlesAction.ResizeRightUp.__doc__ = "Resize right up (Top right handle)"
 Qgis.MouseHandlesAction.ResizeLeftDown.__doc__ = "Resize left down (Bottom left handle)"
 Qgis.MouseHandlesAction.ResizeRightDown.__doc__ = "Resize right down (Bottom right handle)"
-Qgis.MouseHandlesAction.RotateTopLeft.__doc__ = "Rotate from top left handle. \n.. versionadded:: 4.0"
-Qgis.MouseHandlesAction.RotateTopRight.__doc__ = "Rotate from top right handle. \n.. versionadded:: 4.0"
-Qgis.MouseHandlesAction.RotateBottomLeft.__doc__ = "Rotate from bottom left handle. \n.. versionadded:: 4.0"
-Qgis.MouseHandlesAction.RotateBottomRight.__doc__ = "Rotate right bottom right handle. \n.. versionadded:: 4.0"
 Qgis.MouseHandlesAction.SelectItem.__doc__ = "Select item"
 Qgis.MouseHandlesAction.NoAction.__doc__ = "No action"
 Qgis.MouseHandlesAction.__doc__ = """Action to be performed by the mouse handles
@@ -11524,22 +11520,6 @@ Qgis.MouseHandlesAction.__doc__ = """Action to be performed by the mouse handles
 * ``ResizeRightUp``: Resize right up (Top right handle)
 * ``ResizeLeftDown``: Resize left down (Bottom left handle)
 * ``ResizeRightDown``: Resize right down (Bottom right handle)
-* ``RotateTopLeft``: Rotate from top left handle.
-
-  .. versionadded:: 4.0
-
-* ``RotateTopRight``: Rotate from top right handle.
-
-  .. versionadded:: 4.0
-
-* ``RotateBottomLeft``: Rotate from bottom left handle.
-
-  .. versionadded:: 4.0
-
-* ``RotateBottomRight``: Rotate right bottom right handle.
-
-  .. versionadded:: 4.0
-
 * ``SelectItem``: Select item
 * ``NoAction``: No action
 

python/PyQt6/core/auto_generated/qgis.sip.in

@@ -3347,10 +3347,6 @@ The development version
       ResizeRightUp,
       ResizeLeftDown,
       ResizeRightDown,
-      RotateTopLeft,
-      RotateTopRight,
-      RotateBottomLeft,
-      RotateBottomRight,
       SelectItem,
       NoAction
     };

python/PyQt6/core/class_map.yaml

@@ -1,14 +1,14 @@
-Qgis.defaultProjectScales: src/core/qgis.h#L6072
+Qgis.defaultProjectScales: src/core/qgis.h#L6068
 Qgis.devVersion: src/core/qgis.h#L89
-Qgis.geoNone: src/core/qgis.h#L6117
+Qgis.geoNone: src/core/qgis.h#L6113
-Qgis.geoProj4: src/core/qgis.h#L6147
+Qgis.geoProj4: src/core/qgis.h#L6143
-Qgis.geoWkt: src/core/qgis.h#L6138
+Qgis.geoWkt: src/core/qgis.h#L6134
-Qgis.geographicCrsAuthId: src/core/qgis.h#L6127
+Qgis.geographicCrsAuthId: src/core/qgis.h#L6123
-Qgis.geosVersion: src/core/qgis.h#L6107
+Qgis.geosVersion: src/core/qgis.h#L6103
-Qgis.geosVersionInt: src/core/qgis.h#L6079
+Qgis.geosVersionInt: src/core/qgis.h#L6075
-Qgis.geosVersionMajor: src/core/qgis.h#L6086
+Qgis.geosVersionMajor: src/core/qgis.h#L6082
-Qgis.geosVersionMinor: src/core/qgis.h#L6093
+Qgis.geosVersionMinor: src/core/qgis.h#L6089
-Qgis.geosVersionPatch: src/core/qgis.h#L6100
+Qgis.geosVersionPatch: src/core/qgis.h#L6096
 Qgis.releaseName: src/core/qgis.h#L79
 Qgis.version: src/core/qgis.h#L65
 Qgis.versionInt: src/core/qgis.h#L72

python/core/auto_additions/qgis.py

@@ -11411,10 +11411,6 @@ Qgis.MouseHandlesAction.ResizeLeftUp.__doc__ = "Resize left up (Top left handle)
 Qgis.MouseHandlesAction.ResizeRightUp.__doc__ = "Resize right up (Top right handle)"
 Qgis.MouseHandlesAction.ResizeLeftDown.__doc__ = "Resize left down (Bottom left handle)"
 Qgis.MouseHandlesAction.ResizeRightDown.__doc__ = "Resize right down (Bottom right handle)"
-Qgis.MouseHandlesAction.RotateTopLeft.__doc__ = "Rotate from top left handle. \n.. versionadded:: 4.0"
-Qgis.MouseHandlesAction.RotateTopRight.__doc__ = "Rotate from top right handle. \n.. versionadded:: 4.0"
-Qgis.MouseHandlesAction.RotateBottomLeft.__doc__ = "Rotate from bottom left handle. \n.. versionadded:: 4.0"
-Qgis.MouseHandlesAction.RotateBottomRight.__doc__ = "Rotate right bottom right handle. \n.. versionadded:: 4.0"
 Qgis.MouseHandlesAction.SelectItem.__doc__ = "Select item"
 Qgis.MouseHandlesAction.NoAction.__doc__ = "No action"
 Qgis.MouseHandlesAction.__doc__ = """Action to be performed by the mouse handles
@@ -11430,22 +11426,6 @@ Qgis.MouseHandlesAction.__doc__ = """Action to be performed by the mouse handles
 * ``ResizeRightUp``: Resize right up (Top right handle)
 * ``ResizeLeftDown``: Resize left down (Bottom left handle)
 * ``ResizeRightDown``: Resize right down (Bottom right handle)
-* ``RotateTopLeft``: Rotate from top left handle.
-
-  .. versionadded:: 4.0
-
-* ``RotateTopRight``: Rotate from top right handle.
-
-  .. versionadded:: 4.0
-
-* ``RotateBottomLeft``: Rotate from bottom left handle.
-
-  .. versionadded:: 4.0
-
-* ``RotateBottomRight``: Rotate right bottom right handle.
-
-  .. versionadded:: 4.0
-
 * ``SelectItem``: Select item
 * ``NoAction``: No action
 

python/core/auto_generated/qgis.sip.in

@@ -3347,10 +3347,6 @@ The development version
       ResizeRightUp,
       ResizeLeftDown,
       ResizeRightDown,
-      RotateTopLeft,
-      RotateTopRight,
-      RotateBottomLeft,
-      RotateBottomRight,
       SelectItem,
       NoAction
     };

python/core/class_map.yaml

@@ -1,14 +1,14 @@
-Qgis.defaultProjectScales: src/core/qgis.h#L6072
+Qgis.defaultProjectScales: src/core/qgis.h#L6068
 Qgis.devVersion: src/core/qgis.h#L89
-Qgis.geoNone: src/core/qgis.h#L6117
+Qgis.geoNone: src/core/qgis.h#L6113
-Qgis.geoProj4: src/core/qgis.h#L6147
+Qgis.geoProj4: src/core/qgis.h#L6143
-Qgis.geoWkt: src/core/qgis.h#L6138
+Qgis.geoWkt: src/core/qgis.h#L6134
-Qgis.geographicCrsAuthId: src/core/qgis.h#L6127
+Qgis.geographicCrsAuthId: src/core/qgis.h#L6123
-Qgis.geosVersion: src/core/qgis.h#L6107
+Qgis.geosVersion: src/core/qgis.h#L6103
-Qgis.geosVersionInt: src/core/qgis.h#L6079
+Qgis.geosVersionInt: src/core/qgis.h#L6075
-Qgis.geosVersionMajor: src/core/qgis.h#L6086
+Qgis.geosVersionMajor: src/core/qgis.h#L6082
-Qgis.geosVersionMinor: src/core/qgis.h#L6093
+Qgis.geosVersionMinor: src/core/qgis.h#L6089
-Qgis.geosVersionPatch: src/core/qgis.h#L6100
+Qgis.geosVersionPatch: src/core/qgis.h#L6096
 Qgis.releaseName: src/core/qgis.h#L79
 Qgis.version: src/core/qgis.h#L65
 Qgis.versionInt: src/core/qgis.h#L72

python/pyplugin_installer/installer_data.py

@@ -658,9 +658,6 @@ class Repositories(QObject):
                         .text()
                         .strip()
                     )
-                    supports_qt6 = pluginNodes.item(i).firstChildElement(
-                        "supports_qt6"
-                    ).text().strip().upper() in ["TRUE", "YES"]
                     if not qgisMaximumVersion:
                         if qgisMinimumVersion[0] == "3" and supports_qt6:
                             qgisMaximumVersion = "4.99"

src/core/qgis.h

@@ -5897,10 +5897,6 @@ class CORE_EXPORT Qgis
       ResizeRightUp, //!< Resize right up (Top right handle)
       ResizeLeftDown, //!< Resize left down (Bottom left handle)
       ResizeRightDown, //!< Resize right down (Bottom right handle)
-      RotateTopLeft, //!< Rotate from top left handle. \since QGIS 4.0
-      RotateTopRight, //!< Rotate from top right handle. \since QGIS 4.0
-      RotateBottomLeft, //!< Rotate from bottom left handle. \since QGIS 4.0
-      RotateBottomRight, //!< Rotate right bottom right handle. \since QGIS 4.0
       SelectItem, //!< Select item
       NoAction //!< No action
     };

src/gui/layout/qgslayoutguiutils.cpp

@@ -196,10 +196,6 @@ void QgsLayoutGuiUtils::registerGuiForKnownItemTypes( QgsMapCanvas *mapCanvas )
       case Qgis::MouseHandlesAction::MoveItem:
       case Qgis::MouseHandlesAction::NoAction:
       case Qgis::MouseHandlesAction::SelectItem:
-      case Qgis::MouseHandlesAction::RotateTopLeft:
-      case Qgis::MouseHandlesAction::RotateTopRight:
-      case Qgis::MouseHandlesAction::RotateBottomLeft:
-      case Qgis::MouseHandlesAction::RotateBottomRight:
         return;
 
       case Qgis::MouseHandlesAction::ResizeUp:

src/gui/layout/qgslayoutmousehandles.cpp

@@ -44,8 +44,6 @@ QgsLayoutMouseHandles::QgsLayoutMouseHandles( QgsLayout *layout, QgsLayoutView *
   , mLayout( layout )
   , mView( view )
 {
-  setRotationEnabled( true );
-
   //listen for selection changes, and update handles accordingly
   connect( mLayout, &QGraphicsScene::selectionChanged, this, &QgsLayoutMouseHandles::selectionChanged );
 
@@ -253,16 +251,6 @@ void QgsLayoutMouseHandles::moveItem( QGraphicsItem *item, double deltaX, double
   qgis::down_cast<QgsLayoutItem *>( item )->attemptMoveBy( deltaX, deltaY );
 }
 
-void QgsLayoutMouseHandles::rotateItem( QGraphicsItem *item, double deltaDegree, double deltaCenterX, double deltaCenterY )
-{
-  QgsLayoutItem *itm = qgis::down_cast<QgsLayoutItem *>( item );
-  QgsLayoutItem::ReferencePoint previousReferencePoint = itm->referencePoint();
-  itm->setReferencePoint( QgsLayoutItem::Middle );
-  itm->attemptMoveBy( deltaCenterX, deltaCenterY );
-  itm->setItemRotation( itm->itemRotation() + deltaDegree, true );
-  itm->setReferencePoint( previousReferencePoint );
-}
-
 void QgsLayoutMouseHandles::setItemRect( QGraphicsItem *item, QRectF rect )
 {
   QgsLayoutItem *layoutItem = dynamic_cast<QgsLayoutItem *>( item );

src/gui/layout/qgslayoutmousehandles.h

@@ -74,7 +74,6 @@ class GUI_EXPORT QgsLayoutMouseHandles : public QgsGraphicsViewMouseHandles
     void expandItemList( const QList<QGraphicsItem *> &items, QList<QGraphicsItem *> &collected ) const override;
     void expandItemList( const QList<QgsLayoutItem *> &items, QList<QGraphicsItem *> &collected ) const;
     void moveItem( QGraphicsItem *item, double deltaX, double deltaY ) override;
-    void rotateItem( QGraphicsItem *item, double deltaDegree, double deltaCenterX, double deltaCenterY ) override;
     void setItemRect( QGraphicsItem *item, QRectF rect ) override;
     void showStatusMessage( const QString &message ) override;
     void hideAlignItems() override;

src/gui/qgsgraphicsviewmousehandles.cpp

@@ -15,13 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "moc_qgsgraphicsviewmousehandles.cpp"
-
-#include "qgis.h"
 #include "qgsgraphicsviewmousehandles.h"
-#include "qgslayoututils.h"
+#include "moc_qgsgraphicsviewmousehandles.cpp"
 #include "qgsrendercontext.h"
-
+#include "qgis.h"
 #include <QGraphicsView>
 #include <QGraphicsSceneHoverEvent>
 #include <QPainter>
@@ -37,28 +34,6 @@ QgsGraphicsViewMouseHandles::QgsGraphicsViewMouseHandles( QGraphicsView *view )
 {
   //accept hover events, required for changing cursor to resize cursors
   setAcceptHoverEvents( true );
-
-  //prepare rotation handle path
-  mRotationHandlePath.moveTo( 0, 14 );
-  mRotationHandlePath.lineTo( 6, 20 );
-  mRotationHandlePath.lineTo( 12, 14 );
-  mRotationHandlePath.arcTo( 8, 8, 12, 12, 180, -90 );
-  mRotationHandlePath.lineTo( 14, 12 );
-  mRotationHandlePath.lineTo( 20, 6 );
-  mRotationHandlePath.lineTo( 14, 0 );
-  mRotationHandlePath.arcTo( 4, 4, 20, 20, 90, 90 );
-  mRotationHandlePath.lineTo( 0, 14 );
-}
-
-void QgsGraphicsViewMouseHandles::setRotationEnabled( bool enable )
-{
-  if ( mRotationEnabled == enable )
-  {
-    return;
-  }
-
-  mRotationEnabled = enable;
-  update();
 }
 
 void QgsGraphicsViewMouseHandles::paintInternal( QPainter *painter, bool showHandles, bool showStaticBoundingBoxes, bool showTemporaryBoundingBoxes, const QStyleOptionGraphicsItem *, QWidget * )
@@ -87,11 +62,6 @@ QRectF QgsGraphicsViewMouseHandles::storedItemRect( QGraphicsItem *item ) const
   return itemRect( item );
 }
 
-void QgsGraphicsViewMouseHandles::rotateItem( QGraphicsItem *, double, double, double )
-{
-  QgsDebugError( QStringLiteral( "Rotation is not implemented for this class" ) );
-}
-
 void QgsGraphicsViewMouseHandles::previewItemMove( QGraphicsItem *, double, double )
 {
 }
@@ -138,7 +108,7 @@ void QgsGraphicsViewMouseHandles::drawHandles( QPainter *painter, double rectHan
   painter->setBrush( Qt::NoBrush );
   painter->drawRect( QRectF( 0, 0, rect().width(), rect().height() ) );
 
-  //draw resize handles, using filled white boxes
+  //draw resize handles, using a filled white box
   painter->setBrush( QColor( 255, 255, 255, 255 ) );
   //top left
   painter->drawRect( QRectF( 0, 0, rectHandlerSize, rectHandlerSize ) );
@@ -156,63 +126,6 @@ void QgsGraphicsViewMouseHandles::drawHandles( QPainter *painter, double rectHan
   painter->drawRect( QRectF( ( rect().width() - rectHandlerSize ) / 2, rect().height() - rectHandlerSize, rectHandlerSize, rectHandlerSize ) );
   //bottom right
   painter->drawRect( QRectF( rect().width() - rectHandlerSize, rect().height() - rectHandlerSize, rectHandlerSize, rectHandlerSize ) );
-
-  if ( isRotationEnabled() )
-  {
-    //draw rotate handles
-    const double scale = rectHandlerSize / mHandleSize;
-    const bool drawBottomRotationHandles = ( rectHandlerSize * 2 ) + ( mRotationHandleSize * scale * 2 ) < rect().height();
-    const bool drawRightRotationHandles = ( rectHandlerSize * 2 ) + ( mRotationHandleSize * scale * 2 ) < rect().width();
-    QTransform transform;
-
-    //top left
-    transform.reset();
-    transform.translate( rectHandlerSize, rectHandlerSize );
-    transform.scale( scale, scale );
-    painter->save();
-    painter->setTransform( transform, true );
-    painter->drawPath( mRotationHandlePath );
-    painter->restore();
-
-    //top right
-    if ( drawRightRotationHandles )
-    {
-      transform.reset();
-      transform.translate( rect().width() - rectHandlerSize, rectHandlerSize );
-      transform.rotate( 90 );
-      transform.scale( scale, scale );
-      painter->save();
-      painter->setTransform( transform, true );
-      painter->drawPath( mRotationHandlePath );
-      painter->restore();
-    }
-
-    if ( drawBottomRotationHandles )
-    {
-      //bottom left
-      transform.reset();
-      transform.translate( rectHandlerSize, rect().height() - rectHandlerSize );
-      transform.rotate( 270 );
-      transform.scale( scale, scale );
-      painter->save();
-      painter->setTransform( transform, true );
-      painter->drawPath( mRotationHandlePath );
-      painter->restore();
-    }
-
-    if ( drawBottomRotationHandles && drawRightRotationHandles )
-    {
-      //bottom right
-      transform.reset();
-      transform.translate( rect().width() - rectHandlerSize, rect().height() - rectHandlerSize );
-      transform.rotate( 180 );
-      transform.scale( scale, scale );
-      painter->save();
-      painter->setTransform( transform, true );
-      painter->drawPath( mRotationHandlePath );
-      painter->restore();
-    }
-  }
 }
 
 void QgsGraphicsViewMouseHandles::drawSelectedItemBounds( QPainter *painter )
@@ -268,17 +181,6 @@ void QgsGraphicsViewMouseHandles::drawSelectedItemBounds( QPainter *painter )
       relativeResizeRect( thisItemRect, QRectF( -mResizeMoveX, -mResizeMoveY, mBeginHandleWidth, mBeginHandleHeight ), mResizeRect );
       itemBounds = QPolygonF( thisItemRect );
     }
-    else if ( isRotating() && !itemIsLocked( item ) )
-    {
-      const QPolygonF itemSceneBounds = item->mapToScene( itemRect( item ) );
-      const QPointF rotationCenter = sceneTransform().map( rect().center() );
-
-      QTransform transform;
-      transform.translate( rotationCenter.x(), rotationCenter.y() );
-      transform.rotate( mRotationDelta );
-      transform.translate( -rotationCenter.x(), -rotationCenter.y() );
-      itemBounds = mapFromScene( transform.map( itemSceneBounds ) );
-    }
     else
     {
       // not resizing or moving, so just map the item's bounds to the mouse handle item's coordinate system
@@ -293,7 +195,7 @@ void QgsGraphicsViewMouseHandles::drawSelectedItemBounds( QPainter *painter )
   }
 }
 
-double QgsGraphicsViewMouseHandles::rectHandlerBorderTolerance() const
+double QgsGraphicsViewMouseHandles::rectHandlerBorderTolerance()
 {
   if ( !mView )
     return 0;
@@ -410,12 +312,6 @@ Qt::CursorShape QgsGraphicsViewMouseHandles::cursorForPosition( QPointF itemCoor
       }
     case Qgis::MouseHandlesAction::SelectItem:
       return Qt::ArrowCursor;
-
-    case Qgis::MouseHandlesAction::RotateTopLeft:
-    case Qgis::MouseHandlesAction::RotateTopRight:
-    case Qgis::MouseHandlesAction::RotateBottomLeft:
-    case Qgis::MouseHandlesAction::RotateBottomRight:
-      return Qt::PointingHandCursor;
   }
 
   return Qt::ArrowCursor;
@@ -428,14 +324,8 @@ Qgis::MouseHandlesAction QgsGraphicsViewMouseHandles::mouseActionForPosition( QP
   bool nearLowerBorder = false;
   bool nearUpperBorder = false;
 
-  bool nearLeftInner = false;
-  bool nearRightInner = false;
-  bool nearLowerInner = false;
-  bool nearUpperInner = false;
-
   bool withinWidth = false;
   bool withinHeight = false;
-
   if ( itemCoordPos.x() >= 0 && itemCoordPos.x() <= rect().width() )
   {
     withinWidth = true;
@@ -446,40 +336,23 @@ Qgis::MouseHandlesAction QgsGraphicsViewMouseHandles::mouseActionForPosition( QP
   }
 
   double borderTolerance = rectHandlerBorderTolerance();
-  double innerTolerance = mRotationHandleSize * borderTolerance / mHandleSize;
 
   if ( itemCoordPos.x() >= 0 && itemCoordPos.x() < borderTolerance )
   {
     nearLeftBorder = true;
   }
-  else if ( isRotationEnabled() && itemCoordPos.x() >= borderTolerance && itemCoordPos.x() < ( borderTolerance + innerTolerance ) )
-  {
-    nearLeftInner = true;
-  }
   if ( itemCoordPos.y() >= 0 && itemCoordPos.y() < borderTolerance )
   {
     nearUpperBorder = true;
   }
-  else if ( isRotationEnabled() && itemCoordPos.y() >= borderTolerance && itemCoordPos.y() < ( borderTolerance + innerTolerance ) )
-  {
-    nearUpperInner = true;
-  }
   if ( itemCoordPos.x() <= rect().width() && itemCoordPos.x() > ( rect().width() - borderTolerance ) )
   {
     nearRightBorder = true;
   }
-  else if ( isRotationEnabled() && itemCoordPos.x() <= ( rect().width() - borderTolerance ) && itemCoordPos.x() > ( rect().width() - borderTolerance - innerTolerance ) )
-  {
-    nearRightInner = true;
-  }
   if ( itemCoordPos.y() <= rect().height() && itemCoordPos.y() > ( rect().height() - borderTolerance ) )
   {
     nearLowerBorder = true;
   }
-  else if ( isRotationEnabled() && itemCoordPos.y() <= ( rect().height() - borderTolerance ) && itemCoordPos.y() > ( rect().height() - borderTolerance - innerTolerance ) )
-  {
-    nearLowerInner = true;
-  }
 
   if ( nearLeftBorder && nearUpperBorder )
   {
@@ -513,22 +386,6 @@ Qgis::MouseHandlesAction QgsGraphicsViewMouseHandles::mouseActionForPosition( QP
   {
     return Qgis::MouseHandlesAction::ResizeDown;
   }
-  else if ( nearLeftInner && nearUpperInner )
-  {
-    return Qgis::MouseHandlesAction::RotateTopLeft;
-  }
-  else if ( nearRightInner && nearUpperInner )
-  {
-    return Qgis::MouseHandlesAction::RotateTopRight;
-  }
-  else if ( nearLeftInner && nearLowerInner )
-  {
-    return Qgis::MouseHandlesAction::RotateBottomLeft;
-  }
-  else if ( nearRightInner && nearLowerInner )
-  {
-    return Qgis::MouseHandlesAction::RotateBottomRight;
-  }
 
   //find out if cursor position is over a selected item
   QPointF scenePoint = mapToScene( itemCoordPos );
@@ -632,42 +489,19 @@ void QgsGraphicsViewMouseHandles::mousePressEvent( QGraphicsSceneMouseEvent *eve
 
   hideAlignItems();
 
-  switch ( mCurrentMouseMoveAction )
+  if ( mCurrentMouseMoveAction == Qgis::MouseHandlesAction::MoveItem )
   {
-    case Qgis::MouseHandlesAction::MoveItem:
+    //moving items
-      //moving items
+    mIsDragging = true;
-      mIsDragging = true;
+  }
-      break;
+  else if ( mCurrentMouseMoveAction != Qgis::MouseHandlesAction::SelectItem && mCurrentMouseMoveAction != Qgis::MouseHandlesAction::NoAction )
-
+  {
-    case Qgis::MouseHandlesAction::ResizeUp:
+    //resizing items
-    case Qgis::MouseHandlesAction::ResizeDown:
+    mIsResizing = true;
-    case Qgis::MouseHandlesAction::ResizeLeft:
+    mResizeRect = QRectF( 0, 0, mBeginHandleWidth, mBeginHandleHeight );
-    case Qgis::MouseHandlesAction::ResizeRight:
+    mResizeMoveX = 0;
-    case Qgis::MouseHandlesAction::ResizeLeftUp:
+    mResizeMoveY = 0;
-    case Qgis::MouseHandlesAction::ResizeRightUp:
+    mCursorOffset = calcCursorEdgeOffset( mMouseMoveStartPos );
-    case Qgis::MouseHandlesAction::ResizeLeftDown:
-    case Qgis::MouseHandlesAction::ResizeRightDown:
-      //resizing items
-      mIsResizing = true;
-      mResizeRect = QRectF( 0, 0, mBeginHandleWidth, mBeginHandleHeight );
-      mResizeMoveX = 0;
-      mResizeMoveY = 0;
-      mCursorOffset = calcCursorEdgeOffset( mMouseMoveStartPos );
-      break;
-
-    case Qgis::MouseHandlesAction::RotateTopLeft:
-    case Qgis::MouseHandlesAction::RotateTopRight:
-    case Qgis::MouseHandlesAction::RotateBottomLeft:
-    case Qgis::MouseHandlesAction::RotateBottomRight:
-      mIsRotating = true;
-      mRotationCenter = sceneTransform().map( rect().center() );
-      mRotationBegin = std::atan2( mMouseMoveStartPos.y() - mRotationCenter.y(), mMouseMoveStartPos.x() - mRotationCenter.x() ) * 180 / M_PI;
-      mRotationCurrent = 0.0;
-      break;
-
-    case Qgis::MouseHandlesAction::SelectItem:
-    case Qgis::MouseHandlesAction::NoAction:
-      break;
   }
 }
 
@@ -703,12 +537,6 @@ void QgsGraphicsViewMouseHandles::mouseMoveEvent( QGraphicsSceneMouseEvent *even
     //resize from center if alt depressed
     resizeMouseMove( event->lastScenePos(), event->modifiers() & Qt::ShiftModifier, event->modifiers() & Qt::AltModifier );
   }
-  else if ( isRotating() )
-  {
-    //currently rotating a selection
-    //snap to common angles if ctrl is pressed
-    rotateMouseMove( event->lastScenePos(), event->modifiers() & Qt::ControlModifier );
-  }
 }
 
 void QgsGraphicsViewMouseHandles::mouseReleaseEvent( QGraphicsSceneMouseEvent *event )
@@ -739,13 +567,12 @@ void QgsGraphicsViewMouseHandles::mouseReleaseEvent( QGraphicsSceneMouseEvent *e
   {
     mIsDragging = false;
     mIsResizing = false;
-    mIsRotating = false;
     update();
     hideAlignItems();
     return;
   }
 
-  if ( mIsDragging )
+  if ( mCurrentMouseMoveAction == Qgis::MouseHandlesAction::MoveItem )
   {
     //move selected items
     startMacroCommand( tr( "Move Items" ) );
@@ -770,10 +597,8 @@ void QgsGraphicsViewMouseHandles::mouseReleaseEvent( QGraphicsSceneMouseEvent *e
       endItemCommand( item );
     }
     endMacroCommand();
-
-    mIsDragging = false;
   }
-  else if ( mIsResizing )
+  else if ( mCurrentMouseMoveAction != Qgis::MouseHandlesAction::NoAction )
   {
     //resize selected items
     startMacroCommand( tr( "Resize Items" ) );
@@ -810,44 +635,17 @@ void QgsGraphicsViewMouseHandles::mouseReleaseEvent( QGraphicsSceneMouseEvent *e
       endItemCommand( item );
     }
     endMacroCommand();
-
-    mIsResizing = false;
-  }
-  else if ( mIsRotating )
-  {
-    const QPointF itemRotationCenter = sceneTransform().map( rect().center() );
-
-    //move selected items
-    startMacroCommand( tr( "Rotate Items" ) );
-
-    //move all selected items
-    const QList<QGraphicsItem *> selectedItems = selectedSceneItems( false );
-    for ( QGraphicsItem *item : selectedItems )
-    {
-      if ( itemIsLocked( item ) || ( item->flags() & QGraphicsItem::ItemIsSelectable ) == 0 || itemIsGroupMember( item ) )
-      {
-        //don't move locked items, or grouped items (group takes care of that)
-        continue;
-      }
-
-      const QPointF itemCenter = item->mapToScene( itemRect( item ) ).boundingRect().center();
-
-      QTransform transform;
-      transform.translate( itemRotationCenter.x(), itemRotationCenter.y() );
-      transform.rotate( mRotationDelta );
-      transform.translate( -itemRotationCenter.x(), -itemRotationCenter.y() );
-      const QPointF rotatedItemCenter = transform.map( itemCenter );
-
-      createItemCommand( item );
-      rotateItem( item, mRotationDelta, rotatedItemCenter.x() - itemCenter.x(), rotatedItemCenter.y() - itemCenter.y() );
-      endItemCommand( item );
-    }
-    endMacroCommand();
-
-    mIsRotating = false;
   }
 
   hideAlignItems();
+  if ( mIsDragging )
+  {
+    mIsDragging = false;
+  }
+  if ( mIsResizing )
+  {
+    mIsResizing = false;
+  }
 
   //reset default action
   mCurrentMouseMoveAction = Qgis::MouseHandlesAction::MoveItem;
@@ -923,36 +721,6 @@ void QgsGraphicsViewMouseHandles::updateHandles()
   update();
 }
 
-void QgsGraphicsViewMouseHandles::rotateMouseMove( QPointF currentPosition, bool snapToCommonAngles )
-{
-  if ( !scene() )
-  {
-    return;
-  }
-
-  mRotationCurrent = std::atan2( currentPosition.y() - mRotationCenter.y(), currentPosition.x() - mRotationCenter.x() ) * 180 / M_PI;
-  mRotationDelta = mRotationCurrent - mRotationBegin;
-  if ( snapToCommonAngles )
-  {
-    mRotationDelta = QgsLayoutUtils::snappedAngle( mRotationDelta );
-  }
-
-  const double itemRotationRadian = rotation() * M_PI / 180;
-  const double deltaX = ( rect().width() / 2 ) * cos( itemRotationRadian ) - ( rect().height() / 2 ) * sin( itemRotationRadian );
-  const double deltaY = ( rect().width() / 2 ) * sin( itemRotationRadian ) + ( rect().height() / 2 ) * cos( itemRotationRadian );
-
-  QTransform rotateTransform;
-  rotateTransform.translate( deltaX, deltaY );
-  rotateTransform.rotate( mRotationDelta );
-  rotateTransform.translate( -deltaX, -deltaY );
-  setTransform( rotateTransform );
-
-  //show current selection rotation in status bar
-  showStatusMessage( tr( "rotation: %1°" ).arg( QString::number( mRotationDelta, 'f', 2 ) ) );
-
-  return;
-}
-
 void QgsGraphicsViewMouseHandles::dragMouseMove( QPointF currentPosition, bool lockMovement, bool preventSnap )
 {
   if ( !scene() )
@@ -1217,10 +985,6 @@ void QgsGraphicsViewMouseHandles::resizeMouseMove( QPointF currentPosition, bool
       break;
     }
 
-    case Qgis::MouseHandlesAction::RotateTopLeft:
-    case Qgis::MouseHandlesAction::RotateTopRight:
-    case Qgis::MouseHandlesAction::RotateBottomLeft:
-    case Qgis::MouseHandlesAction::RotateBottomRight:
     case Qgis::MouseHandlesAction::MoveItem:
     case Qgis::MouseHandlesAction::SelectItem:
     case Qgis::MouseHandlesAction::NoAction:
@@ -1335,10 +1099,6 @@ QSizeF QgsGraphicsViewMouseHandles::calcCursorEdgeOffset( QPointF cursorPos )
     case Qgis::MouseHandlesAction::ResizeLeftDown:
       return QSizeF( sceneMousePos.x(), sceneMousePos.y() - rect().height() );
 
-    case Qgis::MouseHandlesAction::RotateTopLeft:
-    case Qgis::MouseHandlesAction::RotateTopRight:
-    case Qgis::MouseHandlesAction::RotateBottomLeft:
-    case Qgis::MouseHandlesAction::RotateBottomRight:
     case Qgis::MouseHandlesAction::MoveItem:
     case Qgis::MouseHandlesAction::SelectItem:
     case Qgis::MouseHandlesAction::NoAction:

src/gui/qgsgraphicsviewmousehandles.h

@@ -77,37 +77,11 @@ class GUI_EXPORT QgsGraphicsViewMouseHandles : public QObject, public QGraphicsR
     //! Returns TRUE is user is currently resizing with the handles
     bool isResizing() const { return mIsResizing; }
 
-    /**
-     * Returns TRUE is user is currently rotating with the handles.
-     * 
-     * \since QGIS 4.0
-     */
-    bool isRotating() const { return mIsRotating; }
-
     bool shouldBlockEvent( QInputEvent *event ) const;
 
     //! Initializes a drag operation \since QGIS 3.34
     void startMove( QPointF sceneCoordPos );
 
-    /**
-     * Returns TRUE if rotation functionality is enabled.
-     * 
-     * Rotation is not enabled by default.
-     * 
-     * \since QGIS 4.0
-     */
-    bool isRotationEnabled() const { return mRotationEnabled; }
-
-    /**
-     * Sets whether rotation functionality is enabled.
-     * 
-     * Rotation is not enabled by default. Subclasses must implement the
-     * rotateItem() method in order to support rotation.
-     * 
-     * \since QGIS 4.0
-     */
-    void setRotationEnabled( bool enable );
-
   public slots:
 
     //! Redraws handles when selected item size changes
@@ -137,7 +111,6 @@ class GUI_EXPORT QgsGraphicsViewMouseHandles : public QObject, public QGraphicsR
     virtual QRectF itemRect( QGraphicsItem *item ) const = 0;
     virtual QRectF storedItemRect( QGraphicsItem *item ) const;
     virtual void moveItem( QGraphicsItem *item, double deltaX, double deltaY ) = 0;
-    virtual void rotateItem( QGraphicsItem *item, double deltaDegree, double deltaCenterX, double deltaCenterY );
     virtual void previewItemMove( QGraphicsItem *item, double deltaX, double deltaY );
     virtual void setItemRect( QGraphicsItem *item, QRectF rect ) = 0;
 
@@ -185,9 +158,6 @@ class GUI_EXPORT QgsGraphicsViewMouseHandles : public QObject, public QGraphicsR
     //! Handles resizing of items during mouse move
     void resizeMouseMove( QPointF currentPosition, bool lockAspect, bool fromCenter );
 
-    //! Handles rotating of tiems during mouse move
-    void rotateMouseMove( QPointF currentPosition, bool snapToCommonAngles );
-
     void setHandleSize( double size );
 
     //! Finds out which mouse move action to choose depending on the cursor position inside the widget
@@ -224,8 +194,6 @@ class GUI_EXPORT QgsGraphicsViewMouseHandles : public QObject, public QGraphicsR
     QGraphicsView *mView = nullptr;
 
     double mHandleSize = 10;
-    double mRotationHandleSize = 20;
-    QPainterPath mRotationHandlePath;
 
     QSizeF mCursorOffset;
     double mResizeMoveX = 0;
@@ -237,16 +205,6 @@ class GUI_EXPORT QgsGraphicsViewMouseHandles : public QObject, public QGraphicsR
 
     QRectF mResizeRect;
 
-    bool mRotationEnabled = false;
-    //! Center point around which rotation occurs
-    QPointF mRotationCenter;
-    //! The starting rotation angle from center point
-    double mRotationBegin = 0.0;
-    //! The current rotation angle from center point
-    double mRotationCurrent = 0.0;
-    //! The rotation angle delta to be applied (can be snapped to common angle)
-    double mRotationDelta = 0.0;
-
     //! Start point of the last mouse move action (in scene coordinates)
     QPointF mMouseMoveStartPos;
 
@@ -257,8 +215,6 @@ class GUI_EXPORT QgsGraphicsViewMouseHandles : public QObject, public QGraphicsR
     bool mIsDragging = false;
     //! True is user is currently resizing items
     bool mIsResizing = false;
-    //! True is user is currently rotating items
-    bool mIsRotating = false;
 
     //! Position of the mouse at beginning of move/resize (in scene coordinates)
     QPointF mBeginMouseEventPos;
@@ -276,7 +232,7 @@ class GUI_EXPORT QgsGraphicsViewMouseHandles : public QObject, public QGraphicsR
      * Returns the current (zoom level dependent) tolerance to decide if mouse position is close enough to the
      * item border for resizing.
     */
-    double rectHandlerBorderTolerance() const;
+    double rectHandlerBorderTolerance();
 
     //! Finds out the appropriate cursor for the current mouse position in the widget (e.g. move in the middle, resize at border)
     Qt::CursorShape cursorForPosition( QPointF itemCoordPos );