lazily determine full canvas extent

jef-n · jef-n · commit c87529e39347 · 2016-03-03T23:58:59.000+01:00
diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
@@ -58,6 +58,7 @@ QgsMapRenderer::QgsMapRenderer()
   mDestCRS = new QgsCoordinateReferenceSystem( GEOCRS_ID, QgsCoordinateReferenceSystem::InternalCrsId ); //WGS 84
 
   mOutputUnits = QgsMapRenderer::Millimeters;
+  mFullExtent.setMinimal();
 
   mLabelingEngine = nullptr;
 }
@@ -928,15 +929,19 @@ QgsRectangle QgsMapRenderer::mapToLayerCoordinates( QgsMapLayer* theLayer, QgsRe
   return rect;
 }
 
-
 void QgsMapRenderer::updateFullExtent()
+{
+  mFullExtent.setMinimal();
+}
+
+QgsRectangle QgsMapRenderer::fullExtent()
 {
   QgsDebugMsg( "called." );
-  QgsMapLayerRegistry* registry = QgsMapLayerRegistry::instance();
 
-  // reset the map canvas extent since the extent may now be smaller
-  // We can't use a constructor since QgsRectangle normalizes the rectangle upon construction
-  mFullExtent.setMinimal();
+  if ( !mFullExtent.isNull() )
+    return mFullExtent;
+
+  QgsMapLayerRegistry* registry = QgsMapLayerRegistry::instance();
 
   // iterate through the map layers and test each layers extent
   // against the current min and max values
@@ -993,11 +998,7 @@ void QgsMapRenderer::updateFullExtent()
   }
 
   QgsDebugMsg( "Full extent: " + mFullExtent.toString() );
-}
 
-QgsRectangle QgsMapRenderer::fullExtent()
-{
-  updateFullExtent();
   return mFullExtent;
 }
 
@@ -1013,7 +1014,6 @@ QStringList& QgsMapRenderer::layerSet()
   return mLayerSet;
 }
 
-
 bool QgsMapRenderer::readXML( QDomNode & theNode )
 {
   QgsMapSettings tmpSettings;
diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp
@@ -62,6 +62,12 @@ void QgsMapOverviewCanvas::resizeEvent( QResizeEvent* e )
   QWidget::resizeEvent( e );
 }
 
+void QgsMapOverviewCanvas::showEvent( QShowEvent* e )
+{
+  refresh();
+  QWidget::showEvent( e );
+}
+
 void QgsMapOverviewCanvas::paintEvent( QPaintEvent* pe )
 {
   if ( !mPixmap.isNull() )
@@ -155,6 +161,9 @@ void QgsMapOverviewCanvas::updatePanningWidget( QPoint pos )
 
 void QgsMapOverviewCanvas::refresh()
 {
+  if ( !isVisible() )
+    return;
+
   updateFullExtent();
 
   if ( !mSettings.hasValidSettings() )
diff --git a/src/gui/qgsmapoverviewcanvas.h b/src/gui/qgsmapoverviewcanvas.h
@@ -81,6 +81,9 @@ class GUI_EXPORT QgsMapOverviewCanvas : public QWidget
     //! Overridden paint event
     void paintEvent( QPaintEvent * pe ) override;
 
+    //! Overridden show event
+    void showEvent( QShowEvent * e ) override;
+
     //! Overridden resize event
     void resizeEvent( QResizeEvent * e ) override;
 

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,12 @@ void QgsMapOverviewCanvas::resizeEvent( QResizeEvent* e )`
`62`	`62`	`QWidget::resizeEvent( e );`
`63`	`63`	`}`
`64`	`64`
	`65`	`+void QgsMapOverviewCanvas::showEvent( QShowEvent* e )`
	`66`	`+{`
	`67`	`+ refresh();`
	`68`	`+ QWidget::showEvent( e );`
	`69`	`+}`
	`70`	`+`
`65`	`71`	`void QgsMapOverviewCanvas::paintEvent( QPaintEvent* pe )`
`66`	`72`	`{`
`67`	`73`	`if ( !mPixmap.isNull() )`
`@@ -155,6 +161,9 @@ void QgsMapOverviewCanvas::updatePanningWidget( QPoint pos )`
`155`	`161`
`156`	`162`	`void QgsMapOverviewCanvas::refresh()`
`157`	`163`	`{`
	`164`	`+ if ( !isVisible() )`
	`165`	`+ return;`
	`166`	`+`
`158`	`167`	`updateFullExtent();`
`159`	`168`
`160`	`169`	`if ( !mSettings.hasValidSettings() )`