Fixed map overview handling

wonder · wonder · commit 6d09a3c6dfb7 · 2007-05-31T00:33:26.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6971 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/gui/qgsmapoverviewcanvas.sip b/python/gui/qgsmapoverviewcanvas.sip
@@ -26,7 +26,7 @@ class QgsMapOverviewCanvas : QWidget
     
     void enableAntiAliasing(bool flag);
     
-    void updateFullExtent();
+    void updateFullExtent(const QgsRect& rect);
     
   public slots:
     
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -263,12 +263,17 @@ void QgsMapCanvas::setLayerSet(QList<QgsMapCanvasLayer>& layers)
 
   if (mMapOverview)
   {
+    mMapOverview->updateFullExtent(fullExtent());
+    
     QStringList& layerSetOvOld = mMapOverview->layerSet();
     if (layerSetOvOld != layerSetOverview)
     {
       mMapOverview->setLayerSet(layerSetOverview);
-      updateOverview();
     }
+    
+    // refresh overview maplayers even if layer set is the same
+    // because full extent might have changed
+    updateOverview();
   }
   
   if (layerSetChanged)
@@ -404,8 +409,7 @@ void QgsMapCanvas::updateFullExtent()
   mMapRender->updateFullExtent();
   if (mMapOverview)
   {
-    mMapOverview->updateFullExtent();
-    mMapOverview->reflectChangedExtent();
+    mMapOverview->updateFullExtent(fullExtent());
     updateOverview();
   }
   refresh();
@@ -414,6 +418,11 @@ void QgsMapCanvas::updateFullExtent()
 
 void QgsMapCanvas::setExtent(QgsRect const & r)
 {
+  if (r.isEmpty())
+  {
+    QgsDebugMsg("Setting empty extent!");
+  }
+  
   QgsRect current = extent();
   mMapRender->setExtent(r);
   emit extentsChanged();
diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp
@@ -95,9 +95,6 @@ void QgsMapOverviewCanvas::reflectChangedExtent()
   // show only when valid extent is set
   if (extent.isEmpty())
   {
-#ifdef QGISDEBUG
-    std::cout << "panning: empty extent" << std::endl;
-#endif
     mPanningWidget->hide();
     return;
   }
@@ -246,7 +243,6 @@ void QgsMapOverviewCanvas::refresh()
     painter.setRenderHint(QPainter::Antialiasing);
   
   // render image
-  mMapRender->setExtent(mMapCanvas->fullExtent());
   mMapRender->render(&painter);
   
   painter.end();
@@ -274,9 +270,10 @@ void QgsMapOverviewCanvas::setLayerSet(const QStringList& layerSet)
   mMapRender->setLayerSet(layerSet);
 }
 
-void QgsMapOverviewCanvas::updateFullExtent()
+void QgsMapOverviewCanvas::updateFullExtent(const QgsRect& rect)
 {
-  mMapRender->updateFullExtent();
+  mMapRender->setExtent(rect);
+  reflectChangedExtent();
 }
 
 void QgsMapOverviewCanvas::projectionsEnabled(bool flag)
diff --git a/src/gui/qgsmapoverviewcanvas.h b/src/gui/qgsmapoverviewcanvas.h
@@ -30,6 +30,7 @@
 class QgsMapCanvas;
 class QgsMapRender;
 class QgsPanningWidget; // defined in .cpp
+class QgsRect;
 
 class GUI_EXPORT QgsMapOverviewCanvas : public QWidget
 {
@@ -56,7 +57,7 @@ class GUI_EXPORT QgsMapOverviewCanvas : public QWidget
     
     void enableAntiAliasing(bool flag) { mAntiAliasing = flag; }
     
-    void updateFullExtent();
+    void updateFullExtent(const QgsRect& rect);
     
   public slots:
     

Original file line number	Diff line number	Diff line change
`@@ -263,12 +263,17 @@ void QgsMapCanvas::setLayerSet(QList<QgsMapCanvasLayer>& layers)`
`263`	`263`
`264`	`264`	`if (mMapOverview)`
`265`	`265`	`{`
	`266`	`+ mMapOverview->updateFullExtent(fullExtent());`
	`267`	`+`
`266`	`268`	`QStringList& layerSetOvOld = mMapOverview->layerSet();`
`267`	`269`	`if (layerSetOvOld != layerSetOverview)`
`268`	`270`	`{`
`269`	`271`	`mMapOverview->setLayerSet(layerSetOverview);`
`270`		`- updateOverview();`
`271`	`272`	`}`
	`273`	`+`
	`274`	`+ // refresh overview maplayers even if layer set is the same`
	`275`	`+ // because full extent might have changed`
	`276`	`+ updateOverview();`
`272`	`277`	`}`
`273`	`278`
`274`	`279`	`if (layerSetChanged)`
`@@ -404,8 +409,7 @@ void QgsMapCanvas::updateFullExtent()`
`404`	`409`	`mMapRender->updateFullExtent();`
`405`	`410`	`if (mMapOverview)`
`406`	`411`	`{`
`407`		`- mMapOverview->updateFullExtent();`
`408`		`- mMapOverview->reflectChangedExtent();`
	`412`	`+ mMapOverview->updateFullExtent(fullExtent());`
`409`	`413`	`updateOverview();`
`410`	`414`	`}`
`411`	`415`	`refresh();`
`@@ -414,6 +418,11 @@ void QgsMapCanvas::updateFullExtent()`
`414`	`418`
`415`	`419`	`void QgsMapCanvas::setExtent(QgsRect const & r)`
`416`	`420`	`{`
	`421`	`+ if (r.isEmpty())`
	`422`	`+ {`
	`423`	`+ QgsDebugMsg("Setting empty extent!");`
	`424`	`+ }`
	`425`	`+`
`417`	`426`	`QgsRect current = extent();`
`418`	`427`	`mMapRender->setExtent(r);`
`419`	`428`	`emit extentsChanged();`
Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,6 @@ void QgsMapOverviewCanvas::reflectChangedExtent()`
`95`	`95`	`// show only when valid extent is set`
`96`	`96`	`if (extent.isEmpty())`
`97`	`97`	`{`
`98`		`-#ifdef QGISDEBUG`
`99`		`- std::cout << "panning: empty extent" << std::endl;`
`100`		`-#endif`
`101`	`98`	`mPanningWidget->hide();`
`102`	`99`	`return;`
`103`	`100`	`}`
`@@ -246,7 +243,6 @@ void QgsMapOverviewCanvas::refresh()`
`246`	`243`	`painter.setRenderHint(QPainter::Antialiasing);`
`247`	`244`
`248`	`245`	`// render image`
`249`		`- mMapRender->setExtent(mMapCanvas->fullExtent());`
`250`	`246`	`mMapRender->render(&painter);`
`251`	`247`
`252`	`248`	`painter.end();`
`@@ -274,9 +270,10 @@ void QgsMapOverviewCanvas::setLayerSet(const QStringList& layerSet)`
`274`	`270`	`mMapRender->setLayerSet(layerSet);`
`275`	`271`	`}`
`276`	`272`
`277`		`-void QgsMapOverviewCanvas::updateFullExtent()`
	`273`	`+void QgsMapOverviewCanvas::updateFullExtent(const QgsRect& rect)`
`278`	`274`	`{`
`279`		`- mMapRender->updateFullExtent();`
	`275`	`+ mMapRender->setExtent(rect);`
	`276`	`+ reflectChangedExtent();`
`280`	`277`	`}`
`281`	`278`
`282`	`279`	`void QgsMapOverviewCanvas::projectionsEnabled(bool flag)`