fix crash when removing layers with highlighed features

jef-n · jef-n · commit c91d470f53dd · 2014-04-06T20:23:33.000+02:00
diff --git a/python/gui/qgshighlight.sip b/python/gui/qgshighlight.sip
@@ -7,17 +7,27 @@ class QgsHighlight : QgsMapCanvasItem
     QgsHighlight( QgsMapCanvas *mapCanvas, QgsGeometry *geom, QgsVectorLayer *layer );
     ~QgsHighlight();
 
+    /** Set line/outline to color, polygon fill to color with alpha = 63.
+     *  This is legacy function, use setFillColor() after setColor() if different fill color is required. */
     void setColor( const QColor & color );
 
+    /** Set polygons fill color.
+     * @note: added in version 2.3 */
     void setFillColor( const QColor & fillColor );
 
     /** Set width. Ignored in feature mode. */
     void setWidth( int width );
 
+    /** Set line / outline buffer in millimeters.
+     *  @note: added in version 2.3 */
     void setBuffer( double buffer );
 
+    /** Set minimum line / outline width in millimeters.
+     *  @note: added in version 2.3 */
     void setMinWidth( double width );
 
+    const QgsMapLayer *layer() const;
+
   protected:
     virtual void paint( QPainter* p );
 
diff --git a/src/gui/qgshighlight.cpp b/src/gui/qgshighlight.cpp
@@ -13,8 +13,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <typeinfo>
-
 #include <QImage>
 
 #include "qgsmarkersymbollayerv2.h"
@@ -134,7 +132,7 @@ void QgsHighlight::setFillColor( const QColor & fillColor )
 QgsFeatureRendererV2 * QgsHighlight::getRenderer( const QgsRenderContext & context, const QColor & color, const QColor & fillColor )
 {
   QgsFeatureRendererV2 *renderer = 0;
-  QgsVectorLayer *layer = vectorLayer();
+  QgsVectorLayer *layer = qobject_cast<QgsVectorLayer*>( mLayer );
   if ( layer && layer->rendererV2() )
   {
     renderer = layer->rendererV2()->clone();
@@ -345,7 +343,9 @@ void QgsHighlight::paint( QPainter* p )
   }
   else if ( mFeature.geometry() )
   {
-    QgsVectorLayer *layer = vectorLayer();
+    QgsVectorLayer *layer = qobject_cast<QgsVectorLayer*>( mLayer );
+    if( !layer )
+      return;
     QgsMapSettings mapSettings = mMapCanvas->mapSettings();
     QgsRenderContext context = QgsRenderContext::fromMapSettings( mapSettings );
 
@@ -438,9 +438,3 @@ void QgsHighlight::updateRect()
     setRect( QgsRectangle() );
   }
 }
-
-QgsVectorLayer * QgsHighlight::vectorLayer()
-{
-  return dynamic_cast<QgsVectorLayer *>( mLayer );
-}
-
diff --git a/src/gui/qgshighlight.h b/src/gui/qgshighlight.h
@@ -66,6 +66,8 @@ class GUI_EXPORT QgsHighlight: public QgsMapCanvasItem
      *  @note: added in version 2.3 */
     void setMinWidth( double width ) { mMinWidth = width; }
 
+    const QgsMapLayer *layer() const { return mLayer; }
+
   protected:
     virtual void paint( QPainter* p );
 
@@ -82,10 +84,6 @@ class GUI_EXPORT QgsHighlight: public QgsMapCanvasItem
     void paintLine( QPainter *p, QgsPolyline line );
     void paintPolygon( QPainter *p, QgsPolygon polygon );
 
-    QgsVectorLayer *vectorLayer();
-
-    QgsHighlight();
-
     QBrush mBrush;
     QPen mPen;
     QgsGeometry *mGeometry;
diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp
@@ -650,10 +650,11 @@ void QgsMapToolIdentify::handleMenuHover()
         QList<IdentifyResult>::const_iterator idListIt = idList.constBegin();
         for ( ; idListIt != idList.constEnd(); ++idListIt )
         {
-          QgsHighlight* hl = new QgsHighlight( mCanvas, idListIt->mFeature.geometry(), vl );
+          QgsHighlight *hl = new QgsHighlight( mCanvas, idListIt->mFeature.geometry(), vl );
           hl->setColor( QColor( 255, 0, 0 ) );
           hl->setWidth( 2 );
           mRubberBands.append( hl );
+          connect( vl, SIGNAL( destroyed() ), this, SLOT( layerDestroyed() ) );
         }
       }
     }
@@ -662,10 +663,22 @@ void QgsMapToolIdentify::handleMenuHover()
 
 void QgsMapToolIdentify::deleteRubberBands()
 {
-  QList<QgsHighlight*>::const_iterator it = mRubberBands.constBegin();
-  for ( ; it != mRubberBands.constEnd(); ++it )
+  qDeleteAll( mRubberBands );
+}
+
+void QgsMapToolIdentify::layerDestroyed()
+{
+  QList<QgsHighlight*>::iterator it = mRubberBands.begin();
+  while ( it != mRubberBands.end() )
   {
-    delete *it;
+    if (( *it )->layer() == sender() )
+    {
+      delete *it;
+      it = mRubberBands.erase( it );
+    }
+    else
+    {
+      ++it;
+    }
   }
-  mRubberBands.clear();
 }
