瀏覽代碼

wxGUI: simplify v.in.dxf -l (format reverted https://trac.osgeo.org/grass/changeset/32543)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32544 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 17 年之前
父節點
當前提交
3a1cae36b9
共有 1 個文件被更改,包括 2 次插入6 次删除
  1. 2 6
      gui/wxpython/gui_modules/gdialogs.py

+ 2 - 6
gui/wxpython/gui_modules/gdialogs.py

@@ -940,12 +940,8 @@ class MultiImportDialog(wx.Dialog):
         if self.inputType == 'dxf':
         if self.inputType == 'dxf':
             for line in cmd.ReadStdOutput():
             for line in cmd.ReadStdOutput():
                 layerId = line.split(':')[0].split(' ')[1]
                 layerId = line.split(':')[0].split(' ')[1]
-                layer = line.split(':')[1]
-                try:
-                    layerName, grassName = layer.split('/')
-                except ValueError: # trunk/develbranch_6 -> v.in.dxf -l format changed
-                    layerName = layer.strip()
-                    grassName = utils.GetValidLayerName(layerName)
+                layerName = line.split(':')[1].strip()
+                grassName = utils.GetValidLayerName(layerName)
                 data.append((layerId, layerName.strip(), grassName.strip()))
                 data.append((layerId, layerName.strip(), grassName.strip()))
                 
                 
         else: # gdal/ogr (for ogr maybe to use v.in.ogr -l)
         else: # gdal/ogr (for ogr maybe to use v.in.ogr -l)