[GRASS-SVN] r63330 - in grass/trunk/gui/wxpython: . gui_core

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-12-02 09:30:02 -0800 (Tue, 02 Dec 2014)
New Revision: 63330

Modified:
   grass/trunk/gui/wxpython/gis_set.py
   grass/trunk/gui/wxpython/gui_core/dialogs.py
   grass/trunk/gui/wxpython/gui_core/gselect.py
Log:
wxGUI: update for renamed dsn parameter

Modified: grass/trunk/gui/wxpython/gis_set.py
===================================================================
--- grass/trunk/gui/wxpython/gis_set.py	2014-12-02 17:26:48 UTC (rev 63329)
+++ grass/trunk/gui/wxpython/gis_set.py	2014-12-02 17:30:02 UTC (rev 63330)
@@ -513,14 +513,14 @@
         """
         RunCommand('db.connect', flags='c')
         mapName = os.path.splitext(os.path.basename(filePath))[0]
-        vectors = RunCommand('v.in.ogr', dsn = filePath, flags = 'l',
+        vectors = RunCommand('v.in.ogr', input = filePath, flags = 'l',
                              read = True)
         
         wx.BeginBusyCursor()
         wx.Yield()
         if mapName in vectors:
             # vector detected
-            returncode, error = RunCommand('v.in.ogr', dsn = filePath, output = mapName,
+            returncode, error = RunCommand('v.in.ogr', input = filePath, output = mapName,
                                            getErrorMsg = True)
         else:
             returncode, error = RunCommand('r.in.gdal', input = filePath, output = mapName,

Modified: grass/trunk/gui/wxpython/gui_core/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/dialogs.py	2014-12-02 17:26:48 UTC (rev 63329)
+++ grass/trunk/gui/wxpython/gui_core/dialogs.py	2014-12-02 17:30:02 UTC (rev 63330)
@@ -412,7 +412,7 @@
                                    parent = parent,
                                    read = True,
                                    flags = 'l',
-                                   dsn = vExternalOut['dsn']).splitlines()
+                                   input = vExternalOut['dsn']).splitlines()
     
     overwrite = False
     if not UserSettings.Get(group = 'cmd', key = 'overwrite', subkey = 'enabled') and \
@@ -446,7 +446,7 @@
         RunCommand('v.external',
                    overwrite = overwrite,
                    parent = parent,
-                   dsn = vExternalOut['dsn'],
+                   input = vExternalOut['dsn'],
                    layer = outmap)
         
     # create attribute table
@@ -1891,12 +1891,12 @@
                     layer = layer.replace('.' + ext, '')
                 if self.link:
                     cmd = ['v.external',
-                           'dsn=%s' % dsn,
+                           'input=%s' % dsn,
                            'output=%s' % output,
                            'layer=%s' % layer]
                 else:
                     cmd = ['v.in.ogr',
-                           'dsn=%s' % dsn,
+                           'input=%s' % dsn,
                            'layer=%s' % layer,
                            'output=%s' % output]
             else: # gdal
@@ -2041,7 +2041,7 @@
             
             RunCommand('v.external.out',
                        parent = self,
-                       dsn = dsn, format = frmt,
+                       output = dsn, format = frmt,
                        options = options)
         self.Close()
         

Modified: grass/trunk/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/gselect.py	2014-12-02 17:26:48 UTC (rev 63329)
+++ grass/trunk/gui/wxpython/gui_core/gselect.py	2014-12-02 17:30:02 UTC (rev 63330)
@@ -878,7 +878,7 @@
                              read = True,
                              quiet = True,
                              flags = 'l',
-                             dsn = dsn)
+                             input = dsn)
             if ret:
                 layers = ret.splitlines()
 
@@ -1938,7 +1938,7 @@
                              quiet = True,
                              read = True,
                              flags = 't',
-                             dsn = dsn)
+                             input = dsn)
             if not ret:
                 self.reloadDataRequired.emit(data=None)
                 return