Don't show non-spatial layers as disabled in layer tree

nyalldawson · nyalldawson · commit bb6e275ef033 · 2018-01-31T18:30:46.000+11:00
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -242,11 +242,10 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
     if ( QgsLayerTree::isLayer( node ) )
     {
       QgsLayerTreeLayer *nodeLayer = QgsLayerTree::toLayer( node );
-      if ( nodeLayer->layer() && nodeLayer->layer()->type() == QgsMapLayer::VectorLayer )
-      {
-        if ( qobject_cast<QgsVectorLayer *>( nodeLayer->layer() )->geometryType() == QgsWkbTypes::NullGeometry )
-          return QVariant(); // do not show checkbox for non-spatial tables
-      }
+
+      if ( nodeLayer->layer() && !nodeLayer->layer()->isSpatial() )
+        return QVariant(); // do not show checkbox for non-spatial tables
+
       return nodeLayer->itemVisibilityChecked() ? Qt::Checked : Qt::Unchecked;
     }
     else if ( QgsLayerTree::isGroup( node ) )
@@ -270,7 +269,7 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
     if ( QgsLayerTree::isLayer( node ) )
     {
       const QgsMapLayer *layer = QgsLayerTree::toLayer( node )->layer();
-      if ( !node->isVisible() || ( layer && !layer->isInScaleRange( mLegendMapViewScale ) ) )
+      if ( ( !node->isVisible() && ( !layer || layer->isSpatial() ) ) || ( layer && !layer->isInScaleRange( mLegendMapViewScale ) ) )
       {
         brush.setColor( Qt::lightGray );
       }

Original file line number	Diff line number	Diff line change
`@@ -242,11 +242,10 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const`
`242`	`242`	`if ( QgsLayerTree::isLayer( node ) )`
`243`	`243`	`{`
`244`	`244`	`QgsLayerTreeLayer *nodeLayer = QgsLayerTree::toLayer( node );`
`245`		`- if ( nodeLayer->layer() && nodeLayer->layer()->type() == QgsMapLayer::VectorLayer )`
`246`		`- {`
`247`		`- if ( qobject_cast<QgsVectorLayer *>( nodeLayer->layer() )->geometryType() == QgsWkbTypes::NullGeometry )`
`248`		`- return QVariant(); // do not show checkbox for non-spatial tables`
`249`		`- }`
	`245`	`+`
	`246`	`+ if ( nodeLayer->layer() && !nodeLayer->layer()->isSpatial() )`
	`247`	`+ return QVariant(); // do not show checkbox for non-spatial tables`
	`248`	`+`
`250`	`249`	`return nodeLayer->itemVisibilityChecked() ? Qt::Checked : Qt::Unchecked;`
`251`	`250`	`}`
`252`	`251`	`else if ( QgsLayerTree::isGroup( node ) )`
`@@ -270,7 +269,7 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const`
`270`	`269`	`if ( QgsLayerTree::isLayer( node ) )`
`271`	`270`	`{`
`272`	`271`	`const QgsMapLayer *layer = QgsLayerTree::toLayer( node )->layer();`
`273`		`- if ( !node->isVisible() \|\| ( layer && !layer->isInScaleRange( mLegendMapViewScale ) ) )`
	`272`	`+ if ( ( !node->isVisible() && ( !layer \|\| layer->isSpatial() ) ) \|\| ( layer && !layer->isInScaleRange( mLegendMapViewScale ) ) )`
`274`	`273`	`{`
`275`	`274`	`brush.setColor( Qt::lightGray );`
`276`	`275`	`}`