[3d] Measurement tool

python/core/auto_generated/geometry/qgslinestring.sip.in

@@ -415,6 +415,14 @@ segment in the line.
 
     virtual double length() const;
 
+
+    double length3D() const;
+%Docstring
+Returns the length in 3D world of the line string.
+If it is not a 3D line string, return its 2D length.
+
+.. seealso:: :py:func:`length`
+%End
     virtual QgsPoint startPoint() const;
 
     virtual QgsPoint endPoint() const;

src/3d/qgs3dmapscene.cpp

@@ -99,14 +99,11 @@ Qgs3DMapScene::Qgs3DMapScene( const Qgs3DMapSettings &map, QgsAbstract3DEngine *
   connect( &map, &Qgs3DMapSettings::terrainShadingChanged, this, &Qgs3DMapScene::createTerrain );
   connect( &map, &Qgs3DMapSettings::pointLightsChanged, this, &Qgs3DMapScene::updateLights );
   connect( &map, &Qgs3DMapSettings::fieldOfViewChanged, this, &Qgs3DMapScene::updateCameraLens );
+  connect( &map, &Qgs3DMapSettings::renderersChanged, this, &Qgs3DMapScene::onRenderersChanged );
 
   // create entities of renderers
 
-  Q_FOREACH ( const QgsAbstract3DRenderer *renderer, map.renderers() )
-  {
-    Qt3DCore::QEntity *newEntity = renderer->createEntity( map );
-    newEntity->setParent( this );
-  }
+  onRenderersChanged();
 
   // listen to changes of layers in order to add/remove 3D renderer entities
   connect( &map, &Qgs3DMapSettings::layersChanged, this, &Qgs3DMapScene::onLayersChanged );
@@ -415,9 +412,6 @@ void Qgs3DMapScene::onBackgroundColorChanged()
 
 void Qgs3DMapScene::onLayerEntityPickEvent( Qt3DRender::QPickEvent *event )
 {
-  if ( event->button() != Qt3DRender::QPickEvent::LeftButton )
-    return;
-
   Qt3DRender::QPickTriangleEvent *triangleEvent = qobject_cast<Qt3DRender::QPickTriangleEvent *>( event );
   if ( !triangleEvent )
     return;
@@ -456,7 +450,7 @@ void Qgs3DMapScene::onLayerEntityPickEvent( Qt3DRender::QPickEvent *event )
         break;
       }
     }
-    pickHandler->handlePickOnVectorLayer( vlayer, fid, event->worldIntersection() );
+    pickHandler->handlePickOnVectorLayer( vlayer, fid, event->worldIntersection(), event );
   }
 
 }
@@ -497,6 +491,26 @@ void Qgs3DMapScene::updateCameraLens()
   onCameraChanged();
 }
 
+void Qgs3DMapScene::onRenderersChanged()
+{
+  // remove entities (if any)
+  qDeleteAll( mRenderersEntities.values() );
+  mRenderersEntities.clear();
+
+  // re-add entities from new set of renderers
+  const QList<QgsAbstract3DRenderer *> renderers = mMap.renderers();
+  for ( const QgsAbstract3DRenderer *renderer : renderers )
+  {
+    Qt3DCore::QEntity *newEntity = renderer->createEntity( mMap );
+    if ( newEntity )
+    {
+      newEntity->setParent( this );
+      finalizeNewEntity( newEntity );
+      mRenderersEntities[renderer] = newEntity;
+    }
+  }
+}
+
 void Qgs3DMapScene::onLayerRenderer3DChanged()
 {
   QgsMapLayer *layer = qobject_cast<QgsMapLayer *>( sender() );
@@ -573,17 +587,7 @@ void Qgs3DMapScene::addLayerEntity( QgsMapLayer *layer )
         connect( picker, &Qt3DRender::QObjectPicker::pressed, this, &Qgs3DMapScene::onLayerEntityPickEvent );
       }
 
-      // this is probably not the best place for material-specific configuration,
-      // maybe this could be more generalized when other materials need some specific treatment
-      for ( QgsLineMaterial *lm : newEntity->findChildren<QgsLineMaterial *>() )
-      {
-        connect( mCameraController, &QgsCameraController::viewportChanged, lm, [lm, this]
-        {
-          lm->setViewportSize( mCameraController->viewport().size() );
-        } );
-
-        lm->setViewportSize( cameraController()->viewport().size() );
-      }
+      finalizeNewEntity( newEntity );
     }
   }
 
@@ -611,6 +615,21 @@ void Qgs3DMapScene::removeLayerEntity( QgsMapLayer *layer )
   }
 }
 
