[GRASS-SVN] r44042 - grass/trunk/imagery/i.landsat.acca

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-10-25 15:14:38 -0700 (Mon, 25 Oct 2010)
New Revision: 44042

Modified:
   grass/trunk/imagery/i.landsat.acca/main.c
   grass/trunk/imagery/i.landsat.acca/tools.c
Log:
i.landsat.acca: more guisections
		fix typo when including to trunk


Modified: grass/trunk/imagery/i.landsat.acca/main.c
===================================================================
--- grass/trunk/imagery/i.landsat.acca/main.c	2010-10-25 21:58:52 UTC (rev 44041)
+++ grass/trunk/imagery/i.landsat.acca/main.c	2010-10-25 22:14:38 UTC (rev 44042)
@@ -6,8 +6,9 @@
  * AUTHOR(S):    E. Jorge Tizado - ej.tizado at unileon.es
  *
  * PURPOSE:      Landsat TM/ETM+ Automatic Cloud Cover Assessment
+ *               Adopted for GRASS 7 by Martin Landa <landa.martin gmail.com>
  *
- * COPYRIGHT:    (C) 2008 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2008, 2010 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
@@ -66,7 +67,8 @@
        }
      */
     if ((map_type = Rast_get_map_type(raster_fd)) != DCELL_TYPE) {
-	G_fatal_error(_("Input raster map <%s> is not floating point (process DN using i.landsat.toar to radiance first)"), raster_name);
+	G_fatal_error(_("Input raster map <%s> is not floating point "
+			"(process DN using i.landsat.toar to radiance first)"), raster_name);
     }
 
     return raster_fd;
@@ -134,7 +136,8 @@
     hist->description =
 	_("Number of classes in the cloud temperature histogram");
     hist->answer = "100";
-
+    hist->guisection = _("Cloud settings");
+    
     sat5 = G_define_flag();
     sat5->key = '5';
     sat5->label = _("Data is Landsat-5 TM");
@@ -148,15 +151,18 @@
     csig = G_define_flag();
     csig->key = 'x';
     csig->description = _("Always use cloud signature (step 14)");
+    csig->guisection = _("Cloud settings");
 
     pass2 = G_define_flag();
     pass2->key = '2';
     pass2->description =
 	_("Bypass second-pass processing, and merge warm (not ambiguous) and cold clouds");
+    pass2->guisection = _("Cloud settings");
 
     shadow = G_define_flag();
     shadow->key = 's';
     shadow->description = _("Include a category for cloud shadows");
+    shadow->guisection = _("Cloud settings");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/trunk/imagery/i.landsat.acca/tools.c
===================================================================
--- grass/trunk/imagery/i.landsat.acca/tools.c	2010-10-25 21:58:52 UTC (rev 44041)
+++ grass/trunk/imagery/i.landsat.acca/tools.c	2010-10-25 22:14:38 UTC (rev 44042)
@@ -146,8 +146,8 @@
 	/* Read row values */
 	if (row != 0) {
 	    Rast_get_c_row(out->fd, arast, row - 1);
-	    Rast_get_c_row(out->fd, brast, row);
 	}
+	Rast_get_c_row(out->fd, brast, row);
 	if (row != (nrows - 1)) {
 	    Rast_get_c_row(out->fd, crast, row + 1);
 	}