Sync rotation between 3D map and rotation widget.

qgis · Jun 6, 2019 · 690bdd5 · 690bdd5
1 parent 59172b2
commit 690bdd5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/src/app/3d/qgs3dmapcanvas.cpp b/src/app/3d/qgs3dmapcanvas.cpp
@@ -86,6 +86,16 @@ void Qgs3DMapCanvas::setMap( Qgs3DMapSettings *map )
   mMap = map;
 
   resetView();
+
+  // Connect the camera to the navigation widget.
+  QObject::connect(
+              this->cameraController(),
+              &QgsCameraController::cameraChanged,
+              mNavigationWidget,
+              [ = ]{
+                mNavigationWidget->updateFromCamera();
+                }
+   );
 }
 
 QgsCameraController *Qgs3DMapCanvas::cameraController()

diff --git a/src/app/3d/qgs3dnavigationwidget.cpp b/src/app/3d/qgs3dnavigationwidget.cpp
@@ -11,6 +11,7 @@
 
 Qgs3DNavigationWidget::Qgs3DNavigationWidget(Qgs3DMapCanvas *parent) : QWidget(parent)
 {
+    mParent3DMapCanvas = parent;
     // Zoom in button
     mZoomInButton = new QToolButton(this);
     mZoomInButton->setToolTip(QStringLiteral("Zoom In"));
@@ -80,14 +81,15 @@ Qgs3DNavigationWidget::Qgs3DNavigationWidget(Qgs3DMapCanvas *parent) : QWidget(p
     mRotateSceneDial->setToolTip(QStringLiteral("Rotate view"));
     mRotateSceneDial->setWrapping(true);
     mRotateSceneDial->setMaximum(359);
+    // To make it pointing to the top
     mRotateSceneDial->setValue(180);
 
     QObject::connect(
         mRotateSceneDial,
         &QDial::valueChanged,
         parent,
         [ = ]{
-            qInfo() << "Dial value: " << mRotateSceneDial->value();
+            // Subtract 180 since we "rotate" the QDial so that 0 is pointing at top.
             parent->cameraController()->setCameraHeadingAngle(mRotateSceneDial->value() - 180);
     }
     );
@@ -173,3 +175,8 @@ Qgs3DNavigationWidget::~Qgs3DNavigationWidget()
 {
 
 }
+
+void Qgs3DNavigationWidget::updateRotateSceneDialAngle(){
+    // Adding 180 since we "rotate" the QDial so that 0 is pointing at top.
+    mRotateSceneDial->setValue((mParent3DMapCanvas->cameraController()->yaw() + 180));
+}
diff --git a/src/app/3d/qgs3dnavigationwidget.h b/src/app/3d/qgs3dnavigationwidget.h
@@ -30,12 +30,14 @@ class Qgs3DNavigationWidget : public QWidget
 public:
     Qgs3DNavigationWidget(Qgs3DMapCanvas *parent = nullptr);
     ~Qgs3DNavigationWidget();
+    void updateRotateSceneDialAngle();
 
 signals:
 
 public slots:
 
 private:
+    Qgs3DMapCanvas *mParent3DMapCanvas = nullptr;
     QToolButton *mZoomInButton = nullptr;
     QToolButton *mZoomOutButton = nullptr;
     QToolButton *mTiltUpButton = nullptr;