wxGUI: gselect.FormatSelect class added

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42022 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/gdialogs.py

@@ -1019,119 +1019,28 @@ class MultiImportDialog(wx.Dialog):
 
             # format widget
             self.formatText = wx.StaticText(self.panel, id=wx.ID_ANY, label=_("Format:"))
-            self.format = wx.Choice(parent = self.panel, id = wx.ID_ANY, size=(300, -1))
+            self.format = gselect.FormatSelect(parent = self.panel,
+                                               ftype = self.importType)
             self.format.Bind(wx.EVT_CHOICE, self.OnSetFormat)
-
-            if self.importType == 'gdal': 
-                ret = gcmd.RunCommand('r.in.gdal',
-                                      quiet = True, read = True,
-                                      flags = 'f')
-            else: # ogr
-                ret = gcmd.RunCommand('v.in.ogr',
-                                      quiet = True, read = True,
-                                      flags = 'f')
             
             self.input = { 'file' : [_("File:"),
                                      inputFile,
-                                     list()],
+                                     globalvar.formats[self.importType]['file']],
                            'dir'  : [_("Directory:"),
                                      inputDir,
-                                     list()],
+                                     globalvar.formats[self.importType]['file']],
                            'db'   : [_("Database:"),
                                      inputDbFile,
-                                     list()],
+                                     globalvar.formats[self.importType]['database']],
                            'pro'  : [_("Protocol:"),
                                      inputPro,
-                                     list()],
+                                     globalvar.formats[self.importType]['protocol']],
                            'db-win' : { 'file'   : inputDbFile,
                                         'text'   : inputDbText,
                                         'choice' : inputDbChoice },
                            }
             
-            self.formatToExt = {
-                # raster
-                'GeoTIFF' : 'tif',
-                'Erdas Imagine Images (.img)' : '.img',
-                'Ground-based SAR Applications Testbed File Format (.gff)' : '.gff',
-                'Arc/Info Binary Grid' : 'adf',
-                'Portable Network Graphics' : 'png',
-                'JPEG JFIF' : 'jpg',
-                'Japanese DEM (.mem)' : 'mem',
-                'Graphics Interchange Format (.gif)' : 'gif',
-                'X11 PixMap Format' : 'xpm',
-                'MS Windows Device Independent Bitmap' : 'bmp',
-                'SPOT DIMAP' : '.dim',
-                'RadarSat 2 XML Product' : 'xml',
-                'EarthWatch .TIL' : '.til',
-                'ERMapper .ers Labelled' : '.ers',
-                'ERMapper Compressed Wavelets' : 'ecw',
-                'GRIdded Binary (.grb)' : 'grb',
-                'EUMETSAT Archive native (.nat)' : '.nat',
-                'Idrisi Raster A.1' : 'rst',
-                'Golden Software ASCII Grid (.grd)' : '.grd',
-                'Golden Software Binary Grid (.grd)' : 'grd',
-                'Golden Software 7 Binary Grid (.grd)' : 'grd',
-                'R Object Data Store' : 'r',
-                'USGS DOQ (Old Style)' : 'doq',
-                'USGS DOQ (New Style)' : 'doq',
-                'ENVI .hdr Labelled' : 'hdr',
-                'ESRI .hdr Labelled' : 'hdr',
-                'Generic Binary (.hdr Labelled)' : 'hdr',
-                'PCI .aux Labelled' : 'aux',
-                'EOSAT FAST Format' : 'fst',
-                'VTP .bt (Binary Terrain) 1.3 Format' : 'bt',
-                'FARSITE v.4 Landscape File (.lcp)' : 'lcp',
-                'Swedish Grid RIK (.rik)' : 'rik',
-                'USGS Optional ASCII DEM (and CDED)' : '.dem',
-                'Northwood Numeric Grid Format .grd/.tab' : '',
-                'Northwood Classified Grid Format .grc/.tab' : '',
-                'ARC Digitized Raster Graphics' : 'arc',
-                'Magellan topo (.blx)' : 'blx',
-                'SAGA GIS Binary Grid (.sdat)' : 'sdat',
-                # vector
-                'ESRI Shapefile' : 'shp',
-                'UK .NTF'        : 'ntf',
-                'SDTS'           : 'ddf',
-                'DGN'            : 'dgn',
-                'VRT'            : 'vrt',
-                'REC'            : 'rec',
-                'BNA'            : 'bna',
-                'CSV'            : 'csv',
-                'GML'            : 'gml',
-                'GPX'            : 'gpx',
-                'KML'            : 'kml',
-                'GMT'            : 'gmt',
-                'PGeo'           : 'mdb',
-                'XPlane'         : 'dat',
-                'AVCBin'         : 'adf',
-                'AVCE00'         : 'e00',
-                'DXF'            : 'dxf',
-                'Geoconcept'     : 'gxt',
-                'GeoRSS'         : 'xml',
-                'GPSTrackMaker'  : 'gtm',
-                'VFK'            : 'vfk' }
-            
-            if ret:
-                for line in ret.splitlines():
-                    format = line.strip().rsplit(':', -1)[1].strip()
-                    if format in ('Memory', 'Virtual Raster', 'In Memory Raster'):
-                        continue
-                    if format in ('PostgreSQL', 'SQLite',
-                                  'ODBC', 'ESRI Personal GeoDatabase',
-                                  'Rasterlite',
-                                  'PostGIS WKT Raster driver'):
-                        self.input['db'][2].append(format)
-                    elif format in ('GeoJSON',
-                                    'OGC Web Coverage Service',
-                                    'OGC Web Map Service',
-                                    'HTTP Fetching Wrapper'):
-                        self.input['pro'][2].append(format)
-                    else:
-                        self.input['file'][2].append(format)
-                        self.input['dir'][2].append(format)
-            
             self.inputType = 'file'
