[QGIS Commit] r13273 - trunk/qgis/src/core/raster

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-04-07 08:20:05 -0400 (Wed, 07 Apr 2010)
New Revision: 13273

Modified:
   trunk/qgis/src/core/raster/qgsrasterlayer.cpp
Log:
Change filter string for DTED raster (patch #1925 provided by kyle)

Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2010-04-07 11:29:01 UTC (rev 13272)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2010-04-07 12:20:05 UTC (rev 13273)
@@ -303,7 +303,7 @@
   // "DMD_EXTENSION=.*".  We'll also store the long name of the
   // driver, which will be found in DMD_LONGNAME, which will have the
   // same form.
-  
+
   // start with the default case
   theFileFiltersString = tr( "All files (*)" );
 
@@ -414,8 +414,10 @@
       }
       else if ( myGdalDriverDescription.startsWith( "DTED" ) )
       {
-        // DTED use "*.dt0"
+        // DTED use "*.dt0, *.dt1, *.dt2"
         QString glob = "*.dt0";
+        glob += " *.dt1";
+        glob += " *.dt2";
         theFileFiltersString += ";;" + myGdalDriverLongName + " (" + glob.toLower() + " " + glob.toUpper() + ")";
       }
       else if ( myGdalDriverDescription.startsWith( "MrSID" ) )
@@ -5550,8 +5552,8 @@
 {
   if ( !mValid )
     return false;
-    
-  if( !mCurrentImage && !mCurrentGDALData )
+
+  if ( !mCurrentImage && !mCurrentGDALData )
   {
     return false;
   }