Bad layers indicator raster support

elpaso · elpaso · commit 2af5fd1950a1 · 2018-11-05T10:24:35.000+01:00
diff --git a/src/app/qgslayertreeviewindicatorprovider.cpp b/src/app/qgslayertreeviewindicatorprovider.cpp
@@ -20,6 +20,7 @@
 #include "qgslayertreeutils.h"
 #include "qgslayertreeview.h"
 #include "qgsvectorlayer.h"
+#include "qgsrasterlayer.h"
 #include "qgisapp.h"
 
 QgsLayerTreeViewIndicatorProvider::QgsLayerTreeViewIndicatorProvider( QgsLayerTreeView *view )
@@ -89,16 +90,20 @@ void QgsLayerTreeViewIndicatorProvider::onWillRemoveChildren( QgsLayerTreeNode *
 
 void QgsLayerTreeViewIndicatorProvider::onLayerLoaded()
 {
+
   QgsLayerTreeLayer *layerNode = qobject_cast<QgsLayerTreeLayer *>( sender() );
   if ( !layerNode )
     return;
 
-  if ( QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layerNode->layer() ) )
+  if ( !( qobject_cast<QgsVectorLayer *>( layerNode->layer() ) || qobject_cast<QgsRasterLayer *>( layerNode->layer() ) ) )
+    return;
+
+  if ( QgsMapLayer *mapLayer = qobject_cast<QgsMapLayer *>( layerNode->layer() ) )
   {
-    if ( vlayer )
+    if ( mapLayer )
     {
-      connectSignals( vlayer );
-      addOrRemoveIndicator( layerNode, vlayer );
+      connectSignals( mapLayer );
+      addOrRemoveIndicator( layerNode, mapLayer );
     }
   }
 }
@@ -123,18 +128,18 @@ void QgsLayerTreeViewIndicatorProvider::onLayerChanged()
 
 void QgsLayerTreeViewIndicatorProvider::connectSignals( QgsMapLayer *layer )
 {
-  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
-  if ( !vlayer )
+  if ( !( qobject_cast<QgsVectorLayer *>( layer ) || qobject_cast<QgsRasterLayer *>( layer ) ) )
     return;
-  connect( vlayer, &QgsVectorLayer::dataSourceChanged, this, &QgsLayerTreeViewIndicatorProvider::onLayerChanged );
+  QgsMapLayer *mapLayer = qobject_cast<QgsMapLayer *>( layer );
+  connect( mapLayer, &QgsMapLayer::dataSourceChanged, this, &QgsLayerTreeViewIndicatorProvider::onLayerChanged );
 }
 
 void QgsLayerTreeViewIndicatorProvider::disconnectSignals( QgsMapLayer *layer )
 {
-  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
-  if ( !vlayer )
+  if ( !( qobject_cast<QgsVectorLayer *>( layer ) || qobject_cast<QgsRasterLayer *>( layer ) ) )
     return;
-  disconnect( vlayer, &QgsVectorLayer::dataSourceChanged, this, &QgsLayerTreeViewIndicatorProvider::onLayerChanged );
+  QgsMapLayer *mapLayer = qobject_cast<QgsMapLayer *>( layer );
+  disconnect( mapLayer, &QgsMapLayer::dataSourceChanged, this, &QgsLayerTreeViewIndicatorProvider::onLayerChanged );
 }
 
 std::unique_ptr< QgsLayerTreeViewIndicator > QgsLayerTreeViewIndicatorProvider::newIndicator( QgsMapLayer *layer )
diff --git a/src/app/qgslayertreeviewindicatorprovider.h b/src/app/qgslayertreeviewindicatorprovider.h
@@ -38,8 +38,8 @@ class QgsMapLayer;
  *
  * Subclasses may override:
  * - onIndicatorClicked() default implementation does nothing
