[GRASS-SVN] r71280 - in grass/branches/releasebranch_7_2/gui/wxpython: gui_core modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2017-07-18 06:22:29 -0700 (Tue, 18 Jul 2017)
New Revision: 71280

Modified:
   grass/branches/releasebranch_7_2/gui/wxpython/gui_core/forms.py
   grass/branches/releasebranch_7_2/gui/wxpython/modules/import_export.py
Log:
v.in.ogr GUI generates invalid layer parameter (merge r70892 from trunk; fix #3308)


Modified: grass/branches/releasebranch_7_2/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/gui_core/forms.py	2017-07-18 12:49:04 UTC (rev 71279)
+++ grass/branches/releasebranch_7_2/gui/wxpython/gui_core/forms.py	2017-07-18 13:22:29 UTC (rev 71280)
@@ -2026,11 +2026,16 @@
 
                         def OnCheckItem(index, flag):
                             layers = list()
+                            geometry = None
                             for layer, match, listId in self.win1.GetLayers():
+                                if '|' in layer:
+                                    layer, geometry = layer.split('|', 1)
                                 layers.append(layer)
                             porf = self.task.get_param(
                                 'layer', element='name', raiseError=False)
                             porf['value'] = ','.join(layers)
+                            # geometry is currently discarded
+                            # TODO: v.import has no geometry option
                             self.OnUpdateValues()  # TODO: replace by signal
 
                         self.win1.OnCheckItem = OnCheckItem

Modified: grass/branches/releasebranch_7_2/gui/wxpython/modules/import_export.py
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/modules/import_export.py	2017-07-18 12:49:04 UTC (rev 71279)
+++ grass/branches/releasebranch_7_2/gui/wxpython/modules/import_export.py	2017-07-18 13:22:29 UTC (rev 71280)
@@ -577,7 +577,7 @@
             else:
                 geometry = None
 
-                # TODO
+                # TODO: v.import has no geometry option
                 # if geometry:
                 #    cmd.append('geometry=%s' % geometry)