[GRASS-SVN] r57033 - in grass/trunk: gui/wxpython/core scripts/m.proj scripts/r.in.wms

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-07-06 21:18:00 -0700 (Sat, 06 Jul 2013)
New Revision: 57033

Modified:
   grass/trunk/gui/wxpython/core/utils.py
   grass/trunk/scripts/m.proj/m.proj.py
   grass/trunk/scripts/r.in.wms/wms_base.py
Log:
back to orig option name; refers to direction of travel, not entity being passed

Modified: grass/trunk/gui/wxpython/core/utils.py
===================================================================
--- grass/trunk/gui/wxpython/core/utils.py	2013-07-07 04:13:36 UTC (rev 57032)
+++ grass/trunk/gui/wxpython/core/utils.py	2013-07-07 04:18:00 UTC (rev 57033)
@@ -577,8 +577,8 @@
     coors = RunCommand('m.proj',
                        flags = flags,
                        input = '-',
-                       proj_input = projIn,
-                       proj_output = projOut,
+                       proj_in = projIn,
+                       proj_out = projOut,
                        sep = ';',
                        stdin = '%f;%f' % (coord[0], coord[1]),
                        read = True)

Modified: grass/trunk/scripts/m.proj/m.proj.py
===================================================================
--- grass/trunk/scripts/m.proj/m.proj.py	2013-07-07 04:13:36 UTC (rev 57032)
+++ grass/trunk/scripts/m.proj/m.proj.py	2013-07-07 04:18:00 UTC (rev 57033)
@@ -46,14 +46,14 @@
 #% guisection: Files & format
 #%end
 #%option
-#% key: proj_input
+#% key: proj_in
 #% type: string
 #% description: Input projection parameters (PROJ.4 style)
 #% required : no
 #% guisection: Projections
 #%end
 #%option
-#% key: proj_output
+#% key: proj_out
 #% type: string
 #% description: Output projection parameters (PROJ.4 style)
 #% required : no
@@ -113,8 +113,8 @@
     input = options['input']
     output = options['output']
     fs = options['separator']
-    proj_in = options['proj_input']
-    proj_out = options['proj_output']
+    proj_in = options['proj_in']
+    proj_out = options['proj_out']
     ll_in = flags['i']
     ll_out = flags['o']
     decimal = flags['d']

Modified: grass/trunk/scripts/r.in.wms/wms_base.py
===================================================================
--- grass/trunk/scripts/r.in.wms/wms_base.py	2013-07-07 04:13:36 UTC (rev 57032)
+++ grass/trunk/scripts/r.in.wms/wms_base.py	2013-07-07 04:18:00 UTC (rev 57033)
@@ -301,8 +301,8 @@
                 temp_region_opened.close()            
 
             points = grass.read_command('m.proj', flags = 'd',
-                                        proj_output = self.proj_srs,
-                                        proj_input = self.proj_location,
+                                        proj_out = self.proj_srs,
+                                        proj_in = self.proj_location,
                                         input = temp_region,
                                         quiet = True) # TODO: stdin
             grass.try_remove(temp_region)