[GRASS-SVN] r40014 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-12-15 06:00:24 -0500 (Tue, 15 Dec 2009)
New Revision: 40014

Modified:
   grass/trunk/gui/wxpython/gui_modules/location_wizard.py
Log:
utm zones start with 1 (merge from devbr6)

Modified: grass/trunk/gui/wxpython/gui_modules/location_wizard.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/location_wizard.py	2009-12-15 10:57:47 UTC (rev 40013)
+++ grass/trunk/gui/wxpython/gui_modules/location_wizard.py	2009-12-15 11:00:24 UTC (rev 40014)
@@ -728,11 +728,11 @@
         val = event.GetString()
         if self.ptype[num] == 'zone':
             if val.isdigit():
-                if int(val) < 0: self.pentry[num].SetValue(0)
+                if int(val) < 1: self.pentry[num].SetValue(1)
                 if int(val) > 60: self.pentry[num].SetValue(60)
             else: 
-                self.pentry[num].SetValue(0)
-            
+                self.pentry[num].SetValue(1)
+
         self.pval[num] = val
         
         event.Skip()
@@ -800,7 +800,7 @@
                 if self.ptype[num] == 'bool': self.pval[num] = 'No'
                 elif self.ptype[num] == 'zone': 
                     self.pval[num] = '30' 
-                    self.pdesc[num] += ' (0-60)'
+                    self.pdesc[num] += ' (1-60)'
                 else: self.pval[num] = paramgrp[2]
 
                 label = wx.StaticText(self.panel, id=1000+num, label=self.pdesc[num], 
@@ -815,7 +815,7 @@
                                                    value='30',
                                                    size=(100,-1), 
                                                    style=wx.SP_ARROW_KEYS | wx.SP_WRAP,
-                                                   min=0, max=60, initial=30)  
+                                                   min=1, max=60, initial=30)  
                     self.pentry[num].SetValue(int(self.pval[num]))
                     self.Bind(wx.EVT_TEXT, self.OnParamEntry)
                 else: