[GRASS-SVN] r66336 - grass/trunk/gui/wxpython/modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-09-26 05:42:28 -0700 (Sat, 26 Sep 2015)
New Revision: 66336

Modified:
   grass/trunk/gui/wxpython/modules/import_export.py
Log:
wxGUI: switch back from r.imprort/v.import to r.in.gdal/v.in.ogr

Modified: grass/trunk/gui/wxpython/modules/import_export.py
===================================================================
--- grass/trunk/gui/wxpython/modules/import_export.py	2015-09-25 15:45:54 UTC (rev 66335)
+++ grass/trunk/gui/wxpython/modules/import_export.py	2015-09-26 12:42:28 UTC (rev 66336)
@@ -87,7 +87,7 @@
                 continue
             elif cmd == 'r.external' and name not in ('o', 'e', 'r', 'h', 'v'):
                 continue
-            elif cmd == 'v.import':
+            elif cmd == 'v.in.ogr' and name not in ('c', 'z', 't', 'o', 'r', 'e', 'w'):
                 continue
             elif cmd == 'v.external' and name not in ('b'):
                 continue
@@ -103,7 +103,7 @@
                 desc = p.get('description', '')
             if not name and not desc:
                 continue
-            if cmd == 'v.import' and name == 'encoding':
+            if cmd == 'v.in.ogr' and name == 'encoding':
                 self.options_par[name] = (_('Encoding'),
                                           wx.TextCtrl(parent = self.panel, id = wx.ID_ANY))
         
@@ -375,7 +375,7 @@
                            'output=%s' % output,
                            'layer=%s' % layer]
                 else:
-                    cmd = ['v.import',
+                    cmd = ['v.in.ogr',
                            'input=%s' % dsn,
                            'layer=%s' % layer,
                            'output=%s' % output]
@@ -452,7 +452,7 @@
                 return 'r.external'
         else:
             if self.ogr:
-                return 'v.import'
+                return 'v.in.ogr'
             else:
                 return 'r.import'