[GRASS-SVN] r54688 - grass/trunk/gui/wxpython/iclass

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-01-17 14:27:15 -0800 (Thu, 17 Jan 2013)
New Revision: 54688

Modified:
   grass/trunk/gui/wxpython/iclass/frame.py
Log:
g.gui.iclass: fix reading maps from subgroup (patch by Anna Kratovilova)


Modified: grass/trunk/gui/wxpython/iclass/frame.py
===================================================================
--- grass/trunk/gui/wxpython/iclass/frame.py	2013-01-17 22:25:30 UTC (rev 54687)
+++ grass/trunk/gui/wxpython/iclass/frame.py	2013-01-17 22:27:15 UTC (rev 54688)
@@ -8,7 +8,7 @@
  - frame::IClassMapFrame
  - frame::MapManager
 
-(C) 2006-2011 by the GRASS Development Team
+(C) 2006-2013 by the GRASS Development Team
 This program is free software under the GNU General Public
 License (>=v2). Read the file COPYING that comes with GRASS
 for details.
@@ -869,7 +869,9 @@
         
         # init Ref struct with the files in group */
         I_free_group_ref(self.refer)
-        if (not I_iclass_init_group(self.group, self.refer)):
+        # we expect the subgroup name to be the same as the group name
+        subgroup = self.group
+        if (not I_iclass_init_group(self.group, subgroup, self.refer)):
             return False
         
         I_free_signatures(self.signatures)
@@ -1035,13 +1037,13 @@
         return count
         
     def GetGroupLayers(self, group):
-        """! Get layers in group
+        """!Get layers in subgroup (expecting same name for group and subgroup)
     
         @todo consider moving this function to core module for convenient
         """
         res = RunCommand('i.group',
                          flags = 'g',
-                         group = group,
+                         group = group, subgroup = group,
                          read = True).strip()
         if res.split('\n')[0]:
             return res.split('\n')