diff --git a/src/gui/qgsmaptoolidentify.h b/src/gui/qgsmaptoolidentify.h
@@ -127,6 +127,7 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
 
   public slots:
     void formatChanged( QgsRasterLayer *layer );
+    void layerDestroyed();
 
   signals:
     void identifyProgress( int, int );

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`	`* *`
`14`	`14`	`***************************************************************************/`
`15`	`15`
`16`		`-#include <typeinfo>`
`17`		`-`
`18`	`16`	`#include <QImage>`
`19`	`17`
`20`	`18`	`#include "qgsmarkersymbollayerv2.h"`
`@@ -134,7 +132,7 @@ void QgsHighlight::setFillColor( const QColor & fillColor )`
`134`	`132`	`QgsFeatureRendererV2 * QgsHighlight::getRenderer( const QgsRenderContext & context, const QColor & color, const QColor & fillColor )`
`135`	`133`	`{`
`136`	`134`	`QgsFeatureRendererV2 *renderer = 0;`
`137`		`- QgsVectorLayer *layer = vectorLayer();`
	`135`	`+ QgsVectorLayer layer = qobject_cast<QgsVectorLayer>( mLayer );`
`138`	`136`	`if ( layer && layer->rendererV2() )`
`139`	`137`	`{`
`140`	`138`	`renderer = layer->rendererV2()->clone();`
`@@ -345,7 +343,9 @@ void QgsHighlight::paint( QPainter* p )`
`345`	`343`	`}`
`346`	`344`	`else if ( mFeature.geometry() )`
`347`	`345`	`{`
`348`		`- QgsVectorLayer *layer = vectorLayer();`
	`346`	`+ QgsVectorLayer layer = qobject_cast<QgsVectorLayer>( mLayer );`
	`347`	`+ if( !layer )`
	`348`	`+ return;`
`349`	`349`	`QgsMapSettings mapSettings = mMapCanvas->mapSettings();`
`350`	`350`	`QgsRenderContext context = QgsRenderContext::fromMapSettings( mapSettings );`
`351`	`351`
`@@ -438,9 +438,3 @@ void QgsHighlight::updateRect()`
`438`	`438`	`setRect( QgsRectangle() );`
`439`	`439`	`}`
`440`	`440`	`}`
`441`		`-`
`442`		`-QgsVectorLayer * QgsHighlight::vectorLayer()`
`443`		`-{`
`444`		`- return dynamic_cast<QgsVectorLayer *>( mLayer );`
`445`		`-}`
`446`		`-`
Original file line number	Diff line number	Diff line change
`@@ -650,10 +650,11 @@ void QgsMapToolIdentify::handleMenuHover()`
`650`	`650`	`QList<IdentifyResult>::const_iterator idListIt = idList.constBegin();`
`651`	`651`	`for ( ; idListIt != idList.constEnd(); ++idListIt )`
`652`	`652`	`{`
`653`		`- QgsHighlight* hl = new QgsHighlight( mCanvas, idListIt->mFeature.geometry(), vl );`
	`653`	`+ QgsHighlight *hl = new QgsHighlight( mCanvas, idListIt->mFeature.geometry(), vl );`
`654`	`654`	`hl->setColor( QColor( 255, 0, 0 ) );`
`655`	`655`	`hl->setWidth( 2 );`
`656`	`656`	`mRubberBands.append( hl );`
	`657`	`+ connect( vl, SIGNAL( destroyed() ), this, SLOT( layerDestroyed() ) );`
`657`	`658`	`}`
`658`	`659`	`}`
`659`	`660`	`}`
`@@ -662,10 +663,22 @@ void QgsMapToolIdentify::handleMenuHover()`
`662`	`663`
`663`	`664`	`void QgsMapToolIdentify::deleteRubberBands()`
`664`	`665`	`{`
`665`		`- QList<QgsHighlight*>::const_iterator it = mRubberBands.constBegin();`
`666`		`- for ( ; it != mRubberBands.constEnd(); ++it )`
	`666`	`+ qDeleteAll( mRubberBands );`
	`667`	`+}`
	`668`	`+`
	`669`	`+void QgsMapToolIdentify::layerDestroyed()`
	`670`	`+{`
	`671`	`+ QList<QgsHighlight*>::iterator it = mRubberBands.begin();`
	`672`	`+ while ( it != mRubberBands.end() )`
`667`	`673`	`{`
`668`		`- delete *it;`
	`674`	`+ if (( *it )->layer() == sender() )`
	`675`	`+ {`
	`676`	`+ delete *it;`
	`677`	`+ it = mRubberBands.erase( it );`
	`678`	`+ }`
	`679`	`+ else`
	`680`	`+ {`
	`681`	`+ ++it;`
	`682`	`+ }`
`669`	`683`	`}`
`670`		`- mRubberBands.clear();`
`671`	`684`	`}`