[GRASS-SVN] r33919 - in grass/branches/develbranch_6/imagery/i.ortho.photo: menu photo.2target photo.camera photo.elev photo.target

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Oct 16 10:18:27 EDT 2008


Author: hamish
Date: 2008-10-16 10:18:27 -0400 (Thu, 16 Oct 2008)
New Revision: 33919

Modified:
   grass/branches/develbranch_6/imagery/i.ortho.photo/menu/menu.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/main.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.camera/main.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.elev/main.c
   grass/branches/develbranch_6/imagery/i.ortho.photo/photo.target/main.c
Log:
residual cleanup

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/menu/menu.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/menu/menu.c	2008-10-16 14:17:05 UTC (rev 33918)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/menu/menu.c	2008-10-16 14:18:27 UTC (rev 33919)
@@ -59,25 +59,25 @@
 
     /* get and check the group reference files */
     if (!I_get_group_ref(group.name, &group.group_ref)) {
-	G_warning("Pre-selected group <%s> not found.", group.name);
+	G_warning(_("Pre-selected group <%s> not found"), group.name);
 	/* clean the wrong name in GROUPFILE */
 	I_put_group("");
 
 	/* ask for new group name */
-	if (!I_ask_group_old
-	    ("Enter imagery group for ortho-rectification", group.name))
-	    exit(0);
+	if (!I_ask_group_old(
+	    _("Enter imagery group for ortho-rectification"), group.name))
+	    exit(EXIT_SUCCESS);
 	I_get_group_ref(group.name, &group.group_ref);
     }
 
     if (group.group_ref.nfiles <= 0)
-	G_fatal_error("Group [%s] contains no files\n", group.name);
+	G_fatal_error(_("Group [%s] contains no files"), group.name);
 
     I_put_group(group.name);
 
     while (1) {
 	if (!I_get_group(group.name)) {
-	    exit(0);
+	    exit(EXIT_SUCCESS);
 	}
 
 	/* print the screen full of options */
@@ -109,7 +109,7 @@
 	if (!G_gets(buf))
 	    continue;
 	if (*buf == 0)		/* exit */
-	    exit(0);
+	    exit(EXIT_SUCCESS);
 
 	/* run the program choosen */
 	G_strip(buf);

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/main.c	2008-10-16 14:17:05 UTC (rev 33918)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.2target/main.c	2008-10-16 14:18:27 UTC (rev 33919)
@@ -44,6 +44,9 @@
     int ok;
     int nfiles;
 
+    /* must run in a term window */
+    G_putenv("GRASS_UI_TERM", "1");
+
     G_gisinit(argv[0]);
 
     module = G_define_module();
@@ -61,13 +64,13 @@
     map_opt = G_define_standard_option(G_OPT_R_MAP);
     map_opt->required = NO;
     map_opt->description = _("Name of image to be rectified which will "
-			     " be initially drawn on screen.");
+			     "be initially drawn on screen");
 
     target_map_opt = G_define_standard_option(G_OPT_R_MAP);
     target_map_opt->key = "target";
     target_map_opt->required = NO;
     target_map_opt->description = _("Name of a map from target mapset which "
-				    " will be initially drawn on screen.");
+				    "will be initially drawn on screen");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.camera/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.camera/main.c	2008-10-16 14:17:05 UTC (rev 33918)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.camera/main.c	2008-10-16 14:18:27 UTC (rev 33919)
@@ -7,9 +7,11 @@
  *               Roberto Flor <flor itc.it>, 
  *               Bernhard Reiter <bernhard intevation.de>, 
  *               Glynn Clements <glynn gclements.plus.com>
- * PURPOSE:      creates or modifies entries in a camera reference file
- * COPYRIGHT:    (C) 1999-2007 by the GRASS Development Team
+ *               Hamish Bowman
  *
+ * PURPOSE:      Creates or modifies entries in a camera reference file
+ * COPYRIGHT:    (C) 1999-2008 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.

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.elev/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.elev/main.c	2008-10-16 14:17:05 UTC (rev 33918)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.elev/main.c	2008-10-16 14:18:27 UTC (rev 33919)
@@ -7,9 +7,11 @@
  *               Roberto Flor <flor itc.it>, 
  *               Bernhard Reiter <bernhard intevation.de>, 
  *               Glynn Clements <glynn gclements.plus.com>
- * PURPOSE:      select the elevation model
- * COPYRIGHT:    (C) 1999-2007 by the GRASS Development Team
+ *               Hamish Bowman
  *
+ * PURPOSE:      Select the elevation model
+ * COPYRIGHT:    (C) 1999-2008 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.

Modified: grass/branches/develbranch_6/imagery/i.ortho.photo/photo.target/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.ortho.photo/photo.target/main.c	2008-10-16 14:17:05 UTC (rev 33918)
+++ grass/branches/develbranch_6/imagery/i.ortho.photo/photo.target/main.c	2008-10-16 14:18:27 UTC (rev 33919)
@@ -8,7 +8,8 @@
  *               Bernhard Reiter <bernhard intevation.de>, 
  *               Glynn Clements <glynn gclements.plus.com>
  *               Hamish Bowman
- * PURPOSE:      select target location and mapset
+ *
+ * PURPOSE:      Select target location and mapset
  * COPYRIGHT:    (C) 1999-2008 by the GRASS Development Team
  *
  *               This program is free software under the GNU General Public



More information about the grass-commit mailing list