Use canvas project extent where appropriate

nyalldawson · nyalldawson · commit 7fa74b6b36eb · 2021-05-21T18:12:21.000+10:00
diff --git a/src/app/3d/qgs3dmapconfigwidget.cpp b/src/app/3d/qgs3dmapconfigwidget.cpp
@@ -433,7 +433,7 @@ void Qgs3DMapConfigWidget::updateMaxZoomLevel()
   }
   else  // flat or online
   {
-    te = mMainCanvas->fullExtent();
+    te = mMainCanvas->projectExtent();
   }
 
   double tile0width = std::max( te.width(), te.height() );
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8174,7 +8174,7 @@ void QgisApp::pan()
 
 void QgisApp::zoomFull()
 {
-  mMapCanvas->zoomToFullExtent();
+  mMapCanvas->zoomToProjectExtent();
 }
 
 void QgisApp::zoomToPrevious()
@@ -13295,7 +13295,7 @@ void QgisApp::new3DMapCanvas()
 
   // initialize from project
   QgsProject *prj = QgsProject::instance();
-  QgsRectangle fullExtent = mMapCanvas->fullExtent();
+  QgsRectangle fullExtent = mMapCanvas->projectExtent();
 
   // some layers may go crazy and make full extent unusable
   // we can't go any further - invalid extent would break everything
@@ -16279,7 +16279,7 @@ void QgisApp::readProject( const QDomDocument &doc )
       if ( map->terrainGenerator()->type() == QgsTerrainGenerator::Flat )
       {
         QgsFlatTerrainGenerator *flatTerrainGen = static_cast<QgsFlatTerrainGenerator *>( map->terrainGenerator() );
-        flatTerrainGen->setExtent( mMapCanvas->fullExtent() );
+        flatTerrainGen->setExtent( mMapCanvas->projectExtent() );
       }
       map->setOutputDpi( QgsApplication::desktop()->logicalDpiX() );
 
diff --git a/src/app/qgsmapcanvasdockwidget.cpp b/src/app/qgsmapcanvasdockwidget.cpp
@@ -94,7 +94,7 @@ QgsMapCanvasDockWidget::QgsMapCanvasDockWidget( const QString &name, QWidget *pa
   connect( mActionSetCrs, &QAction::triggered, this, &QgsMapCanvasDockWidget::setMapCrs );
   connect( mMapCanvas, &QgsMapCanvas::destinationCrsChanged, this, &QgsMapCanvasDockWidget::mapCrsChanged );
   connect( mMapCanvas, &QgsMapCanvas::destinationCrsChanged, this, &QgsMapCanvasDockWidget::updateExtentRect );
-  connect( mActionZoomFullExtent, &QAction::triggered, mMapCanvas, &QgsMapCanvas::zoomToFullExtent );
+  connect( mActionZoomFullExtent, &QAction::triggered, mMapCanvas, &QgsMapCanvas::zoomToProjectExtent );
   connect( mActionZoomToLayers, &QAction::triggered, mMapCanvas, [ = ] { QgisApp::instance()->layerTreeView()->defaultActions()->zoomToLayers( mMapCanvas ); } );
   connect( mActionZoomToSelected, &QAction::triggered, mMapCanvas, [ = ] { mMapCanvas->zoomToSelected(); } );
   mapCrsChanged();
diff --git a/src/gui/layertree/qgslayertreemapcanvasbridge.cpp b/src/gui/layertree/qgslayertreemapcanvasbridge.cpp
@@ -93,7 +93,7 @@ void QgsLayerTreeMapCanvasBridge::setCanvasLayers()
   if ( firstValidLayers )
   {
     // if we are moving from zero to non-zero layers, let's zoom to those data (only consider valid layers here!)
-    mCanvas->zoomToFullExtent();
+    mCanvas->zoomToProjectExtent();
   }
 
   if ( !mFirstCRS.isValid() )
@@ -190,7 +190,7 @@ void QgsLayerTreeMapCanvasBridge::layersAdded( const QList<QgsMapLayer *> &layer
         {
           mHasValidLayersLoaded = true;
           // if we are moving from zero valid layers to non-zero VALID layers, let's zoom to those data
-          mCanvas->zoomToFullExtent();
+          mCanvas->zoomToProjectExtent();
         }
       } );
     }
diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp
@@ -294,7 +294,7 @@ void QgsMapOverviewCanvas::updateFullExtent()
     if ( mSettings.hasValidSettings() )
       rect = mSettings.fullExtent();
     else
-      rect = mMapCanvas->fullExtent();
+      rect = mMapCanvas->projectExtent();
   }
 
   // expand a bit to keep features on margin

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ void Qgs3DMapConfigWidget::updateMaxZoomLevel()`
`433`	`433`	`}`
`434`	`434`	`else // flat or online`
`435`	`435`	`{`
`436`		`- te = mMainCanvas->fullExtent();`
	`436`	`+ te = mMainCanvas->projectExtent();`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`double tile0width = std::max( te.width(), te.height() );`
Original file line number	Diff line number	Diff line change
`@@ -8174,7 +8174,7 @@ void QgisApp::pan()`
`8174`	`8174`
`8175`	`8175`	`void QgisApp::zoomFull()`
`8176`	`8176`	`{`
`8177`		`- mMapCanvas->zoomToFullExtent();`
	`8177`	`+ mMapCanvas->zoomToProjectExtent();`
`8178`	`8178`	`}`
`8179`	`8179`
`8180`	`8180`	`void QgisApp::zoomToPrevious()`
`@@ -13295,7 +13295,7 @@ void QgisApp::new3DMapCanvas()`
`13295`	`13295`
`13296`	`13296`	`// initialize from project`
`13297`	`13297`	`QgsProject *prj = QgsProject::instance();`
`13298`		`- QgsRectangle fullExtent = mMapCanvas->fullExtent();`
	`13298`	`+ QgsRectangle fullExtent = mMapCanvas->projectExtent();`
`13299`	`13299`
`13300`	`13300`	`// some layers may go crazy and make full extent unusable`
`13301`	`13301`	`// we can't go any further - invalid extent would break everything`
`@@ -16279,7 +16279,7 @@ void QgisApp::readProject( const QDomDocument &doc )`
`16279`	`16279`	`if ( map->terrainGenerator()->type() == QgsTerrainGenerator::Flat )`
`16280`	`16280`	`{`
`16281`	`16281`	`QgsFlatTerrainGenerator flatTerrainGen = static_cast<QgsFlatTerrainGenerator >( map->terrainGenerator() );`
`16282`		`- flatTerrainGen->setExtent( mMapCanvas->fullExtent() );`
	`16282`	`+ flatTerrainGen->setExtent( mMapCanvas->projectExtent() );`
`16283`	`16283`	`}`
`16284`	`16284`	`map->setOutputDpi( QgsApplication::desktop()->logicalDpiX() );`
`16285`	`16285`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ void QgsLayerTreeMapCanvasBridge::setCanvasLayers()`
`93`	`93`	`if ( firstValidLayers )`
`94`	`94`	`{`
`95`	`95`	`// if we are moving from zero to non-zero layers, let's zoom to those data (only consider valid layers here!)`
`96`		`- mCanvas->zoomToFullExtent();`
	`96`	`+ mCanvas->zoomToProjectExtent();`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if ( !mFirstCRS.isValid() )`
`@@ -190,7 +190,7 @@ void QgsLayerTreeMapCanvasBridge::layersAdded( const QList<QgsMapLayer *> &layer`
`190`	`190`	`{`
`191`	`191`	`mHasValidLayersLoaded = true;`
`192`	`192`	`// if we are moving from zero valid layers to non-zero VALID layers, let's zoom to those data`
`193`		`- mCanvas->zoomToFullExtent();`
	`193`	`+ mCanvas->zoomToProjectExtent();`
`194`	`194`	`}`
`195`	`195`	`} );`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ void QgsMapOverviewCanvas::updateFullExtent()`
`294`	`294`	`if ( mSettings.hasValidSettings() )`
`295`	`295`	`rect = mSettings.fullExtent();`
`296`	`296`	`else`
`297`		`- rect = mMapCanvas->fullExtent();`
	`297`	`+ rect = mMapCanvas->projectExtent();`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`// expand a bit to keep features on margin`