Fix tools which doesn't works when map is rotated

qgis · Sep 28, 2017 · 8e4234c · 8e4234c
1 parent 3f317b6
commit 8e4234c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/src/app/qgsmaptoolellipseextent.cpp b/src/app/qgsmaptoolellipseextent.cpp
@@ -60,15 +60,29 @@ void QgsMapToolEllipseExtent::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 void QgsMapToolEllipseExtent::cadCanvasMoveEvent( QgsMapMouseEvent *e )
 {
   QgsPoint mapPoint( e->mapPoint() );
+
   if ( mTempRubberBand )
   {
-
-    if ( qgsDoubleNear( mCanvas->rotation(), 0.0 ) )
+    switch ( mPoints.size() )
     {
-      mEllipse = QgsEllipse().fromExtent( mPoints.at( 0 ), mapPoint );
-      mTempRubberBand->setGeometry( mEllipse.toPolygon() );
+      case 1:
+      {
+
+        if ( qgsDoubleNear( mCanvas->rotation(), 0.0 ) )
+        {
+          mEllipse = QgsEllipse().fromExtent( mPoints.at( 0 ), mapPoint );
+          mTempRubberBand->setGeometry( mEllipse.toPolygon() );
+        }
+        else
+        {
+          emit messageEmitted( tr( "Cannot use this tool when the map canvas is rotated" ), QgsMessageBar::WARNING );
+          mPoints.clear();
+          break;
+        }
+      }
+      break;
+      default:
+        break;
     }
-    else
-      emit messageEmitted( tr( "Cannot use this tool when the map canvas is rotated" ), QgsMessageBar::WARNING );
   }
 }
diff --git a/src/app/qgsmaptoolrectanglecenter.cpp b/src/app/qgsmaptoolrectanglecenter.cpp
@@ -80,7 +80,11 @@ void QgsMapToolRectangleCenter::cadCanvasMoveEvent( QgsMapMouseEvent *e )
           mTempRubberBand->setGeometry( QgsMapToolAddRectangle::rectangleToPolygon() );
         }
         else
+        {
           emit messageEmitted( tr( "Cannot use this tool when the map canvas is rotated" ), QgsMessageBar::WARNING );
+          mPoints.clear();
+          break;
+        }
       }
       break;
       default:

diff --git a/src/app/qgsmaptoolrectangleextent.cpp b/src/app/qgsmaptoolrectangleextent.cpp
@@ -76,7 +76,11 @@ void QgsMapToolRectangleExtent::cadCanvasMoveEvent( QgsMapMouseEvent *e )
           mTempRubberBand->setGeometry( QgsMapToolAddRectangle::rectangleToPolygon( ) );
         }
         else
+        {
           emit messageEmitted( tr( "Cannot use this tool when the map canvas is rotated" ), QgsMessageBar::WARNING );
+          mPoints.clear();
+          break;
+        }
       }
       break;
       default: