fixes for browser (GDAL rasters) : skip *.aux.xml files ; add suffix to raster file names in browser ; add HDF4 file suffix (.hdf) in buildSupportedRasterFileFilterAndExtensions()

etiennesky · jef-n · commit a2b80be89b1d · 2012-03-09T22:44:07.000+01:00
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -194,7 +194,8 @@ bool QgsDataItem::hasChildren()
 
 void QgsDataItem::addChildItem( QgsDataItem * child, bool refresh )
 {
-  QgsDebugMsg( "mName = " + child->mName );
+  QgsDebugMsg( QString( "add child #%1 - %2" ).arg( mChildren.size() ).arg( child->mName ) );
+
   int i;
   for ( i = 0; i < mChildren.size(); i++ )
   {
diff --git a/src/providers/gdal/qgsgdaldataitems.cpp b/src/providers/gdal/qgsgdaldataitems.cpp
@@ -79,6 +79,12 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
       QgsDebugMsg( "extensions: " + extensions.join( " " ) );
       QgsDebugMsg( "wildcards: " + wildcards.join( " " ) );
     }
+    // skip *.aux.xml files (GDAL auxilary metadata files)
+    // unless that extension is in the list (*.xml might be though)
+    if ( thePath.right( 8 ) == ".aux.xml" &&
+         extensions.indexOf( "aux.xml" ) < 0 )
+      return 0;
+
     if ( extensions.indexOf( info.suffix().toLower() ) < 0 )
     {
       bool matches = false;
@@ -107,7 +113,8 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
 
     QgsDebugMsg( "GdalDataset opened " + thePath );
 
-    QString name = info.completeBaseName();
+    //extract basename with extension
+    QString name = info.completeBaseName() + "." + QFileInfo( thePath ).suffix();
     QString uri = thePath;
 
     QgsLayerItem * item = new QgsGdalLayerItem( parentItem, name, thePath, uri );
@@ -124,11 +131,10 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
         if ( hChildDS )
         {
           GDALClose( hChildDS );
-          QgsDebugMsg( QString( "add child #%1 - %2" ).arg( i ).arg( sublayers[i] ) );
 
           QString name = sublayers[i];
-          name.replace( thePath, QFileInfo( thePath ).completeBaseName() );
-
+          //replace full path with basename+extension
+          name.replace( thePath, QFileInfo( thePath ).completeBaseName() + "." + QFileInfo( thePath ).suffix() );
           childItem = new QgsGdalLayerItem( item, name, thePath + "/" + name, sublayers[i] );
           if ( childItem )
             item->addChildItem( childItem );
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -1267,7 +1267,10 @@ QStringList QgsGdalProvider::subLayers( GDALDatasetH dataset )
     }
   }
 
-  QgsDebugMsg( "sublayers:\n  " + subLayers.join( "\n  " ) );
+  if ( subLayers.size() > 0 )
+  {
+    QgsDebugMsg( "sublayers:\n  " + subLayers.join( "\n  " ) );
+  }
 
   return subLayers;
 }
@@ -1801,6 +1804,13 @@ void buildSupportedRasterFileFilterAndExtensions( QString & theFileFiltersString
         theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
         theWildcards << "hdr.adf";
       }
+      else if ( myGdalDriverDescription == "HDF4" )
+      {
+        // HDF4 extension missing in driver metadata
+        QString glob = "*.hdf";
+        theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
+        theExtensions << "hdf";
+      }
       else
       {
         catchallFilter << QString( GDALGetDescription( myGdalDriver ) );

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,8 @@ bool QgsDataItem::hasChildren()`
`194`	`194`
`195`	`195`	`void QgsDataItem::addChildItem( QgsDataItem * child, bool refresh )`
`196`	`196`	`{`
`197`		`- QgsDebugMsg( "mName = " + child->mName );`
	`197`	`+ QgsDebugMsg( QString( "add child #%1 - %2" ).arg( mChildren.size() ).arg( child->mName ) );`
	`198`	`+`
`198`	`199`	`int i;`
`199`	`200`	`for ( i = 0; i < mChildren.size(); i++ )`
`200`	`201`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1267,7 +1267,10 @@ QStringList QgsGdalProvider::subLayers( GDALDatasetH dataset )`
`1267`	`1267`	`}`
`1268`	`1268`	`}`
`1269`	`1269`
`1270`		`- QgsDebugMsg( "sublayers:\n " + subLayers.join( "\n " ) );`
	`1270`	`+ if ( subLayers.size() > 0 )`
	`1271`	`+ {`
	`1272`	`+ QgsDebugMsg( "sublayers:\n " + subLayers.join( "\n " ) );`
	`1273`	`+ }`
`1271`	`1274`
`1272`	`1275`	`return subLayers;`
`1273`	`1276`	`}`
`@@ -1801,6 +1804,13 @@ void buildSupportedRasterFileFilterAndExtensions( QString & theFileFiltersString`
`1801`	`1804`	`theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";`
`1802`	`1805`	`theWildcards << "hdr.adf";`
`1803`	`1806`	`}`
	`1807`	`+ else if ( myGdalDriverDescription == "HDF4" )`
	`1808`	`+ {`
	`1809`	`+ // HDF4 extension missing in driver metadata`
	`1810`	`+ QString glob = "*.hdf";`
	`1811`	`+ theFileFiltersString += ";;[GDAL] " + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";`
	`1812`	`+ theExtensions << "hdf";`
	`1813`	`+ }`
`1804`	`1814`	`else`
`1805`	`1815`	`{`
`1806`	`1816`	`catchallFilter << QString( GDALGetDescription( myGdalDriver ) );`