Refresh map extent when activating sync extent mode

qgis · Mar 13, 2017 · b279900 · b279900
1 parent ea10cc6
commit b279900
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/app/qgsmapcanvasdockwidget.cpp b/src/app/qgsmapcanvasdockwidget.cpp
@@ -44,6 +44,7 @@ QgsMapCanvasDockWidget::QgsMapCanvasDockWidget( const QString &name, QWidget *pa
 
   setWindowTitle( name );
   mMapCanvas = new QgsMapCanvas( this );
+
   mPanTool = new QgsMapToolPan( mMapCanvas );
   mMapCanvas->setMapTool( mPanTool );
 
@@ -53,7 +54,11 @@ QgsMapCanvasDockWidget::QgsMapCanvasDockWidget( const QString &name, QWidget *pa
 
   mMainWidget->layout()->addWidget( mMapCanvas );
 
-  connect( mActionSyncView, &QAction::toggled, this, &QgsMapCanvasDockWidget::syncView );
+  connect( mActionSyncView, &QAction::toggled, this, [ = ]( bool active )
+  {
+    syncViewExtent( mMainCanvas );
+    syncView( active );
+  } );
 
   mMenu = new QMenu();
   connect( mMenu, &QMenu::aboutToShow, this, &QgsMapCanvasDockWidget::menuAboutToShow );
@@ -212,12 +217,8 @@ void QgsMapCanvasDockWidget::syncView( bool enabled )
   }
 }
 
-void QgsMapCanvasDockWidget::mapExtentChanged()
+void QgsMapCanvasDockWidget::syncViewExtent( QgsMapCanvas *sourceCanvas )
 {
-  QgsMapCanvas *sourceCanvas = qobject_cast< QgsMapCanvas * >( sender() );
-  if ( !sourceCanvas )
-    return;
-
   // avoid infinite recursion
   syncView( false );
 
@@ -239,6 +240,15 @@ void QgsMapCanvasDockWidget::mapExtentChanged()
   syncView( true );
 }
 
+void QgsMapCanvasDockWidget::mapExtentChanged()
+{
+  QgsMapCanvas *sourceCanvas = qobject_cast< QgsMapCanvas * >( sender() );
+  if ( !sourceCanvas )
+    return;
+
+  syncViewExtent( sourceCanvas );
+}
+
 void QgsMapCanvasDockWidget::mapCrsChanged()
 {
   mActionSetCrs->setText( tr( "Change Map CRS (%1)" ).arg( mMapCanvas->mapSettings().destinationCrs().isValid() ?

diff --git a/src/app/qgsmapcanvasdockwidget.h b/src/app/qgsmapcanvasdockwidget.h
@@ -85,6 +85,7 @@ class APP_EXPORT QgsMapCanvasDockWidget : public QgsDockWidget, private Ui::QgsM
     bool mBlockRotationUpdate = false;
     bool mBlockMagnificationUpdate = false;
     QgsMapToolPan *mPanTool = nullptr;
+    void syncViewExtent( QgsMapCanvas *sourceCanvas );
 };
 
 /**