Browse Source

Use the standard options

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@59917 15284696-431f-4ddb-bdfa-cd5b030d7da7
Huidae Cho 11 years ago
parent
commit
f1621b700d
2 changed files with 4 additions and 20 deletions
  1. 2 10
      raster/r.rescale.eq/main.c
  2. 2 10
      raster/r.rescale/main.c

+ 2 - 10
raster/r.rescale.eq/main.c

@@ -57,11 +57,7 @@ int main(int argc, char *argv[])
 
     /* Define the different options */
 
-    parm.input = G_define_option();
-    parm.input->key = "input";
-    parm.input->type = TYPE_STRING;
-    parm.input->required = YES;
-    parm.input->gisprompt = "old,cell,raster";
+    parm.input = G_define_standard_option(G_OPT_R_INPUT);
     parm.input->description = _("The name of the raster map to be rescaled");
 
     parm.from = G_define_option();
@@ -72,11 +68,7 @@ int main(int argc, char *argv[])
     parm.from->description =
 	_("The input data range to be rescaled (default: full range of input map)");
 
-    parm.output = G_define_option();
-    parm.output->key = "output";
-    parm.output->type = TYPE_STRING;
-    parm.output->required = YES;
-    parm.output->gisprompt = "new,cell,raster";
+    parm.output = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.output->description = _("The resulting raster map name");
 
     parm.to = G_define_option();

+ 2 - 10
raster/r.rescale/main.c

@@ -52,11 +52,7 @@ int main(int argc, char *argv[])
 
     /* Define the different options */
 
-    parm.input = G_define_option();
-    parm.input->key = "input";
-    parm.input->type = TYPE_STRING;
-    parm.input->required = YES;
-    parm.input->gisprompt = "old,cell,raster";
+    parm.input = G_define_standard_option(G_OPT_R_INPUT);
     parm.input->description = _("The name of the raster map to be rescaled");
 
     parm.from = G_define_option();
@@ -67,11 +63,7 @@ int main(int argc, char *argv[])
     parm.from->description =
 	_("The input data range to be rescaled (default: full range of input map)");
 
-    parm.output = G_define_option();
-    parm.output->key = "output";
-    parm.output->type = TYPE_STRING;
-    parm.output->required = YES;
-    parm.output->gisprompt = "new,cell,raster";
+    parm.output = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.output->description = _("The resulting raster map name");
 
     parm.to = G_define_option();