[GRASS-SVN] r69038 - grass/trunk/imagery/i.vi

[svn_grass at osgeo.org]

Author: neteler
Date: 2016-07-27 15:26:13 -0700 (Wed, 27 Jul 2016)
New Revision: 69038

Modified:
   grass/trunk/imagery/i.vi/main.c
Log:
i.vi: fixed msavi/msavi2 confusion in messages

Modified: grass/trunk/imagery/i.vi/main.c
===================================================================
--- grass/trunk/imagery/i.vi/main.c	2016-07-27 18:05:07 UTC (rev 69037)
+++ grass/trunk/imagery/i.vi/main.c	2016-07-27 22:26:13 UTC (rev 69038)
@@ -177,22 +177,22 @@
     opt.sl_slope->key = "soil_line_slope";
     opt.sl_slope->type = TYPE_DOUBLE;
     opt.sl_slope->required = NO;
-    opt.sl_slope->description = _("Value of the slope of the soil line (MSAVI2 only)");
-    opt.sl_slope->guisection = _("MSAVI2 settings");
+    opt.sl_slope->description = _("Value of the slope of the soil line (MSAVI only)");
+    opt.sl_slope->guisection = _("MSAVI settings");
 
     opt.sl_int = G_define_option();
     opt.sl_int->key = "soil_line_intercept";
     opt.sl_int->type = TYPE_DOUBLE;
     opt.sl_int->required = NO;
-    opt.sl_int->description = _("Value of the intercept of the soil line (MSAVI2 only)");
-    opt.sl_int->guisection = _("MSAVI2 settings");
+    opt.sl_int->description = _("Value of the intercept of the soil line (MSAVI only)");
+    opt.sl_int->guisection = _("MSAVI settings");
 
     opt.sl_red = G_define_option();
     opt.sl_red->key = "soil_noise_reduction";
     opt.sl_red->type = TYPE_DOUBLE;
     opt.sl_red->required = NO;
-    opt.sl_red->description = _("Value of the factor of reduction of soil noise (MSAVI2 only)");
-    opt.sl_red->guisection = _("MSAVI2 settings");
+    opt.sl_red->description = _("Value of the factor of reduction of soil noise (MSAVI only)");
+    opt.sl_red->guisection = _("MSAVI settings");
 
     opt.bits = G_define_option();
     opt.bits->key = "storage_bit";
@@ -245,14 +245,14 @@
     if (!strcasecmp(viflag, "savi") && (!(opt.red->answer) || !(opt.nir->answer)) )
 	G_fatal_error(_("savi index requires red and nir maps"));
 
-    if (!strcasecmp(viflag, "msavi") && (!(opt.red->answer) || !(opt.nir->answer)) )
-	G_fatal_error(_("msavi index requires red and nir maps"));
-
-    if (!strcasecmp(viflag, "msavi2") && (!(opt.red->answer) || !(opt.nir->answer) || 
+    if (!strcasecmp(viflag, "msavi") && (!(opt.red->answer) || !(opt.nir->answer) || 
                                           !(opt.sl_slope->answer) || !(opt.sl_int->answer) || 
                                           !(opt.sl_red->answer)) )
-	G_fatal_error(_("msavi2 index requires red and nir maps, and 3 parameters related to soil line"));
+	G_fatal_error(_("msavi index requires red and nir maps, and 3 parameters related to soil line"));
 
+    if (!strcasecmp(viflag, "msavi2") && (!(opt.red->answer) || !(opt.nir->answer)) )
+	G_fatal_error(_("msavi2 index requires red and nir maps"));
+
     if (!strcasecmp(viflag, "gemi") && (!(opt.red->answer) || !(opt.nir->answer)) )
 	G_fatal_error(_("gemi index requires red and nir maps"));