瀏覽代碼

r.profile: use standardized options (https://trac.osgeo.org/grass/ticket/2409) - (merge https://trac.osgeo.org/grass/changeset/63044 from trunk)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63046 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 年之前
父節點
當前提交
27a7caf95d
共有 1 個文件被更改,包括 5 次插入10 次删除
  1. 5 10
      raster/r.report/parse.c

+ 5 - 10
raster/r.report/parse.c

@@ -66,17 +66,12 @@ int parse_command_line(int argc, char *argv[])
     parms.outfile->description =
 	_("If no output file given report is printed to standard output");
 
-    parms.nv = G_define_option();
-    parms.nv->key = "null";
-    parms.nv->type = TYPE_STRING;
-    parms.nv->required = NO;
-    parms.nv->multiple = NO;
+    parms.nv = G_define_standard_option(G_OPT_M_NULL_VALUE);
     parms.nv->answer = "*";
-    parms.nv->description = _("String representing no data cell value");
     parms.nv->guisection = _("Formatting");
 
     parms.pl = G_define_option();
-    parms.pl->key = "pl";
+    parms.pl->key = "page_length";
     parms.pl->type = TYPE_INTEGER;
     parms.pl->required = NO;
     sprintf(pl_desc, _("Page length (default: %d lines)"),
@@ -85,7 +80,7 @@ int parse_command_line(int argc, char *argv[])
     parms.pl->guisection = _("Formatting");
 
     parms.pw = G_define_option();
-    parms.pw->key = "pw";
+    parms.pw->key = "page_width";
     parms.pw->type = TYPE_INTEGER;
     parms.pw->required = NO;
     sprintf(pw_desc, _("Page width (default: %d characters)"),
@@ -138,12 +133,12 @@ int parse_command_line(int argc, char *argv[])
     flags.n->guisection = _("No data");
 
     flags.N = G_define_flag();
-    flags.N->key = 'N';
+    flags.N->key = 'a';
     flags.N->description = _("Do not report cells where all maps have no data");
     flags.N->guisection = _("No data");
 
     flags.C = G_define_flag();
-    flags.C->key = 'C';
+    flags.C->key = 'c';
     flags.C->description = _("Report for cats floating-point ranges (floating-point maps only)");
     flags.C->guisection = _("Floating point");