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

[svn_grass at osgeo.org]

Author: cmbarton
Date: 2009-10-19 13:37:27 -0400 (Mon, 19 Oct 2009)
New Revision: 39583

Modified:
   grass/trunk/gui/wxpython/gui_modules/location_wizard.py
Log:
Legitimate capitalized datums are accepted. Transformation list begins with #1. 

Modified: grass/trunk/gui/wxpython/gui_modules/location_wizard.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/location_wizard.py	2009-10-19 10:05:23 UTC (rev 39582)
+++ grass/trunk/gui/wxpython/gui_modules/location_wizard.py	2009-10-19 17:37:27 UTC (rev 39583)
@@ -253,22 +253,21 @@
 
         # toggles
         self.radio1 = wx.RadioButton(parent=self, id=wx.ID_ANY,
-                                     label=_("Select coordinate system"),
+                                     label=_("Select coordinate system parameters from a list"),
                                      style = wx.RB_GROUP)
         self.radio2 = wx.RadioButton(parent=self, id=wx.ID_ANY,
-                                     label=_("Select EPSG code of coordinate system"))
+                                     label=_("Select EPSG code of spatial reference system"))
         self.radio3 = wx.RadioButton(parent=self, id=wx.ID_ANY,
-                                     label=_("Use coordinate system of selected "
-                                             "georeferenced file"))
+                                     label=_("Read projection and datum terms from a "
+                                             "georeferenced data file"))
         self.radio4 = wx.RadioButton(parent=self, id=wx.ID_ANY,
-                                     label=_("Use coordinate system of selected "
+                                     label=_("Read projection and datum terms from a "
                                              "WKT or PRJ file"))
         self.radio5 = wx.RadioButton(parent=self, id=wx.ID_ANY,
-                                     label=_("Create custom PROJ.4 parameters "
-                                             "string for coordinate system"))
+                                     label=_("Specify projection and datum terms using custom "
+                                             "PROJ.4 parameters"))
         self.radio6 = wx.RadioButton(parent=self, id=wx.ID_ANY,
-                                     label=_("Use arbitrary non-earth "
-                                             "coordinate system (XY)"))
+                                     label=_("Create an arbitrary non-earth coordinate system (XY)"))
         # layout
         self.sizer.AddGrowableCol(1)
         self.sizer.SetVGap(10)
@@ -424,7 +423,9 @@
         
         if self.proj in self.parent.projections.keys():
             if self.proj == 'stp':
-                wx.MessageBox('State Plan Projection must be entered as an EPSG code or a custom PROJ4 string', 
+                wx.MessageBox('Currently State Plane projections must be selected using the '
+                              'text-based setup (g.setproj), or entered by EPSG code or '
+                              'custom PROJ.4 terms.',
                               'Warning', wx.ICON_WARNING)
                 self.proj = ''
                 self.tproj.SetValue(self.proj)
@@ -956,7 +957,7 @@
         event.Skip()
 
     def OnDText(self, event):
-        self.datum = event.GetString().lower()
+        self.datum = event.GetString()
 
         nextButton = wx.FindWindowById(wx.ID_FORWARD)
         if len(self.datum) == 0 or self.datum not in self.parent.datums:
@@ -2058,7 +2059,6 @@
         #
         # creating PROJ.4 string
         #
-
         proj4string = '%s %s' % (proj, proj4params)
                             
         # set ellipsoid parameters
@@ -2078,6 +2078,7 @@
 
         proj4string = '%s +no_defs' % proj4string
         
+        wx.MessageBox(proj4string, 'final proj4 string')
         return proj4string
         
     def Proj4Create(self, proj4string):
@@ -2732,7 +2733,7 @@
         #
         self.translist = TransList(panel, id=-1, size=(width, height), style=wx.SUNKEN_BORDER)
         self.translist.SetItemCount(tlistlen)
-        self.translist.SetSelection(1)
+        self.translist.SetSelection(2)
         self.translist.SetFocus()
         
         self.Bind(wx.EVT_LISTBOX, self.ClickTrans, self.translist)