Simpler code, use direct connection to camera signal

qgis · Jan 16, 2021 · e2c98e1 · e2c98e1
1 parent 20aea8b
commit e2c98e1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp
@@ -196,7 +196,6 @@ Qgs3DMapScene::Qgs3DMapScene( const Qgs3DMapSettings &map, QgsAbstract3DEngine *
 
   connect( mCameraController, &QgsCameraController::cameraChanged, this, &Qgs3DMapScene::onCameraChanged );
   connect( mCameraController, &QgsCameraController::viewportChanged, this, &Qgs3DMapScene::onCameraChanged );
-  connect( mCameraController, &QgsCameraController::navigationModeHotKeyPressed, this, &Qgs3DMapScene::navigationModeHotKeyPressed );
 
 #if 0
   // experiments with loading of existing 3D models.

diff --git a/src/3d/qgs3dmapscene.h b/src/3d/qgs3dmapscene.h
@@ -139,8 +139,6 @@ class _3D_EXPORT Qgs3DMapScene : public Qt3DCore::QEntity
     void fpsCountChanged( float fpsCount );
     //! Emitted when the FPS counter is activated or deactivated
     void fpsCounterEnabledChanged( bool fpsCounterEnabled );
-    //! Emitted when the navigation mode is changed using the hotkey ctrl + ~
-    void navigationModeHotKeyPressed( QgsCameraController::NavigationMode mode );
 
   public slots:
     //! Updates the temporale entities

diff --git a/src/3d/qgscameracontroller.h b/src/3d/qgscameracontroller.h
@@ -96,12 +96,6 @@ class _3D_EXPORT QgsCameraController : public Qt3DCore::QEntity
      */
     QgsCameraController::NavigationMode cameraNavigationMode() const { return mCameraNavigationMode; }
 
-    /**
-     * Sets the navigation mode used by the camera controller.
-     * \since QGIS 3.18
-     */
-    void setCameraNavigationMode( QgsCameraController::NavigationMode navigationMode );
-
     /**
      * Returns the camera movement speed
      * \since QGIS 3.18
@@ -205,6 +199,14 @@ class _3D_EXPORT QgsCameraController : public Qt3DCore::QEntity
     //! Move the map by \a tx and \a ty
     void moveView( float tx, float ty );
 
+  public slots:
+
+    /**
+     * Sets the navigation mode used by the camera controller.
+     * \since QGIS 3.18
+     */
+    void setCameraNavigationMode( QgsCameraController::NavigationMode navigationMode );
+
   private:
     void rotateCamera( float diffPitch, float diffYaw );
     void updateCameraFromPose( bool centerPointChanged = false );

diff --git a/src/app/3d/qgs3dmapcanvas.cpp b/src/app/3d/qgs3dmapcanvas.cpp
@@ -102,7 +102,6 @@ void Qgs3DMapCanvas::setMap( Qgs3DMapSettings *map )
   mScene = newScene;
   connect( mScene, &Qgs3DMapScene::fpsCountChanged, this, &Qgs3DMapCanvas::fpsCountChanged );
   connect( mScene, &Qgs3DMapScene::fpsCounterEnabledChanged, this, &Qgs3DMapCanvas::fpsCounterEnabledChanged );
-  connect( mScene, &Qgs3DMapScene::navigationModeHotKeyPressed, this, &Qgs3DMapCanvas::onNavigationModeHotKeyPressed );
 
   delete mMap;
   mMap = map;
@@ -116,6 +115,7 @@ void Qgs3DMapCanvas::setMap( Qgs3DMapSettings *map )
     QCursor::setPos( mapToGlobal( point ) );
   } );
   connect( cameraController(), &QgsCameraController::cameraMovementSpeedChanged, mMap, &Qgs3DMapSettings::setCameraMovementSpeed );
+  connect( cameraController(), &QgsCameraController::navigationModeHotKeyPressed, this, &Qgs3DMapCanvas::onNavigationModeHotKeyPressed );
 
   emit mapSettingsChanged();
 }