+void Qgs3DMapScene::finalizeNewEntity( Qt3DCore::QEntity *newEntity )
+{
+  // this is probably not the best place for material-specific configuration,
+  // maybe this could be more generalized when other materials need some specific treatment
+  for ( QgsLineMaterial *lm : newEntity->findChildren<QgsLineMaterial *>() )
+  {
+    connect( mCameraController, &QgsCameraController::viewportChanged, lm, [lm, this]
+    {
+      lm->setViewportSize( mCameraController->viewport().size() );
+    } );
+
+    lm->setViewportSize( cameraController()->viewport().size() );
+  }
+}
+
 void Qgs3DMapScene::addCameraViewCenterEntity( Qt3DRender::QCamera *camera )
 {
   mEntityCameraViewCenter = new Qt3DCore::QEntity;

src/3d/qgs3dmapscene.h

@@ -38,6 +38,7 @@ namespace Qt3DExtras
 }
 
 class QgsAbstract3DEngine;
+class QgsAbstract3DRenderer;
 class QgsMapLayer;
 class QgsCameraController;
 class Qgs3DMapScenePickHandler;
@@ -108,6 +109,7 @@ class _3D_EXPORT Qgs3DMapScene : public Qt3DCore::QEntity
     void onLayerEntityPickEvent( Qt3DRender::QPickEvent *event );
     void updateLights();
     void updateCameraLens();
+    void onRenderersChanged();
   private:
     void addLayerEntity( QgsMapLayer *layer );
     void removeLayerEntity( QgsMapLayer *layer );
@@ -116,6 +118,7 @@ class _3D_EXPORT Qgs3DMapScene : public Qt3DCore::QEntity
     void updateSceneState();
     void updateScene();
     bool updateCameraNearFarPlanes();
+    void finalizeNewEntity( Qt3DCore::QEntity *newEntity );
 
   private:
     const Qgs3DMapSettings &mMap;
@@ -129,6 +132,7 @@ class _3D_EXPORT Qgs3DMapScene : public Qt3DCore::QEntity
     Qt3DCore::QEntity *mEntityCameraViewCenter = nullptr;
     //! Keeps track of entities that belong to a particular layer
     QMap<QgsMapLayer *, Qt3DCore::QEntity *> mLayerEntities;
+    QMap<const QgsAbstract3DRenderer *, Qt3DCore::QEntity *> mRenderersEntities;
     bool mTerrainUpdateScheduled = false;
     SceneState mSceneState = Ready;
     //! List of currently registered pick handlers (used by identify tool)

src/3d/qgs3dmapscenepickhandler.h

@@ -17,6 +17,7 @@
 #define QGS3DMAPSCENEPICKHANDLER_H
 
 #include "qgsfeatureid.h"
+#include <Qt3DRender/QPickEvent>
 
 class QVector3D;
 class QgsVectorLayer;
@@ -37,7 +38,7 @@ class Qgs3DMapScenePickHandler
     virtual ~Qgs3DMapScenePickHandler() = default;
 
     //! Called when user clicked a 3D entity belonging to a feature of a vector layer
-    virtual void handlePickOnVectorLayer( QgsVectorLayer *vlayer, QgsFeatureId id, const QVector3D &worldIntersection ) = 0;
+    virtual void handlePickOnVectorLayer( QgsVectorLayer *vlayer, QgsFeatureId id, const QVector3D &worldIntersection, Qt3DRender::QPickEvent *event ) = 0;
 };
 
 #endif // QGS3DMAPSCENEPICKHANDLER_H

src/3d/qgs3dmapsettings.cpp

@@ -464,7 +464,11 @@ void Qgs3DMapSettings::setTerrainMapTheme( const QString &theme )
 
 void Qgs3DMapSettings::setRenderers( const QList<QgsAbstract3DRenderer *> &renderers )
 {
+  qDeleteAll( mRenderers );
+
   mRenderers = renderers;
+
+  emit renderersChanged();
 }
 
 void Qgs3DMapSettings::setShowTerrainBoundingBoxes( bool enabled )

src/3d/qgs3dmapsettings.h

@@ -369,6 +369,13 @@ class _3D_EXPORT Qgs3DMapSettings : public QObject
      * \since QGIS 3.6
      */
     void terrainMapThemeChanged();
+
+    /**
+     * Emitted when the list of map's extra renderers have been modified
+     * \since QGIS 3.10
+     */
+    void renderersChanged();
+
     //! Emitted when the flag whether terrain's bounding boxes are shown has changed
     void showTerrainBoundingBoxesChanged();
     //! Emitted when the flag whether terrain's tile info is shown has changed

src/app/3d/qgs3dmapcanvasdockwidget.cpp

@@ -36,6 +36,7 @@
 #include "qgs3danimationwidget.h"
 #include "qgs3dmapsettings.h"
 #include "qgs3dmaptoolidentify.h"
+#include "qgs3dmaptoolmeasureline.h"
 #include "qgs3dutils.h"
 
 