- * - connectSignals() default implementation connects vector layers to dataSourceChanged()
- * - disconnectSignals() default implementation disconnects vector layers from dataSourceChanged()
+ * - connectSignals() default implementation connects layers to dataSourceChanged()
+ * - disconnectSignals() default implementation disconnects layers from dataSourceChanged()
  */
 class QgsLayerTreeViewIndicatorProvider : public QObject
 {
@@ -51,9 +51,9 @@ class QgsLayerTreeViewIndicatorProvider : public QObject
   protected:
 
     // Subclasses MAY override:
-    //! Connect signals, default implementation connects vector layers to dataSourceChanged()
+    //! Connect signals, default implementation connects layers to dataSourceChanged()
     virtual void connectSignals( QgsMapLayer *layer );
-    //! Disconnect signals, default implementation disconnects vector layers from dataSourceChanged()
+    //! Disconnect signals, default implementation disconnects layers from dataSourceChanged()
     virtual void disconnectSignals( QgsMapLayer *layer );
 
   protected slots:

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`#include "qgslayertreeutils.h"`
`21`	`21`	`#include "qgslayertreeview.h"`
`22`	`22`	`#include "qgsvectorlayer.h"`
	`23`	`+#include "qgsrasterlayer.h"`
`23`	`24`	`#include "qgisapp.h"`
`24`	`25`
`25`	`26`	`QgsLayerTreeViewIndicatorProvider::QgsLayerTreeViewIndicatorProvider( QgsLayerTreeView *view )`
`@@ -89,16 +90,20 @@ void QgsLayerTreeViewIndicatorProvider::onWillRemoveChildren( QgsLayerTreeNode *`
`89`	`90`
`90`	`91`	`void QgsLayerTreeViewIndicatorProvider::onLayerLoaded()`
`91`	`92`	`{`
	`93`	`+`
`92`	`94`	`QgsLayerTreeLayer layerNode = qobject_cast<QgsLayerTreeLayer >( sender() );`
`93`	`95`	`if ( !layerNode )`
`94`	`96`	`return;`
`95`	`97`
`96`		`- if ( QgsVectorLayer vlayer = qobject_cast<QgsVectorLayer >( layerNode->layer() ) )`
	`98`	`+ if ( !( qobject_cast<QgsVectorLayer >( layerNode->layer() ) \|\| qobject_cast<QgsRasterLayer >( layerNode->layer() ) ) )`
	`99`	`+ return;`
	`100`	`+`
	`101`	`+ if ( QgsMapLayer mapLayer = qobject_cast<QgsMapLayer >( layerNode->layer() ) )`
`97`	`102`	`{`
`98`		`- if ( vlayer )`
	`103`	`+ if ( mapLayer )`
`99`	`104`	`{`
`100`		`- connectSignals( vlayer );`
`101`		`- addOrRemoveIndicator( layerNode, vlayer );`
	`105`	`+ connectSignals( mapLayer );`
	`106`	`+ addOrRemoveIndicator( layerNode, mapLayer );`
`102`	`107`	`}`
`103`	`108`	`}`
`104`	`109`	`}`
`@@ -123,18 +128,18 @@ void QgsLayerTreeViewIndicatorProvider::onLayerChanged()`
`123`	`128`
`124`	`129`	`void QgsLayerTreeViewIndicatorProvider::connectSignals( QgsMapLayer *layer )`
`125`	`130`	`{`
`126`		`- QgsVectorLayer vlayer = qobject_cast<QgsVectorLayer >( layer );`
`127`		`- if ( !vlayer )`
	`131`	`+ if ( !( qobject_cast<QgsVectorLayer >( layer ) \|\| qobject_cast<QgsRasterLayer >( layer ) ) )`
`128`	`132`	`return;`
`129`		`- connect( vlayer, &QgsVectorLayer::dataSourceChanged, this, &QgsLayerTreeViewIndicatorProvider::onLayerChanged );`
	`133`	`+ QgsMapLayer mapLayer = qobject_cast<QgsMapLayer >( layer );`
	`134`	`+ connect( mapLayer, &QgsMapLayer::dataSourceChanged, this, &QgsLayerTreeViewIndicatorProvider::onLayerChanged );`
`130`	`135`	`}`
`131`	`136`
`132`	`137`	`void QgsLayerTreeViewIndicatorProvider::disconnectSignals( QgsMapLayer *layer )`
`133`	`138`	`{`
`134`		`- QgsVectorLayer vlayer = qobject_cast<QgsVectorLayer >( layer );`
`135`		`- if ( !vlayer )`
	`139`	`+ if ( !( qobject_cast<QgsVectorLayer >( layer ) \|\| qobject_cast<QgsRasterLayer >( layer ) ) )`
`136`	`140`	`return;`
`137`		`- disconnect( vlayer, &QgsVectorLayer::dataSourceChanged, this, &QgsLayerTreeViewIndicatorProvider::onLayerChanged );`
	`141`	`+ QgsMapLayer mapLayer = qobject_cast<QgsMapLayer >( layer );`
	`142`	`+ disconnect( mapLayer, &QgsMapLayer::dataSourceChanged, this, &QgsLayerTreeViewIndicatorProvider::onLayerChanged );`
`138`	`143`	`}`
`139`	`144`
`140`	`145`	`std::unique_ptr< QgsLayerTreeViewIndicator > QgsLayerTreeViewIndicatorProvider::newIndicator( QgsMapLayer *layer )`