GRASS: show layers non expandable

blazek · blazek · commit 443264f2a729 · 2014-11-06T18:19:29.000+01:00
diff --git a/src/providers/grass/qgsgrassprovidermodule.cpp b/src/providers/grass/qgsgrassprovidermodule.cpp
@@ -112,7 +112,9 @@ QVector<QgsDataItem*> QgsGrassMapsetItem::createChildren()
 
       if ( layerNames.size() == 1 )
       {
+        /* This may happen (one layer only) in GRASS 7 with points (no topo layers) */
         QgsLayerItem *layer = new QgsLayerItem( this, name + " " + baseLayerName, path, uri, layerType, "grass" );
+        layer->populate(); // does nothing, but sets mPopulated to true to show non expandable in browser
         items.append( layer );
       }
       else
@@ -133,6 +135,7 @@ QVector<QgsDataItem*> QgsGrassMapsetItem::createChildren()
     QgsDebugMsg( "uri = " + uri );
 
     QgsLayerItem *layer = new QgsLayerItem( this, name, uri, uri, QgsLayerItem::Raster, "grassraster" );
+    layer->populate(); // does nothing, but sets mPopulated to true to show non expandable in browser
 
     items.append( layer );
   }
@@ -144,6 +147,7 @@ QgsGrassVectorLayerItem::QgsGrassVectorLayerItem( QgsDataItem* parent, QString m
     : QgsLayerItem( parent, layerName, path, uri, layerType, providerKey )
     , mMapName( mapName )
 {
+  mPopulated = true; // no children, to show non expandable in browser
 }
 
 QString QgsGrassVectorLayerItem::layerName() const

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,9 @@ QVector<QgsDataItem*> QgsGrassMapsetItem::createChildren()`
`112`	`112`
`113`	`113`	`if ( layerNames.size() == 1 )`
`114`	`114`	`{`
	`115`	`+ /* This may happen (one layer only) in GRASS 7 with points (no topo layers) */`
`115`	`116`	`QgsLayerItem *layer = new QgsLayerItem( this, name + " " + baseLayerName, path, uri, layerType, "grass" );`
	`117`	`+ layer->populate(); // does nothing, but sets mPopulated to true to show non expandable in browser`
`116`	`118`	`items.append( layer );`
`117`	`119`	`}`
`118`	`120`	`else`
`@@ -133,6 +135,7 @@ QVector<QgsDataItem*> QgsGrassMapsetItem::createChildren()`
`133`	`135`	`QgsDebugMsg( "uri = " + uri );`
`134`	`136`
`135`	`137`	`QgsLayerItem *layer = new QgsLayerItem( this, name, uri, uri, QgsLayerItem::Raster, "grassraster" );`
	`138`	`+ layer->populate(); // does nothing, but sets mPopulated to true to show non expandable in browser`
`136`	`139`
`137`	`140`	`items.append( layer );`
`138`	`141`	`}`
`@@ -144,6 +147,7 @@ QgsGrassVectorLayerItem::QgsGrassVectorLayerItem( QgsDataItem* parent, QString m`
`144`	`147`	`: QgsLayerItem( parent, layerName, path, uri, layerType, providerKey )`
`145`	`148`	`, mMapName( mapName )`
`146`	`149`	`{`
	`150`	`+ mPopulated = true; // no children, to show non expandable in browser`
`147`	`151`	`}`
`148`	`152`
`149`	`153`	`QString QgsGrassVectorLayerItem::layerName() const`