@@ -51,6 +52,9 @@ Qgs3DMapCanvasDockWidget::Qgs3DMapCanvasDockWidget( QWidget *parent )
   QToolBar *toolBar = new QToolBar( contentsWidget );
   toolBar->setIconSize( QgisApp::instance()->iconSize( true ) );
 
+  QAction *actionCameraControl = toolBar->addAction( QIcon( QgsApplication::iconPath( "mActionPan.svg" ) ),
+                                 tr( "Camera Control" ), this, &Qgs3DMapCanvasDockWidget::cameraControl );
+  actionCameraControl->setCheckable( true );
 
   toolBar->addAction( QgsApplication::getThemeIcon( QStringLiteral( "mActionZoomFullExtent.svg" ) ),
                       tr( "Zoom Full" ), this, &Qgs3DMapCanvasDockWidget::resetView );
@@ -71,6 +75,18 @@ Qgs3DMapCanvasDockWidget::Qgs3DMapCanvasDockWidget( QWidget *parent )
                             tr( "Identify" ), this, &Qgs3DMapCanvasDockWidget::identify );
   actionIdentify->setCheckable( true );
 
+  QAction *actionMeasurementTool = toolBar->addAction( QIcon( QgsApplication::iconPath( "mActionMeasure.svg" ) ),
+                                   tr( "Measurement Line" ), this, &Qgs3DMapCanvasDockWidget::measureLine );
+  actionMeasurementTool->setCheckable( true );
+
+  // Create action group to make the action exclusive
+  QActionGroup *actionGroup = new QActionGroup( this );
+  actionGroup->addAction( actionCameraControl );
+  actionGroup->addAction( actionIdentify );
+  actionGroup->addAction( actionMeasurementTool );
+  actionGroup->setExclusive( true );
+  actionCameraControl->setChecked( true );
+
   QAction *actionAnim = toolBar->addAction( QIcon( QgsApplication::iconPath( "mTaskRunning.svg" ) ),
                         tr( "Animations" ), this, &Qgs3DMapCanvasDockWidget::toggleAnimations );
   actionAnim->setCheckable( true );
@@ -95,6 +111,8 @@ Qgs3DMapCanvasDockWidget::Qgs3DMapCanvasDockWidget( QWidget *parent )
 
   mMapToolIdentify = new Qgs3DMapToolIdentify( mCanvas );
 
+  mMapToolMeasureLine = new Qgs3DMapToolMeasureLine( mCanvas );
+
   mLabelPendingJobs = new QLabel( this );
   mProgressPendingJobs = new QProgressBar( this );
   mProgressPendingJobs->setRange( 0, 0 );
@@ -150,6 +168,15 @@ void Qgs3DMapCanvasDockWidget::toggleAnimations()
   }
 }
 
+void Qgs3DMapCanvasDockWidget::cameraControl()
+{
+  QAction *action = qobject_cast<QAction *>( sender() );
+  if ( !action )
+    return;
+
+  mCanvas->setMapTool( nullptr );
+}
+
 void Qgs3DMapCanvasDockWidget::identify()
 {
   QAction *action = qobject_cast<QAction *>( sender() );
@@ -159,6 +186,15 @@ void Qgs3DMapCanvasDockWidget::identify()
   mCanvas->setMapTool( action->isChecked() ? mMapToolIdentify : nullptr );
 }
 
+void Qgs3DMapCanvasDockWidget::measureLine()
+{
+  QAction *action = qobject_cast<QAction *>( sender() );
+  if ( !action )
+    return;
+
+  mCanvas->setMapTool( action->isChecked() ? mMapToolMeasureLine : nullptr );
+}
+
 void Qgs3DMapCanvasDockWidget::toggleNavigationWidget( bool visibility )
 {
   mCanvas->setOnScreenNavigationVisibility( visibility );

src/app/3d/qgs3dmapcanvasdockwidget.h

@@ -25,6 +25,7 @@ class Qgs3DAnimationWidget;
 class Qgs3DMapCanvas;
 class Qgs3DMapSettings;
 class Qgs3DMapToolIdentify;
+class Qgs3DMapToolMeasureLine;
 class QgsMapCanvas;
 
 
@@ -42,12 +43,16 @@ class Qgs3DMapCanvasDockWidget : public QgsDockWidget
     Qgs3DMapCanvas *mapCanvas3D() { return mCanvas; }
     Qgs3DAnimationWidget *animationWidget() { return mAnimationWidget; }
 
+    Qgs3DMapToolMeasureLine *measurementLineTool() { return  mMapToolMeasureLine; }
+
   private slots:
     void resetView();
     void configure();
     void saveAsImage();
     void toggleAnimations();
+    void cameraControl();
     void identify();
+    void measureLine();
     void toggleNavigationWidget( bool visibility );
 
     void onMainCanvasLayersChanged();
@@ -61,6 +66,7 @@ class Qgs3DMapCanvasDockWidget : public QgsDockWidget
     QProgressBar *mProgressPendingJobs = nullptr;
     QLabel *mLabelPendingJobs = nullptr;
     Qgs3DMapToolIdentify *mMapToolIdentify = nullptr;
+    Qgs3DMapToolMeasureLine *mMapToolMeasureLine = nullptr;
 };
 
 #endif // QGS3DMAPCANVASDOCKWIDGET_H

