Преглед на файлове

Used new grass library for mapset selection and element list parsing. Makes map selection much faster.

NOTE: This change CANNOT be backported to GRASS 6.4 unless the new grass python library and new init.sh code is also backported.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32201 15284696-431f-4ddb-bdfa-cd5b030d7da7
Michael Barton преди 17 години
родител
ревизия
a354a018f1
променени са 1 файла, в които са добавени 5 реда и са изтрити 4 реда
  1. 5 4
      gui/wxpython/gui_modules/gselect.py

+ 5 - 4
gui/wxpython/gui_modules/gselect.py

@@ -21,6 +21,7 @@ import sys
 import wx
 import wx.combo
 
+import grass
 import globalvar
 import gcmd
 import utils
@@ -131,8 +132,7 @@ class TreeCtrlComboPopup(wx.combo.ComboPopup):
         with all relevant elements displayed beneath each mapset branch
         """
         # get current mapset
-        cmdlist = ['g.gisenv', 'get=MAPSET']
-        curr_mapset = gcmd.Command(cmdlist).ReadStdOutput()[0]
+        curr_mapset = grass.gisenv()['MAPSET']
         
         # list of mapsets in current location
         if mapsets is None:
@@ -195,12 +195,13 @@ class TreeCtrlComboPopup(wx.combo.ComboPopup):
                 mapsets[i] = mapsets[0]
                 mapsets[0] = curr_mapset
 
+        filesdict = grass.list_grouped(elementdict[element])
+        
         for dir in mapsets:
             dir_node = self.AddItem('Mapset: '+dir)
             self.seltree.SetItemTextColour(dir_node,wx.Colour(50,50,200))
             try:
-                cmdlist = ['g.mlist', 'type=%s' % elementdict[element], 'mapset=%s' % dir]
-                elem_list = gcmd.Command(cmdlist).ReadStdOutput()
+                elem_list = filesdict[dir]
                 elem_list.sort()
                 for elem in elem_list:
                     if elem != '':