Merge pull request #8271 from pblottiere/as_cancel_id

Fix map tool when auxiliary layer creation is canceled
qgis · Oct 23, 2018 · 9e82d44 · 9e82d44
2 parents 49e8e86 + 6df252a
commit 9e82d44
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/app/qgsmaptoolchangelabelproperties.cpp b/src/app/qgsmaptoolchangelabelproperties.cpp
@@ -71,6 +71,12 @@ void QgsMapToolChangeLabelProperties::canvasPressEvent( QgsMapMouseEvent *e )
     QgsPalIndexes indexes;
     bool newAuxiliaryLayer = createAuxiliaryFields( indexes );
 
+    if ( !newAuxiliaryLayer && !mCurrentLabel.layer->auxiliaryLayer() )
+    {
+      deleteRubberBands();
+      return;
+    }
+
     // in case of a new auxiliary layer, a dialog window is displayed and the
     // canvas release event is lost.
     if ( newAuxiliaryLayer )

diff --git a/src/app/qgsmaptoolmovelabel.cpp b/src/app/qgsmaptoolmovelabel.cpp
@@ -57,13 +57,16 @@ void QgsMapToolMoveLabel::canvasPressEvent( QgsMapMouseEvent *e )
 
   int xCol = -1, yCol = -1;
 
-  if ( !mCurrentLabel.pos.isDiagram &&  !labelMoveable( vlayer, mCurrentLabel.settings, xCol, yCol ) )
+  if ( !mCurrentLabel.pos.isDiagram && !labelMoveable( vlayer, mCurrentLabel.settings, xCol, yCol ) )
   {
     QgsPalIndexes indexes;
 
     if ( createAuxiliaryFields( indexes ) )
       return;
 
+    if ( !labelMoveable( vlayer, mCurrentLabel.settings, xCol, yCol ) )
+      return;
+
     xCol = indexes[ QgsPalLayerSettings::PositionX ];
     yCol = indexes[ QgsPalLayerSettings::PositionY ];
   }
@@ -74,6 +77,9 @@ void QgsMapToolMoveLabel::canvasPressEvent( QgsMapMouseEvent *e )
     if ( createAuxiliaryFields( indexes ) )
       return;
 
+    if ( !diagramMoveable( vlayer, xCol, yCol ) )
+      return;
+
     xCol = indexes[ QgsDiagramLayerSettings::PositionX ];
     yCol = indexes[ QgsDiagramLayerSettings::PositionY ];
   }

diff --git a/src/app/qgsmaptoolrotatelabel.cpp b/src/app/qgsmaptoolrotatelabel.cpp
@@ -83,6 +83,9 @@ void QgsMapToolRotateLabel::canvasPressEvent( QgsMapMouseEvent *e )
       QgsPalIndexes indexes;
       if ( createAuxiliaryFields( indexes ) )
         return;
+
+      if ( !labelIsRotatable( mCurrentLabel.layer, mCurrentLabel.settings, rotationCol ) )
+        return;
     }
 
     if ( currentLabelDataDefinedRotation( mCurrentRotation, hasRotationValue, rotationCol, true ) )