-            
             self.format.SetItems(self.input[self.inputType][2])
             
             if self.importType == 'gdal':
@@ -1281,7 +1190,7 @@ class MultiImportDialog(wx.Dialog):
             self.inputType = 'file'
             format = self.input[self.inputType][2][0]
             try:
-                ext = self.formatToExt[format]
+                ext = self.format.GetExtension(format)
                 if not ext:
                     raise KeyError
                 format += ' (*.%s)|*.%s' % (ext, ext)
@@ -1338,7 +1247,7 @@ class MultiImportDialog(wx.Dialog):
                 else:
                     dsn = self.input[self.inputType][1].GetValue()
             try:
-                ext = '.' + self.formatToExt[self.format.GetStringSelection()]
+                ext = '.' + self.format.GetExtension(self.format.GetStringSelection())
             except KeyError:
                 ext = ''
         
@@ -1442,7 +1351,7 @@ class MultiImportDialog(wx.Dialog):
         
         if self.inputType == 'file':
             try:
-                ext = self.formatToExt[format]
+                ext = self.format.GetExtension(format)
                 if not ext:
                     raise KeyError
                 format += ' (*.%s)|*.%s' % (ext, ext)
@@ -1524,7 +1433,7 @@ class MultiImportDialog(wx.Dialog):
                 data.append((layerId, baseName, grassName))
             elif self.inputType == 'dir':
                 try:
-                    ext = self.formatToExt[self.format.GetStringSelection()]
+                    ext = self.format.GetExtension(self.format.GetStringSelection())
                 except KeyError:
                     ext = ''
                 for file in glob.glob(os.path.join(dsn, "*.%s") % ext):

gui/wxpython/gui_modules/globalvar.py

@@ -6,11 +6,10 @@
 This module provide the space for global variables
 used in the code.
 
-(C) 2007-2009 by the GRASS Development Team
+(C) 2007-2010 by the GRASS Development Team
 
