Move triggerRepaint() to QgsMapLayer, use it instead of deprecated cl…

…earCacheImage()
qgis · Sep 11, 2014 · fba5c5a · fba5c5a
1 parent ed11c57
commit fba5c5a
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 32 deletions.
diff --git a/python/core/qgsmaplayer.sip b/python/core/qgsmaplayer.sip
@@ -395,9 +395,17 @@ class QgsMapLayer : QObject
     bool hasScaleBasedVisibility() const;
 
     /** Clear cached image
-     *  @deprecated in 2.4 - caches listen to repaintRequested() signal to invalidate the cached image */
+     *  @deprecated in 2.4 - use triggerRepaint() - caches automatically listen to repaintRequested() signal to invalidate the cached image */
     void clearCacheImage() /Deprecated/;
 
+    /**
+     * Will advice the map canvas (and any other interested party) that this layer requires to be repainted.
+     * Will emit a repaintRequested() signal.
+     *
+     * @note in 2.6 function moved from vector/raster subclasses to QgsMapLayer
+     */
+    void triggerRepaint();
+
     /** \brief Obtain Metadata for this layer */
     virtual QString metadata();
 

diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -1157,8 +1157,6 @@ class QgsVectorLayer : QgsMapLayer
      */
     void removeSelection();
 
-    void triggerRepaint();
-
     /** Update the extents for the layer. This is necessary if features are
      *  added/deleted or the layer has been subsetted.
      */

diff --git a/python/core/raster/qgsrasterlayer.sip b/python/core/raster/qgsrasterlayer.sip
@@ -191,9 +191,6 @@ class QgsRasterLayer : QgsMapLayer
     QImage previewAsImage( QSize size, QColor bgColor = QColor( 255, 255, 255 ),
                            QImage::Format format = QImage::Format_ARGB32_Premultiplied );
 
-    /** \brief Emit a signal asking for a repaint. (inherited from maplayer) */
-    void triggerRepaint();
-
     /**
      * Reorders the *previously selected* sublayers of this layer from bottom to top
      *

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -6984,7 +6984,7 @@ void QgisApp::setLayerCRS()
         if ( child->layer() )
         {
           child->layer()->setCrs( crs );
-          child->layer()->clearCacheImage();
+          child->layer()->triggerRepaint();
         }
       }
     }
@@ -6994,7 +6994,7 @@ void QgisApp::setLayerCRS()
       if ( nodeLayer->layer() )
       {
         nodeLayer->layer()->setCrs( crs );
-        nodeLayer->layer()->clearCacheImage();
+        nodeLayer->layer()->triggerRepaint();
       }
     }
   }
@@ -7111,7 +7111,7 @@ void QgisApp::legendGroupSetCRS()
     if ( nodeLayer->layer() )
     {
       nodeLayer->layer()->setCrs( crs );
-      nodeLayer->layer()->clearCacheImage();
+      nodeLayer->layer()->triggerRepaint();
     }
   }
 }
@@ -8587,7 +8587,7 @@ void QgisApp::layersWereAdded( QList<QgsMapLayer *> theLayers )
 
     if ( provider )
     {
-      connect( provider, SIGNAL( dataChanged() ), layer, SLOT( clearCacheImage() ) );
+      connect( provider, SIGNAL( dataChanged() ), layer, SLOT( triggerRepaint() ) );
       connect( provider, SIGNAL( dataChanged() ), mMapCanvas, SLOT( refresh() ) );
     }
   }

diff --git a/src/browser/qgsbrowser.cpp b/src/browser/qgsbrowser.cpp
@@ -466,7 +466,7 @@ void QgsBrowser::updateCurrentTab()
       QgsRasterLayer *rlayer = qobject_cast< QgsRasterLayer * >( mLayer );
       if ( rlayer )
       {
-        connect( rlayer->dataProvider(), SIGNAL( dataChanged() ), rlayer, SLOT( clearCacheImage() ) );
+        connect( rlayer->dataProvider(), SIGNAL( dataChanged() ), rlayer, SLOT( triggerRepaint() ) );
         connect( rlayer->dataProvider(), SIGNAL( dataChanged() ), mapCanvas, SLOT( refresh() ) );
       }
     }

diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -195,7 +195,7 @@ bool QgsSymbolV2LegendNode::setData( const QVariant& value, int role )
   emit dataChanged();
 
   if ( mLayerNode->isVisible() )
-    vlayer->clearCacheImage();
+    vlayer->triggerRepaint();
 
   return true;
 }

diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -1403,6 +1403,11 @@ void QgsMapLayer::clearCacheImage()
   emit repaintRequested();
 }
 
+void QgsMapLayer::triggerRepaint()
+{
+  emit repaintRequested();
+}
+
 QString QgsMapLayer::metadata()
 {
   return QString();

diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h
@@ -413,9 +413,17 @@ class CORE_EXPORT QgsMapLayer : public QObject
     bool hasScaleBasedVisibility() const;
 
     /** Clear cached image
-     *  @deprecated in 2.4 - caches listen to repaintRequested() signal to invalidate the cached image */
+     *  @deprecated in 2.4 - use triggerRepaint() - caches automatically listen to repaintRequested() signal to invalidate the cached image */
     Q_DECL_DEPRECATED void clearCacheImage();
 
+    /**
+     * Will advice the map canvas (and any other interested party) that this layer requires to be repainted.
+     * Will emit a repaintRequested() signal.
+     *
+     * @note in 2.6 function moved from vector/raster subclasses to QgsMapLayer
+     */
+    void triggerRepaint();
+
     /** \brief Obtain Metadata for this layer */
     virtual QString metadata();
 

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -566,11 +566,6 @@ void QgsVectorLayer::removeSelection()
   setSelectedFeatures( QgsFeatureIds() );
 }
 
-void QgsVectorLayer::triggerRepaint()
-{
-  emit repaintRequested();
-}
-
 QgsVectorDataProvider* QgsVectorLayer::dataProvider()
 {
   return mDataProvider;

diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1514,12 +1514,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      */
     void removeSelection();
 
-    /**
-     * Will advice the map canvas (and any other interested party) that this layer requires to be repainted.
-     * Will emit a repaintRequested() signal.
-     */
-    void triggerRepaint();
-
     /** Update the extents for the layer. This is necessary if features are
      *  added/deleted or the layer has been subsetted.
      */

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1189,11 +1189,6 @@ QImage QgsRasterLayer::previewAsImage( QSize size, QColor bgColor, QImage::Forma
   return myQImage;
 }
 
-void QgsRasterLayer::triggerRepaint()
-{
-  emit repaintRequested();
-}
-
 void QgsRasterLayer::updateProgress( int theProgress, int theMax )
 {
   Q_UNUSED( theProgress );

diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
@@ -351,9 +351,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
     QImage previewAsImage( QSize size, QColor bgColor = Qt::white,
                            QImage::Format format = QImage::Format_ARGB32_Premultiplied );
 
-    /** \brief Emit a signal asking for a repaint. (inherited from maplayer) */
-    void triggerRepaint();
-
     /**
      * Reorders the *previously selected* sublayers of this layer from bottom to top
      *