Add signal for map settings changed.

qgis · Mar 19, 2020 · 5c44eea · 5c44eea
1 parent b181e53
commit 5c44eea
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/src/app/3d/qgs3dmapcanvas.cpp b/src/app/3d/qgs3dmapcanvas.cpp
@@ -106,6 +106,8 @@ void Qgs3DMapCanvas::setMap( Qgs3DMapSettings *map )
     mNavigationWidget->updateFromCamera();
   }
   );
+
+  emit mapSettingsChanged();
 }
 
 QgsCameraController *Qgs3DMapCanvas::cameraController()

diff --git a/src/app/3d/qgs3dmapcanvas.h b/src/app/3d/qgs3dmapcanvas.h
@@ -82,6 +82,9 @@ class Qgs3DMapCanvas : public QWidget
     //! Emitted when the 3D map canvas was successfully saved as image
     void savedAsImage( QString fileName );
 
+    //! Emitted when the the map setting is changed
+    void mapSettingsChanged();
+
   protected:
     void resizeEvent( QResizeEvent *ev ) override;
     bool eventFilter( QObject *watched, QEvent *event ) override;

diff --git a/src/app/3d/qgs3dmapcanvasdockwidget.cpp b/src/app/3d/qgs3dmapcanvasdockwidget.cpp
@@ -223,10 +223,6 @@ void Qgs3DMapCanvasDockWidget::setMapSettings( Qgs3DMapSettings *map )
 
   connect( mCanvas->scene(), &Qgs3DMapScene::totalPendingJobsCountChanged, this, &Qgs3DMapCanvasDockWidget::onTotalPendingJobsCountChanged );
 
-  // Update the connection after the map is updated
-  mMapToolIdentify->updateSignalSlots();
-  mMapToolMeasureLine->updateSignalSlots();
-
   mAnimationWidget->setCameraController( mCanvas->scene()->cameraController() );
   mAnimationWidget->setMap( map );
 

diff --git a/src/app/3d/qgs3dmaptool.cpp b/src/app/3d/qgs3dmaptool.cpp
@@ -51,7 +51,7 @@ QCursor Qgs3DMapTool::cursor() const
   return Qt::CrossCursor;
 }
 
-void Qgs3DMapTool::updateSignalSlots()
+void Qgs3DMapTool::onMapSettingsChanged()
 {
 
 }

diff --git a/src/app/3d/qgs3dmaptool.h b/src/app/3d/qgs3dmaptool.h
@@ -44,8 +44,8 @@ class Qgs3DMapTool : public QObject
     //! Mouse cursor to be used when the tool is active
     virtual QCursor cursor() const;
 
-    //! Update the connection to the map canvas's property (scene, map setting)
-    virtual void updateSignalSlots();
+    //! Called when canvas's map setting is changed
+    virtual void onMapSettingsChanged();
 
     /**
      * Whether the default mouse controls to zoom/pan/rotate camera can stay enabled

diff --git a/src/app/3d/qgs3dmaptoolidentify.cpp b/src/app/3d/qgs3dmaptoolidentify.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsapplication.h"
 #include "qgs3dmapcanvas.h"
+#include "qgs3dmapcanvasdockwidget.h"
 #include "qgs3dmapscene.h"
 #include "qgs3dutils.h"
 #include "qgsterrainentity_p.h"
@@ -64,6 +65,7 @@ Qgs3DMapToolIdentify::Qgs3DMapToolIdentify( Qgs3DMapCanvas *canvas )
   : Qgs3DMapTool( canvas )
 {
   mPickHandler.reset( new Qgs3DMapToolIdentifyPickHandler( this ) );
+  connect( canvas, &Qgs3DMapCanvas::mapSettingsChanged, this, &Qgs3DMapToolIdentify::onMapSettingsChanged );
 }
 
 Qgs3DMapToolIdentify::~Qgs3DMapToolIdentify() = default;
@@ -102,7 +104,7 @@ QCursor Qgs3DMapToolIdentify::cursor() const
   return QgsApplication::getThemeCursor( QgsApplication::Cursor::Identify );
 }
 
-void Qgs3DMapToolIdentify::updateSignalSlots()
+void Qgs3DMapToolIdentify::onMapSettingsChanged()
 {
   connect( mCanvas->scene(), &Qgs3DMapScene::terrainEntityChanged, this, &Qgs3DMapToolIdentify::onTerrainEntityChanged );
 }

diff --git a/src/app/3d/qgs3dmaptoolidentify.h b/src/app/3d/qgs3dmaptoolidentify.h
@@ -45,7 +45,7 @@ class Qgs3DMapToolIdentify : public Qgs3DMapTool
 
     QCursor cursor() const override;
 
-    void updateSignalSlots() override;
+    void onMapSettingsChanged() override;
 
   private slots:
     void onTerrainPicked( Qt3DRender::QPickEvent *event );

diff --git a/src/app/3d/qgs3dmaptoolmeasureline.cpp b/src/app/3d/qgs3dmaptoolmeasureline.cpp
@@ -57,6 +57,7 @@ Qgs3DMapToolMeasureLine::Qgs3DMapToolMeasureLine( Qgs3DMapCanvas *canvas )
   mDialog->setWindowFlags( mDialog->windowFlags() | Qt::Tool );
   mDialog->restorePosition();
 
+  connect( canvas, &Qgs3DMapCanvas::mapSettingsChanged, this, &Qgs3DMapToolMeasureLine::onMapSettingsChanged );
 }
 
 Qgs3DMapToolMeasureLine::~Qgs3DMapToolMeasureLine() = default;
@@ -121,7 +122,7 @@ QCursor Qgs3DMapToolMeasureLine::cursor() const
   return Qt::CrossCursor;
 }
 
-void Qgs3DMapToolMeasureLine::updateSignalSlots()
+void Qgs3DMapToolMeasureLine::onMapSettingsChanged()
 {
   connect( mCanvas->scene(), &Qgs3DMapScene::terrainEntityChanged, this, &Qgs3DMapToolMeasureLine::onTerrainEntityChanged );
 

diff --git a/src/app/3d/qgs3dmaptoolmeasureline.h b/src/app/3d/qgs3dmaptoolmeasureline.h
@@ -67,7 +67,7 @@ class Qgs3DMapToolMeasureLine : public Qgs3DMapTool
 
     QCursor cursor() const override;
 
-    void updateSignalSlots() override;
+    void onMapSettingsChanged() override;
 
   private slots:
     void onTerrainPicked( Qt3DRender::QPickEvent *event );