wxGUI: d.vect OGR fixes

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

gui/wxpython/gui_modules/gselect.py

@@ -578,7 +578,6 @@ class LayerNameSelect(wx.ComboBox):
         @param dsn    OGR data source name
         """
         layers = list()
-        self.SetValue('')
         if vector:
             # TODO
             pass
@@ -592,6 +591,7 @@ class LayerNameSelect(wx.ComboBox):
                 layers = ret.splitlines()
         
         self.SetItems(layers)
+        self.SetSelection(0)
         
 class DriverSelect(wx.ComboBox):
     """!Creates combo box for selecting database driver.

gui/wxpython/gui_modules/layertree.py

@@ -836,7 +836,7 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
                 
         Debug.msg (3, "LayerTree.PropertiesDialog(): ltype=%s" % \
                    ltype)
-
+        
         if self.GetPyData(layer)[0]['cmd']:
             module = menuform.GUI()
             module.ParseCommand(self.GetPyData(layer)[0]['cmd'],

gui/wxpython/gui_modules/menuform.py

@@ -1402,6 +1402,8 @@ class cmdPanel(wx.Panel):
                                                label = " %s " % _("Format"),
                                                style = wx.RA_SPECIFY_ROWS,
                                                choices = [_("Native / Linked OGR"), _("Direct OGR")])
+                            if p.get('value', '').lower().rfind('@ogr') > -1:
+                                rbox.SetSelection(1)
                             rbox.SetName('VectorFormat')
                             rbox.Bind(wx.EVT_RADIOBOX, self.OnVectorFormat)
                             
@@ -1465,6 +1467,10 @@ class cmdPanel(wx.Panel):
                                                   min=1, max=100, initial=int(p['default']))
                                 win1.Bind(wx.EVT_SPINCTRL, self.OnSetValue)
                             win2 = gselect.LayerNameSelect(parent = which_panel)
+                            if p.get('value','') != '':
+                                win2.SetItems([p['value']])
+                                win2.SetSelection(0)
+                            
                             win2.Bind(wx.EVT_TEXT, self.OnSetValue)
                             p['wxId'] = [ win1.GetId(), win2.GetId() ]
                             win.Add(item = win1, proportion = 0)
@@ -1993,7 +1999,7 @@ class GUI:
             layer = completed[1]
             if completed[2]:
                 dcmd_params.update(completed[2])
-
+        
         self.parent = parentframe
 
         # parse the interface decription
@@ -2029,8 +2035,11 @@ class GUI:
 
                     if self.grass_task.get_param(key)['element'] in ['cell', 'vector']:
                         # mapname -> mapname@mapset
-                        if '@' not in value:
+                        try:
+                            name, mapset = value.split('@')
+                        except ValueError:
                             value = value + '@' + grass.gisenv()['MAPSET']
+                    
                     self.grass_task.set_param(key, value)
                     cmd_validated.append(key + '=' + value)
                     i = i + 1

gui/wxpython/gui_modules/utils.py

@@ -82,7 +82,7 @@ def GetLayerNameFromCmd(dcmd, fullyQualified=False, param=None,
     @return '' if no map name found in command
     """
     mapname = ''
-
+    
     if len(dcmd) < 1:
         return mapname
     
@@ -106,7 +106,7 @@ def GetLayerNameFromCmd(dcmd, fullyQualified=False, param=None,
                 params = [(idx, p, v)]
                 break
             
-            if p in ('map', 'input',
+            if p in ('map', 'input', 'layer',
                      'red', 'blue', 'green',
                      'h_map', 's_map', 'i_map',
                      'reliefmap'):
@@ -136,10 +136,17 @@ def GetLayerNameFromCmd(dcmd, fullyQualified=False, param=None,
             
             # update dcmd
             for i, p, v in params:
+                if p == 'layer':
+                    continue
                 dcmd[i] = p + '=' + v + '@' + mapset
     
         maps = list()
+        ogr = False
         for i, p, v in params:
+            if v.lower().rfind('@ogr') > -1:
+                ogr = True
+            if p == 'layer' and not ogr:
+                continue
             maps.append(dcmd[i].split('=')[1])
         mapname = '\n'.join(maps)