src/app/3d/qgs3dmaptool.cpp

@@ -50,3 +50,8 @@ QCursor Qgs3DMapTool::cursor() const
 {
   return Qt::CrossCursor;
 }
+
+Qgs3DMapCanvas *Qgs3DMapTool::canvas()
+{
+  return mCanvas;
+}

src/app/3d/qgs3dmaptool.h

@@ -52,6 +52,8 @@ class Qgs3DMapTool : public QObject
      */
     virtual bool allowsCameraControls() const { return true; }
 
+    Qgs3DMapCanvas *canvas();
+
   protected:
     Qgs3DMapCanvas *mCanvas = nullptr;
 };

src/app/3d/qgs3dmaptoolidentify.cpp

@@ -15,6 +15,7 @@
 
 #include "qgs3dmaptoolidentify.h"
 
+#include "qgsapplication.h"
 #include "qgs3dmapcanvas.h"
 #include "qgs3dmapscene.h"
 #include "qgs3dutils.h"
@@ -35,21 +36,24 @@ class Qgs3DMapToolIdentifyPickHandler : public Qgs3DMapScenePickHandler
 {
   public:
     Qgs3DMapToolIdentifyPickHandler( Qgs3DMapToolIdentify *identifyTool ): mIdentifyTool( identifyTool ) {}
-    void handlePickOnVectorLayer( QgsVectorLayer *vlayer, QgsFeatureId id, const QVector3D &worldIntersection ) override;
+    void handlePickOnVectorLayer( QgsVectorLayer *vlayer, QgsFeatureId id, const QVector3D &worldIntersection, Qt3DRender::QPickEvent *event ) override;
   private:
     Qgs3DMapToolIdentify *mIdentifyTool = nullptr;
 };
 
 
-void Qgs3DMapToolIdentifyPickHandler::handlePickOnVectorLayer( QgsVectorLayer *vlayer, QgsFeatureId id, const QVector3D &worldIntersection )
+void Qgs3DMapToolIdentifyPickHandler::handlePickOnVectorLayer( QgsVectorLayer *vlayer, QgsFeatureId id, const QVector3D &worldIntersection, Qt3DRender::QPickEvent *event )
 {
-  QgsVector3D mapCoords = Qgs3DUtils::worldToMapCoordinates( QgsVector3D( worldIntersection.x(),
-                          worldIntersection.y(),
-                          worldIntersection.z() ), mIdentifyTool->mCanvas->map()->origin() );
-  QgsPoint pt( mapCoords.x(), mapCoords.y(), mapCoords.z() );
+  if ( event->button() == Qt3DRender::QPickEvent::LeftButton )
+  {
+    QgsVector3D mapCoords = Qgs3DUtils::worldToMapCoordinates( QgsVector3D( worldIntersection.x(),
+                            worldIntersection.y(),
+                            worldIntersection.z() ), mIdentifyTool->mCanvas->map()->origin() );
+    QgsPoint pt( mapCoords.x(), mapCoords.y(), mapCoords.z() );
 
-  QgsMapToolIdentifyAction *identifyTool2D = QgisApp::instance()->identifyMapTool();
-  identifyTool2D->showResultsForFeature( vlayer, id, pt );
+    QgsMapToolIdentifyAction *identifyTool2D = QgisApp::instance()->identifyMapTool();
+    identifyTool2D->showResultsForFeature( vlayer, id, pt );
+  }
 }
 
 
@@ -95,6 +99,11 @@ void Qgs3DMapToolIdentify::deactivate()
   mCanvas->scene()->unregisterPickHandler( mPickHandler.get() );
 }
 
+QCursor Qgs3DMapToolIdentify::cursor() const
+{
+  return QgsApplication::getThemeCursor( QgsApplication::Cursor::Identify );
+}
+
 void Qgs3DMapToolIdentify::onTerrainPicked( Qt3DRender::QPickEvent *event )
 {
   if ( event->button() != Qt3DRender::QPickEvent::LeftButton )

src/app/3d/qgs3dmaptoolidentify.h

@@ -43,6 +43,8 @@ class Qgs3DMapToolIdentify : public Qgs3DMapTool
     void activate() override;
     void deactivate() override;
 
+    QCursor cursor() const override;
+
   private slots:
     void onTerrainPicked( Qt3DRender::QPickEvent *event );
     void onTerrainEntityChanged();