disable maptool if editing stopped or dialog closed + fix deactivated map tool

3nids · 3nids · commit 1c3b0ea19a53 · 2014-09-17T16:15:23.000+02:00
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -100,6 +100,7 @@ QgsRelationReferenceWidget::QgsRelationReferenceWidget( QWidget* parent )
   // map identification button
   mMapIdentificationButton = new QToolButton( this );
   mMapIdentificationAction = new QAction( QgsApplication::getThemeIcon( "/mActionMapIdentification.svg" ), tr( "Select on map" ), this );
+  mMapIdentificationAction->setCheckable( true );
   mMapIdentificationButton->addAction( mMapIdentificationAction );
   mMapIdentificationButton->setDefaultAction( mMapIdentificationAction );
   connect( mMapIdentificationButton, SIGNAL( triggered( QAction* ) ), this, SLOT( mapIdentification() ) );
@@ -182,6 +183,9 @@ void QgsRelationReferenceWidget::setRelation( QgsRelation relation, bool allowNu
 
 void QgsRelationReferenceWidget::setRelationEditable( bool editable )
 {
+  if ( !editable )
+    unsetMapTool();
+
   mComboBox->setEnabled( editable );
   mMapIdentificationButton->setEnabled( editable );
   mRemoveFKButton->setEnabled( editable );
@@ -272,20 +276,6 @@ void QgsRelationReferenceWidget::deleteForeignKey()
   emit foreignKeyChanged( QVariant( QVariant::Int ) );
 }
 
-void QgsRelationReferenceWidget::mapToolDeactivated()
-{
-  if ( mWindowWidget )
-  {
-    mWindowWidget->raise();
-  }
-
-  if ( mMessageBar && mMessageBarItem )
-  {
-    mMessageBar->popWidget( mMessageBarItem );
-  }
-  mMessageBarItem = NULL;
-}
-
 QgsFeature QgsRelationReferenceWidget::relatedFeature()
 {
   QgsFeature f;
@@ -330,6 +320,11 @@ void QgsRelationReferenceWidget::setEditorContext( QgsAttributeEditorContext con
   mEditorContext = context;
   mCanvas = canvas;
   mMessageBar = messageBar;
+
+  if ( mMapTool )
+    delete mMapTool;
+  mMapTool = new QgsMapToolIdentifyFeature( mCanvas );
+  mMapTool->setAction( mMapIdentificationAction );
 }
 
 void QgsRelationReferenceWidget::setEmbedForm( bool display )
@@ -518,19 +513,22 @@ void QgsRelationReferenceWidget::mapIdentification()
   if ( !mCanvas )
     return;
 
-  mMapTool = new QgsMapToolIdentifyFeature( mCanvas, mReferencedLayer );
-  mMapTool->setAction( mMapIdentificationAction );
+  mMapTool->setLayer( mReferencedLayer );
   mCanvas->setMapTool( mMapTool );
+
   mWindowWidget = window();
+  connect( mWindowWidget, SIGNAL( destroyed() ), this, SLOT( unsetMapTool() ) );
+
   mCanvas->raise();
+  mCanvas->activateWindow();
 
   connect( mMapTool, SIGNAL( featureIdentified( QgsFeature ) ), this, SLOT( featureIdentified( const QgsFeature ) ) );
   connect( mMapTool, SIGNAL( deactivated() ), this, SLOT( mapToolDeactivated() ) );
 
   if ( mMessageBar )
   {
     QString title = QString( "Relation %1 for %2." ).arg( mRelationName ).arg( mReferencingLayer->name() );
-    QString msg = tr( "identify a feature of %1 to be associated. Press <ESC> to cancel." ).arg( mReferencedLayer->name() );
+    QString msg = tr( "Identify a feature of %1 to be associated. Press <ESC> to cancel." ).arg( mReferencedLayer->name() );
     mMessageBarItem = QgsMessageBar::createMessage( title, msg );
     mMessageBar->pushItem( mMessageBarItem );
   }
@@ -576,12 +574,31 @@ void QgsRelationReferenceWidget::featureIdentified( const QgsFeature& feature )
   updateAttributeEditorFrame( feature );
   emit foreignKeyChanged( foreignKey() );
 
-  // deactivate map tool if activate
+  unsetMapTool();
+}
+
+void QgsRelationReferenceWidget::unsetMapTool()
+{
+  // deactivate map tool if activated
   if ( mCanvas && mMapTool )
   {
+    /* this will call mapToolDeactivated */
     mCanvas->unsetMapTool( mMapTool );
   }
+}
 
+void QgsRelationReferenceWidget::mapToolDeactivated()
+{
   if ( mWindowWidget )
+  {
     mWindowWidget->raise();
+    mWindowWidget->activateWindow();
+  }
+
+  if ( mMessageBar && mMessageBarItem )
+  {
+    mMessageBar->popWidget( mMessageBarItem );
+  }
+  mMessageBarItem = NULL;
 }
+
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.h b/src/gui/editorwidgets/qgsrelationreferencewidget.h
@@ -95,9 +95,9 @@ class GUI_EXPORT QgsRelationReferenceWidget : public QWidget
     void comboReferenceChanged( int index );
     void deleteForeignKey();
     void featureIdentified( const QgsFeature& feature );
+    void unsetMapTool();
     void mapToolDeactivated();
 
-
   private:
     QgsFeature relatedFeature();
     void highlightFeature( QgsFeature f = QgsFeature(), CanvasExtent canvasExtent = Fixed );
diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp
@@ -169,7 +169,6 @@ void QgsMapToolIdentify::activate()
 
 void QgsMapToolIdentify::deactivate()
 {
-
   QgsMapTool::deactivate();
 }
 
diff --git a/src/gui/qgsmaptoolidentifyfeature.cpp b/src/gui/qgsmaptoolidentifyfeature.cpp
@@ -15,6 +15,7 @@
 
 #include <QMouseEvent>
 
+#include "qgscursors.h"
 #include "qgsmaptoolidentifyfeature.h"
 #include "qgsmapcanvas.h"
 
@@ -23,6 +24,9 @@ QgsMapToolIdentifyFeature::QgsMapToolIdentifyFeature( QgsMapCanvas* canvas, QgsV
     , mCanvas( canvas )
     , mLayer( vl )
 {
+  // set cursor
+  QPixmap cursorPixmap = QPixmap(( const char ** ) cross_hair_cursor );
+  mCursor = QCursor( cursorPixmap, 1, 1 );
 }
 
 void QgsMapToolIdentifyFeature::canvasReleaseEvent( QMouseEvent* e )
@@ -44,6 +48,6 @@ void QgsMapToolIdentifyFeature::keyPressEvent( QKeyEvent* e )
 {
   if ( e->key() == Qt::Key_Escape )
   {
-    deactivate();
+    mCanvas->unsetMapTool( this );
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,6 @@ void QgsMapToolIdentify::activate()`
`169`	`169`
`170`	`170`	`void QgsMapToolIdentify::deactivate()`
`171`	`171`	`{`
`172`		`-`
`173`	`172`	`QgsMapTool::deactivate();`
`174`	`173`	`}`
`175`	`174`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`#include <QMouseEvent>`
`17`	`17`
	`18`	`+#include "qgscursors.h"`
`18`	`19`	`#include "qgsmaptoolidentifyfeature.h"`
`19`	`20`	`#include "qgsmapcanvas.h"`
`20`	`21`
`@@ -23,6 +24,9 @@ QgsMapToolIdentifyFeature::QgsMapToolIdentifyFeature( QgsMapCanvas* canvas, QgsV`
`23`	`24`	`, mCanvas( canvas )`
`24`	`25`	`, mLayer( vl )`
`25`	`26`	`{`
	`27`	`+ // set cursor`
	`28`	`+ QPixmap cursorPixmap = QPixmap(( const char ** ) cross_hair_cursor );`
	`29`	`+ mCursor = QCursor( cursorPixmap, 1, 1 );`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	`void QgsMapToolIdentifyFeature::canvasReleaseEvent( QMouseEvent* e )`
`@@ -44,6 +48,6 @@ void QgsMapToolIdentifyFeature::keyPressEvent( QKeyEvent* e )`
`44`	`48`	`{`
`45`	`49`	`if ( e->key() == Qt::Key_Escape )`
`46`	`50`	`{`
`47`		`- deactivate();`
	`51`	`+ mCanvas->unsetMapTool( this );`
`48`	`52`	`}`
`49`	`53`	`}`