[GRASS-SVN] r62984 - grass/branches/releasebranch_7_0/imagery/i.vi

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-26 02:07:04 -0800 (Wed, 26 Nov 2014)
New Revision: 62984

Modified:
   grass/branches/releasebranch_7_0/imagery/i.vi/main.c
Log:
i.vi: use standardized options (#2409) - (merge r62983 from trunk)

Modified: grass/branches/releasebranch_7_0/imagery/i.vi/main.c
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.vi/main.c	2014-11-26 10:03:49 UTC (rev 62983)
+++ grass/branches/releasebranch_7_0/imagery/i.vi/main.c	2014-11-26 10:07:04 UTC (rev 62984)
@@ -101,6 +101,8 @@
 	_("Name of input red channel surface reflectance map");
     opt.red->description = _("Range: [0.0;1.0]");
 
+    opt.output = G_define_standard_option(G_OPT_R_OUTPUT);
+
     opt.viname = G_define_option();
     opt.viname->key = "viname";
     opt.viname->type = TYPE_STRING;
@@ -131,8 +133,6 @@
     opt.viname->answer = "ndvi";
     opt.viname->key_desc = _("type");
 
-    opt.output = G_define_standard_option(G_OPT_R_OUTPUT);
-
     opt.nir = G_define_standard_option(G_OPT_R_INPUT);
     opt.nir->key = "nir";
     opt.nir->required = NO;
@@ -158,7 +158,7 @@
     opt.blue->guisection = _("Optional inputs");
 
     opt.chan5 = G_define_standard_option(G_OPT_R_INPUT);
-    opt.chan5->key = "chan5";
+    opt.chan5->key = "band5";
     opt.chan5->required = NO;
     opt.chan5->label =
 	_("Name of input 5th channel surface reflectance map");
@@ -166,7 +166,7 @@
     opt.chan5->guisection = _("Optional inputs");
 
     opt.chan7 = G_define_standard_option(G_OPT_R_INPUT);
-    opt.chan7->key = "chan7";
+    opt.chan7->key = "band7";
     opt.chan7->required = NO;
     opt.chan7->label =
 	_("Name of input 7th channel surface reflectance map");