[GRASS-SVN] r33580 - in grass/trunk: gui/tcltk/gis.m gui/wxpython/gui_modules imagery imagery/i.albedo imagery/i.qc.modis

[svn_grass at osgeo.org]

Author: ychemin
Date: 2008-09-28 05:47:43 -0400 (Sun, 28 Sep 2008)
New Revision: 33580

Modified:
   grass/trunk/gui/tcltk/gis.m/gmmenu.tcl
   grass/trunk/gui/wxpython/gui_modules/menudata.py
   grass/trunk/imagery/Makefile
   grass/trunk/imagery/i.albedo/main.c
   grass/trunk/imagery/i.qc.modis/main.c
Log:
Added i.vi

Modified: grass/trunk/gui/tcltk/gis.m/gmmenu.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/gmmenu.tcl	2008-09-28 00:04:22 UTC (rev 33579)
+++ grass/trunk/gui/tcltk/gis.m/gmmenu.tcl	2008-09-28 09:47:43 UTC (rev 33580)
@@ -549,6 +549,7 @@
 				{separator}
 				{command {[G_msg "Albedo"]} {} "i.albedo: Calculates Albedo from Modis, Aster, Landsat or AVHRR" {} -command {execute i.albedo }}
 				{separator}
+				{command {[G_msg "Vegetation Indices"]} {} "i.vi: Calculates 14 types of Vegetation Indices" {} -command {execute i.vi }}
 	}}
 	{command {[G_msg "Brovey sharpening"]} {} "i.fusion.brovey: Brovey transformation and pan sharpening" {} -command {execute i.fusion.brovey }}
 	{cascad {[G_msg "Classify image"]} {} "" $tmenu {			

Modified: grass/trunk/gui/wxpython/gui_modules/menudata.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menudata.py	2008-09-28 00:04:22 UTC (rev 33579)
+++ grass/trunk/gui/wxpython/gui_modules/menudata.py	2008-09-28 09:47:43 UTC (rev 33580)
@@ -12,7 +12,7 @@
 for details.
 
 @author Michael Barton (Arizona State University)
- at author Yann Chemin
+ at author Yann Chemin <yann.chemin gmail.com>
 @author Martin Landa <landa.martin gmail.com>
 """
 
@@ -1619,12 +1619,19 @@
                                  _("Extract Modis Quality flags as raster values."),
                                  "self.OnMenuCmd",
                                  "i.qc.modis"),
+	                        ("","","", ""),
 
                                 (_("Albedo"),
                                  _("Albedo from Modis, Aster, Landsat, AVHRR."),
                                  "self.OnMenuCmd",
                                  "i.albedo"),
 				)
+
+                                (_("Vegetation Indices"),
+                                 _("14 types of vegetation Indices."),
+                                 "self.OnMenuCmd",
+                                 "i.vi"),
+				)
                          ),
                         ("","","", ""),
 

Modified: grass/trunk/imagery/Makefile
===================================================================
--- grass/trunk/imagery/Makefile	2008-09-28 00:04:22 UTC (rev 33579)
+++ grass/trunk/imagery/Makefile	2008-09-28 09:47:43 UTC (rev 33580)
@@ -5,6 +5,7 @@
 SUBDIRS = \
 	i.albedo \
 	i.atcorr \
+	i.cca \
 	i.cluster \
 	i.find \
 	i.gensig \
@@ -18,7 +19,7 @@
 	i.smap \
 	i.target \
 	i.pca \
-	i.cca
+	i.vi 
 
 FFTWBASED = i.fft i.ifft i.zc
 

Modified: grass/trunk/imagery/i.albedo/main.c
===================================================================
--- grass/trunk/imagery/i.albedo/main.c	2008-09-28 00:04:22 UTC (rev 33579)
+++ grass/trunk/imagery/i.albedo/main.c	2008-09-28 09:47:43 UTC (rev 33580)
@@ -145,7 +145,7 @@
 
     for (; *ptr != NULL; ptr++) {
 	if (nfiles >= MAXFILES)
-	    G_fatal_error(_("too many ETa files. Only %d allowed"), MAXFILES);
+	    G_fatal_error(_("too many input files. Only %d allowed"), MAXFILES);
 	name = *ptr;
 
 	infd[nfiles] = G_open_cell_old(name, "");

Modified: grass/trunk/imagery/i.qc.modis/main.c
===================================================================
--- grass/trunk/imagery/i.qc.modis/main.c	2008-09-28 00:04:22 UTC (rev 33579)
+++ grass/trunk/imagery/i.qc.modis/main.c	2008-09-28 09:47:43 UTC (rev 33580)
@@ -221,7 +221,7 @@
     G_free(outrast);
     G_close_cell(outfd);
 
-    /* Color from -1.0 to +1.0 in grey */ 
+    /* Color from 0 to 10 in grey */ 
     G_init_colors(&colors);
     G_add_color_rule(0, 0, 0, 0, 10, 255, 255, 255, &colors);
     G_short_history(result, "raster", &history);