-This program is free software under the GNU General Public
-License (>=v2). Read the file COPYING that comes with GRASS
-for details.
+This program is free software under the GNU General Public License
+(>=v2). Read the file COPYING that comes with GRASS for details.
 
 @author Martin Landa <landa.martin gmail.com>
 """
@@ -23,6 +22,8 @@ import locale
 import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
 
+import grass.script as grass
+
 # wxversion.select() called once at the beginning
 check = True
 
@@ -156,3 +157,53 @@ if 'g.mlist' in grassCmd['all']:
     have_mlist = True
 else:
     have_mlist = False
+
+def _getGDALFormats():
+    """!Get dictionary of avaialble GDAL drivers"""
+    ret = grass.read_command('r.in.gdal',
+                             quiet = True,
+                             flags = 'f')
+    
+    return _parseFormats(ret)
+
+def _getOGRFormats():
+    """!Get dictionary of avaialble OGR drivers"""
+    ret = grass.read_command('v.in.ogr',
+                             quiet = True,
+                             flags = 'f')
+    
+    return _parseFormats(ret)
+
+def _parseFormats(output):
+    """!Parse r.in.gdal/v.in.ogr -f output"""
+    formats = { 'file'     : list(),
+                'database' : list(),
+                'protocol' : list()
+                }
+    
+    if not output:
+        return formats
+    
+    for line in output.splitlines():
+        format = line.strip().rsplit(':', -1)[1].strip()
+        if format in ('Memory', 'Virtual Raster', 'In Memory Raster'):
+            continue
+        if format in ('PostgreSQL', 'SQLite',
+                      'ODBC', 'ESRI Personal GeoDatabase',
+                      'Rasterlite',
+                      'PostGIS WKT Raster driver'):
+            formats['database'].append(format)
+        elif format in ('GeoJSON',
+                        'OGC Web Coverage Service',
+                        'OGC Web Map Service',
+                        'HTTP Fetching Wrapper'):
+            formats['protocol'].append(format)
+        else:
+            formats['file'].append(format)
+
+    return formats
+
+formats = {
+    'gdal' : _getGDALFormats(),
+    'ogr' : _getOGRFormats()
+    }

gui/wxpython/gui_modules/gselect.py

@@ -16,6 +16,7 @@ Classes:
  - LocationSelect
  - MapsetSelect
  - SubGroupSelect
+ - FormatSelect
 
 (C) 2007-2010 by the GRASS Development Team This program is free
 software under the GNU General Public License (>=v2). Read the file
@@ -803,3 +804,93 @@ class SubGroupSelect(wx.ComboBox):
         except OSError:
             self.SetItems([])
         self.SetValue('')
+
+class FormatSelect(wx.Choice):
+    def __init__(self, parent, ftype, sourceType = None, id = wx.ID_ANY, size = globalvar.DIALOG_COMBOBOX_SIZE, 
+                 **kwargs):
+        """!Widget for selecting external (GDAL/OGR) format
+
+        @param parent parent window
+        @param sourceType source type ('file', 'directory', 'database', 'protocol') or None
+        @param dataType data type ('gdal' or 'ogr')
+        """
+        super(FormatSelect, self).__init__(parent, id, size = size, 
+                                           style = wx.CB_READONLY, **kwargs)
+        self.SetName("FormatSelect")
+
+        formats = list()
+        for f in globalvar.formats[ftype].values():
+            formats += f
+        self.SetItems(formats)
+        
+    def GetExtension(self, name):
+        """!Get file extension by format name"""
+        formatToExt = {
+            # raster
+            'GeoTIFF' : 'tif',
+            'Erdas Imagine Images (.img)' : '.img',
+            'Ground-based SAR Applications Testbed File Format (.gff)' : '.gff',
+            'Arc/Info Binary Grid' : 'adf',
+            'Portable Network Graphics' : 'png',
+            'JPEG JFIF' : 'jpg',
+            'Japanese DEM (.mem)' : 'mem',
+            'Graphics Interchange Format (.gif)' : 'gif',
+            'X11 PixMap Format' : 'xpm',
+            'MS Windows Device Independent Bitmap' : 'bmp',
+            'SPOT DIMAP' : '.dim',
+            'RadarSat 2 XML Product' : 'xml',
+            'EarthWatch .TIL' : '.til',
+            'ERMapper .ers Labelled' : '.ers',
+            'ERMapper Compressed Wavelets' : 'ecw',
+            'GRIdded Binary (.grb)' : 'grb',
+            'EUMETSAT Archive native (.nat)' : '.nat',
+            'Idrisi Raster A.1' : 'rst',
+            'Golden Software ASCII Grid (.grd)' : '.grd',
+            'Golden Software Binary Grid (.grd)' : 'grd',
+            'Golden Software 7 Binary Grid (.grd)' : 'grd',
+            'R Object Data Store' : 'r',
+            'USGS DOQ (Old Style)' : 'doq',
+            'USGS DOQ (New Style)' : 'doq',
+            'ENVI .hdr Labelled' : 'hdr',
+            'ESRI .hdr Labelled' : 'hdr',
+            'Generic Binary (.hdr Labelled)' : 'hdr',
+            'PCI .aux Labelled' : 'aux',
+            'EOSAT FAST Format' : 'fst',
+            'VTP .bt (Binary Terrain) 1.3 Format' : 'bt',
+            'FARSITE v.4 Landscape File (.lcp)' : 'lcp',
+            'Swedish Grid RIK (.rik)' : 'rik',
+            'USGS Optional ASCII DEM (and CDED)' : '.dem',
+            'Northwood Numeric Grid Format .grd/.tab' : '',
+            'Northwood Classified Grid Format .grc/.tab' : '',
+            'ARC Digitized Raster Graphics' : 'arc',
+            'Magellan topo (.blx)' : 'blx',
+            'SAGA GIS Binary Grid (.sdat)' : 'sdat',
+            # vector
+            'ESRI Shapefile' : 'shp',
+            'UK .NTF'        : 'ntf',
+            'SDTS'           : 'ddf',
+            'DGN'            : 'dgn',
+            'VRT'            : 'vrt',
+            'REC'            : 'rec',
+            'BNA'            : 'bna',
+            'CSV'            : 'csv',
+            'GML'            : 'gml',
+            'GPX'            : 'gpx',
+            'KML'            : 'kml',
+            'GMT'            : 'gmt',
+            'PGeo'           : 'mdb',
+            'XPlane'         : 'dat',
+            'AVCBin'         : 'adf',
+            'AVCE00'         : 'e00',
+            'DXF'            : 'dxf',
+            'Geoconcept'     : 'gxt',
+            'GeoRSS'         : 'xml',
+            'GPSTrackMaker'  : 'gtm',
+            'VFK'            : 'vfk'
+            }
+        
+        try:
+            return formatToExt[name]
+        except KeyError:
+            return ''
+        

gui/wxpython/gui_modules/menuform.py

@@ -1429,10 +1429,16 @@ class cmdPanel(wx.Panel):
                             ogrSelection.Bind(wx.EVT_TEXT, self.OnUpdateSelection)
                             ogrSelection.Bind(wx.EVT_TEXT, self.OnSetValue)
                             
+                            ogrFormat = gselect.FormatSelect(parent = which_panel,
+                                                             ftype = 'ogr')
+                            ogrFormat.Hide()
+                            ### ogrFormat.Bind(wx.EVT_CHOICE, self.OnSetFormat)
+                            
                             which_sizer.Add(item = self.hsizer, proportion = 0)
                             
                             p['wxId'].append(rbox.GetId())
                             p['wxId'].append(ogrSelection.GetChildren()[1].GetId())
+                            p['wxId'].append(ogrFormat.GetId())
                         else:
                             which_sizer.Add(item=selection, proportion=0,
                                             flag=wx.ADJUST_MINSIZE | wx.BOTTOM | wx.LEFT | wx.RIGHT | wx.TOP | wx.ALIGN_CENTER_VERTICAL,
@@ -1718,8 +1724,9 @@ class cmdPanel(wx.Panel):
         if not p:
             return # should not happen
         
+        # detect windows
         winNative = None
-        winOGR    = None
+        winOgrDsn = winOgrFrmt = None
         for id in p['wxId']:
             if id == idEvent:
                 continue
@@ -1727,14 +1734,18 @@ class cmdPanel(wx.Panel):
             if name == 'Select':
                 winNative = self.FindWindowById(id + 1)  # fix the mystery (also in nviz_tools.py)
             elif name == 'OgrSelect':
-                winOgr = self.FindWindowById(id + 2)
+                winOgrDsn = self.FindWindowById(id + 2)
+            elif name == 'FormatSelect':
+                winOgrFrmt = self.FindWindowById(id)
         
         # enable / disable widgets & update values
         rbox = self.FindWindowByName('VectorFormat')
         self.hsizer.Remove(rbox)
         if sel == 0:   # -> native
-            winOgr.Hide()
-            self.hsizer.Remove(winOgr)
+            winOgrDsn.Hide()
+            self.hsizer.Remove(winOgrDsn)
+            winOgrFrmt.Hide()
+            self.hsizer.Remove(winOgrFrmt)
 
             self.hsizer.Add(item=winNative,
                             flag=wx.ADJUST_MINSIZE | wx.BOTTOM | wx.LEFT | wx.RIGHT | wx.TOP | wx.ALIGN_TOP,
@@ -1743,15 +1754,23 @@ class cmdPanel(wx.Panel):
             p['value'] = winNative.GetValue()
         
         elif sel == 1: # -> OGR
+            sizer = wx.BoxSizer(wx.VERTICAL)
+            
             winNative.Hide()
             self.hsizer.Remove(winNative)
 
-            self.hsizer.Add(item=winOgr,
+            sizer.Add(item=winOgrDsn)
+            winOgrDsn.Show()
+            p['value'] = winOgrDsn.GetValue()
+            
+            sizer.Add(item=winOgrFrmt,
+                      flag = wx.LEFT | wx.EXPAND, border= 5)
+            winOgrFrmt.Show()
+            
+            self.hsizer.Add(item=sizer,
                             flag=wx.ADJUST_MINSIZE | wx.BOTTOM | wx.LEFT | wx.RIGHT | wx.TOP | wx.ALIGN_TOP,
                             border=5)
-            winOgr.Show()
-            p['value'] = winOgr.GetValue()
-
+        
         self.hsizer.Add(item=rbox,
                         flag=wx.ADJUST_MINSIZE | wx.BOTTOM | wx.LEFT |
                         wx.RIGHT | wx.ALIGN_TOP,