remove terrainGenerator::extentChanged signal, use mapsettings::exten…

…tChanged instead
qgis · Jan 24, 2023 · adec09d · adec09d
1 parent d94a371
commit adec09d
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 12 deletions.
diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp
@@ -125,6 +125,7 @@ Qgs3DMapScene::Qgs3DMapScene( Qgs3DMapSettings &map, QgsAbstract3DEngine *engine
   // create terrain entity
 
   createTerrainDeferred();
+  connect( &map, &Qgs3DMapSettings::extentChanged, this, &Qgs3DMapScene::createTerrain );
   connect( &map, &Qgs3DMapSettings::terrainGeneratorChanged, this, &Qgs3DMapScene::createTerrain );
   connect( &map, &Qgs3DMapSettings::terrainVerticalScaleChanged, this, &Qgs3DMapScene::createTerrain );
   connect( &map, &Qgs3DMapSettings::mapTileResolutionChanged, this, &Qgs3DMapScene::createTerrain );

diff --git a/src/3d/qgs3dmapsettings.cpp b/src/3d/qgs3dmapsettings.cpp
@@ -731,7 +731,6 @@ void Qgs3DMapSettings::setTerrainGenerator( QgsTerrainGenerator *gen )
 {
   if ( mTerrainGenerator )
   {
-    disconnect( mTerrainGenerator.get(), &QgsTerrainGenerator::extentChanged, this, &Qgs3DMapSettings::terrainGeneratorChanged );
     disconnect( mTerrainGenerator.get(), &QgsTerrainGenerator::terrainChanged, this, &Qgs3DMapSettings::terrainGeneratorChanged );
   }
 
@@ -751,7 +750,6 @@ void Qgs3DMapSettings::setTerrainGenerator( QgsTerrainGenerator *gen )
   }
   gen->setExtent( terrainExtent );
   mTerrainGenerator.reset( gen );
-  connect( mTerrainGenerator.get(), &QgsTerrainGenerator::extentChanged, this, &Qgs3DMapSettings::terrainGeneratorChanged );
   connect( mTerrainGenerator.get(), &QgsTerrainGenerator::terrainChanged, this, &Qgs3DMapSettings::terrainGeneratorChanged );
 
   emit terrainGeneratorChanged();

diff --git a/src/3d/terrain/qgsdemterraingenerator.cpp b/src/3d/terrain/qgsdemterraingenerator.cpp
@@ -132,8 +132,6 @@ void QgsDemTerrainGenerator::setExtent( const QgsRectangle &extent )
   // no need to have an mExtent larger than the actual layer's extent
   mExtent = extent.intersect( layerExtent );
   updateGenerator();
-
-  emit extentChanged();
 }
 
 void QgsDemTerrainGenerator::updateGenerator()

diff --git a/src/3d/terrain/qgsflatterraingenerator.cpp b/src/3d/terrain/qgsflatterraingenerator.cpp
@@ -142,8 +142,6 @@ void QgsFlatTerrainGenerator::setExtent( const QgsRectangle &extent )
 
   mExtent = extent;
   updateTilingScheme();
-
-  emit extentChanged();
 }
 
 void QgsFlatTerrainGenerator::updateTilingScheme()

diff --git a/src/3d/terrain/qgsonlineterraingenerator.cpp b/src/3d/terrain/qgsonlineterraingenerator.cpp
@@ -104,8 +104,6 @@ void QgsOnlineTerrainGenerator::setExtent( const QgsRectangle &extent )
 
   mExtent = extent;
   updateGenerator();
-
-  emit extentChanged();
 }
 
 void QgsOnlineTerrainGenerator::updateGenerator()

diff --git a/src/3d/terrain/qgsterraingenerator.h b/src/3d/terrain/qgsterraingenerator.h
@@ -113,9 +113,6 @@ class _3D_EXPORT QgsTerrainGenerator : public QgsQuadtreeChunkLoaderFactory
 
   signals:
 
-    //! Emitted when the terrain extent has changed
-    void extentChanged();
-
     //! Emitted when the terrain changed (for example, raster DEM or mesh have data changed)
     void terrainChanged();
 

diff --git a/tests/src/3d/sandbox/qgis_3d_sandbox.cpp b/tests/src/3d/sandbox/qgis_3d_sandbox.cpp
@@ -57,7 +57,6 @@ void initCanvas3D( Qgs3DMapCanvas *canvas )
 
   QgsFlatTerrainGenerator *flatTerrain = new QgsFlatTerrainGenerator;
   flatTerrain->setCrs( map->crs() );
-  flatTerrain->setExtent( fullExtent );
   map->setTerrainGenerator( flatTerrain );
 
   QgsPointLightSettings defaultPointLight;