[GRASS-SVN] r46840 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2011-06-29 03:46:21 -0700 (Wed, 29 Jun 2011)
New Revision: 46840

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mcalc_builder.py
Log:
I forgot to update the functions for raster3d, now I fix it

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mcalc_builder.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mcalc_builder.py	2011-06-29 10:29:14 UTC (rev 46839)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mcalc_builder.py	2011-06-29 10:46:21 UTC (rev 46840)
@@ -109,10 +109,8 @@
             }
         
         if self.rast3d:
-            indx = self.funct_list.index('y()') +1
-            self.funct_list.insert(indx, 'z()')
-            indx = self.funct_list.index('nsres()') +1
-            self.funct_list.insert(indx, 'tbres()')
+            self.funct_dict['z()'] = 'z()'
+            self.funct_dict['tbres()'] = 'tbres()'
             element = 'rast3d'
         else:
             element = 'cell'
@@ -217,7 +215,7 @@
         self.functlabel = wx.StaticText(parent = self.panel, id = wx.ID_ANY,
                                         label = _('Insert mapcalc function'))
         self.function = wx.ComboBox(parent = self.panel, id = wx.ID_ANY, 
-                                    size = (250, -1), choices = self.funct_dict.keys(),
+                                    size = (250, -1), choices = sorted(self.funct_dict.keys()),
                                     style = wx.CB_DROPDOWN |
                                     wx.CB_READONLY | wx.TE_PROCESS_ENTER)