Add Qgs3DMapTool::cursor()

qgis · Sep 10, 2018 · cf87b85 · cf87b85
1 parent 407a5cb
commit cf87b85
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/app/3d/qgs3dmapcanvas.cpp b/src/app/3d/qgs3dmapcanvas.cpp
@@ -125,7 +125,7 @@ void Qgs3DMapCanvas::setMapTool( Qgs3DMapTool *tool )
   {
     mEngine->window()->installEventFilter( this );
     mScene->cameraController()->setEnabled( false );
-    mEngine->window()->setCursor( Qt::CrossCursor );
+    mEngine->window()->setCursor( tool->cursor() );
   }
 
   if ( mMapTool )

diff --git a/src/app/3d/qgs3dmaptool.cpp b/src/app/3d/qgs3dmaptool.cpp
@@ -45,3 +45,8 @@ void Qgs3DMapTool::activate()
 void Qgs3DMapTool::deactivate()
 {
 }
+
+QCursor Qgs3DMapTool::cursor() const
+{
+  return Qt::CrossCursor;
+}
diff --git a/src/app/3d/qgs3dmaptool.h b/src/app/3d/qgs3dmaptool.h
@@ -41,6 +41,9 @@ class Qgs3DMapTool : public QObject
     //! Called when map tool is being deactivated
     virtual void deactivate();
 
+    //! Mouse cursor to be used when the tool is active
+    virtual QCursor cursor() const;
+
   protected:
     Qgs3DMapCanvas *mCanvas = nullptr;
 };

diff --git a/src/app/3d/qgs3dmaptoolidentify.h b/src/app/3d/qgs3dmaptoolidentify.h
@@ -23,8 +23,6 @@ namespace Qt3DRender
   class QPickEvent;
 }
 
-//class QgsMapToolIdentifyAction;
-
 
 class Qgs3DMapToolIdentify : public Qgs3DMapTool
 {
@@ -45,7 +43,7 @@ class Qgs3DMapToolIdentify : public Qgs3DMapTool
     void onTerrainEntityChanged();
 
   private:
-    //QgsMapToolIdentifyAction *mIdentifyTool2D = nullptr;
+
 };
 
 #endif // QGS3DMAPTOOLIDENTIFY_H