[BUG][3D] fix 3D crash with measure line (#35412)

vcloarec · web-flow · commit 0eaba81c384f · 2020-04-04T12:56:38.000+02:00
* fix 3D crash with measure line

* avoid non wanted windows opening of identify tool and measurment tool

* adds guard avoid crashing when closing settings

* spelling
diff --git a/src/app/3d/qgs3dmaptoolidentify.cpp b/src/app/3d/qgs3dmaptoolidentify.cpp
@@ -87,6 +87,7 @@ void Qgs3DMapToolIdentify::activate()
   }
 
   mCanvas->scene()->registerPickHandler( mPickHandler.get() );
+  mIsActive = true;
 }
 
 void Qgs3DMapToolIdentify::deactivate()
@@ -97,6 +98,7 @@ void Qgs3DMapToolIdentify::deactivate()
   }
 
   mCanvas->scene()->unregisterPickHandler( mPickHandler.get() );
+  mIsActive = false;
 }
 
 QCursor Qgs3DMapToolIdentify::cursor() const
@@ -106,6 +108,8 @@ QCursor Qgs3DMapToolIdentify::cursor() const
 
 void Qgs3DMapToolIdentify::onMapSettingsChanged()
 {
+  if ( !mIsActive )
+    return;
   connect( mCanvas->scene(), &Qgs3DMapScene::terrainEntityChanged, this, &Qgs3DMapToolIdentify::onTerrainEntityChanged );
 }
 
@@ -153,6 +157,8 @@ void Qgs3DMapToolIdentify::onTerrainPicked( Qt3DRender::QPickEvent *event )
 
 void Qgs3DMapToolIdentify::onTerrainEntityChanged()
 {
+  if ( !mIsActive )
+    return;
   // no need to disconnect from the previous entity: it has been destroyed
   // start listening to the new terrain entity
   if ( QgsTerrainEntity *terrainEntity = mCanvas->scene()->terrainEntity() )
diff --git a/src/app/3d/qgs3dmaptoolidentify.h b/src/app/3d/qgs3dmaptoolidentify.h
@@ -53,6 +53,8 @@ class Qgs3DMapToolIdentify : public Qgs3DMapTool
   private:
     std::unique_ptr<Qgs3DMapToolIdentifyPickHandler> mPickHandler;
 
+    bool mIsActive = false;
+
     friend class Qgs3DMapToolIdentifyPickHandler;
 };
 
diff --git a/src/app/3d/qgs3dmaptoolmeasureline.cpp b/src/app/3d/qgs3dmaptoolmeasureline.cpp
@@ -124,6 +124,8 @@ QCursor Qgs3DMapToolMeasureLine::cursor() const
 
 void Qgs3DMapToolMeasureLine::onMapSettingsChanged()
 {
+  if ( !mIsAlreadyActivated )
+    return;
   connect( mCanvas->scene(), &Qgs3DMapScene::terrainEntityChanged, this, &Qgs3DMapToolMeasureLine::onTerrainEntityChanged );
 
   // Update scale if the terrain vertical scale changed
@@ -137,6 +139,8 @@ void Qgs3DMapToolMeasureLine::onTerrainPicked( Qt3DRender::QPickEvent *event )
 
 void Qgs3DMapToolMeasureLine::onTerrainEntityChanged()
 {
+  if ( !mIsAlreadyActivated )
+    return;
   // no need to disconnect from the previous entity: it has been destroyed
   // start listening to the new terrain entity
   if ( QgsTerrainEntity *terrainEntity = mCanvas->scene()->terrainEntity() )
@@ -175,6 +179,8 @@ void Qgs3DMapToolMeasureLine::handleClick( Qt3DRender::QPickEvent *event, const
 
 void Qgs3DMapToolMeasureLine::updateMeasurementLayer()
 {
+  if ( !mMeasurementLayer )
+    return;
   double verticalScale = canvas()->map()->terrainVerticalScale();
   QgsLineString *line;
   if ( verticalScale != 1.0 )
@@ -205,6 +211,8 @@ void Qgs3DMapToolMeasureLine::updateMeasurementLayer()
 
 void Qgs3DMapToolMeasureLine::updateSettings()
 {
+  if ( !mMeasurementLayer )
+    return;
   // Line style
   QgsLine3DSymbol *lineSymbol = new QgsLine3DSymbol;
   lineSymbol->setRenderAsSimpleLines( true );

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ void Qgs3DMapToolIdentify::activate()`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`mCanvas->scene()->registerPickHandler( mPickHandler.get() );`
	`90`	`+ mIsActive = true;`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`void Qgs3DMapToolIdentify::deactivate()`
`@@ -97,6 +98,7 @@ void Qgs3DMapToolIdentify::deactivate()`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`mCanvas->scene()->unregisterPickHandler( mPickHandler.get() );`
	`101`	`+ mIsActive = false;`
`100`	`102`	`}`
`101`	`103`
`102`	`104`	`QCursor Qgs3DMapToolIdentify::cursor() const`
`@@ -106,6 +108,8 @@ QCursor Qgs3DMapToolIdentify::cursor() const`
`106`	`108`
`107`	`109`	`void Qgs3DMapToolIdentify::onMapSettingsChanged()`
`108`	`110`	`{`
	`111`	`+ if ( !mIsActive )`
	`112`	`+ return;`
`109`	`113`	`connect( mCanvas->scene(), &Qgs3DMapScene::terrainEntityChanged, this, &Qgs3DMapToolIdentify::onTerrainEntityChanged );`
`110`	`114`	`}`
`111`	`115`
`@@ -153,6 +157,8 @@ void Qgs3DMapToolIdentify::onTerrainPicked( Qt3DRender::QPickEvent *event )`
`153`	`157`
`154`	`158`	`void Qgs3DMapToolIdentify::onTerrainEntityChanged()`
`155`	`159`	`{`
	`160`	`+ if ( !mIsActive )`
	`161`	`+ return;`
`156`	`162`	`// no need to disconnect from the previous entity: it has been destroyed`
`157`	`163`	`// start listening to the new terrain entity`
`158`	`164`	`if ( QgsTerrainEntity *terrainEntity = mCanvas->scene()->terrainEntity() )`