浏览代码

update modules to use G_OPT_F_BIN_INPUT
(merge https://trac.osgeo.org/grass/changeset/63221 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63223 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 10 年之前
父节点
当前提交
aa38c40c6e

+ 1 - 2
gui/scripts/d.wms.py

@@ -143,10 +143,9 @@
 #% guisection: Map style
 #%end
 
-#%option G_OPT_F_INPUT
+#%option G_OPT_F_BIN_INPUT
 #% key: capfile
 #% required: no
-#% gisprompt: old,bin,file
 #% description: Capabilities file to parse (input). It is relevant for WMTS_GRASS and OnEarth_GRASS drivers
 #%end
 

+ 2 - 4
raster/r.in.bin/main.c

@@ -284,10 +284,8 @@ int main(int argc, char *argv[])
     flag.gmt_hd->description = _("Get region info from GMT style header");
     flag.gmt_hd->guisection = _("Bounds");
 
-    parm.input = G_define_standard_option(G_OPT_F_INPUT);
-    parm.input->required = YES;
-    parm.input->description = _("Binary raster file to be imported");
-    parm.input->gisprompt = "old,bin,file";
+    parm.input = G_define_standard_option(G_OPT_F_BIN_INPUT);
+    parm.input->description = _("Name of binary raster file to be imported");
 
     parm.output = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.output->description = _("Output name or prefix if several bands are imported");

+ 1 - 2
raster/r.in.png/main.c

@@ -521,8 +521,7 @@ int main(int argc, char *argv[])
     G_add_keyword("PNG");
     module->description = _("Imports non-georeferenced PNG format image.");
 
-    inopt = G_define_standard_option(G_OPT_F_INPUT);
-    inopt->gisprompt = "old,bin,file";
+    inopt = G_define_standard_option(G_OPT_F_BIN_INPUT);
     
     outopt = G_define_standard_option(G_OPT_R_OUTPUT);
 

+ 1 - 2
raster3d/r3.in.bin/main.c

@@ -254,9 +254,8 @@ int main(int argc, char *argv[]) {
 	module->description =
 			_("Imports a binary raster file into a GRASS 3D raster map.");
 
-	parm.input = G_define_standard_option(G_OPT_F_INPUT);
+	parm.input = G_define_standard_option(G_OPT_F_BIN_INPUT);
 	parm.input->description = _("Name of binary 3D raster file to be imported");
-	parm.input->gisprompt = "old,bin,file";
 
 	parm.output = G_define_standard_option(G_OPT_R3_OUTPUT);
 

+ 1 - 4
scripts/db.in.ogr/db.in.ogr.py

@@ -20,11 +20,8 @@
 #%  keywords: attribute table
 #%End
 
-#%option G_OPT_F_INPUT
-#% key: input
-#% gisprompt: old,bin,file
+#%option G_OPT_F_BIN_INPUT
 #% description: Table file to be imported or DB connection string
-#% required : yes
 #%end
 
 #%option

+ 1 - 2
scripts/r.in.wms/r.in.wms.py

@@ -143,10 +143,9 @@ This program is free software under the GNU General Public License
 #% guisection: Map style
 #%end
 
-#%option G_OPT_F_INPUT
+#%option G_OPT_F_BIN_INPUT
 #% key: capfile
 #% required: no
-#% gisprompt: old,bin,file
 #% description: Capabilities file to parse (input). It is relevant for WMTS_GRASS and OnEarth_GRASS drivers
 #%end
 

+ 1 - 2
scripts/r.unpack/r.unpack.py

@@ -19,9 +19,8 @@
 #% keywords: import
 #% keywords: copying
 #%end
-#%option G_OPT_F_INPUT
+#%option G_OPT_F_BIN_INPUT
 #% description: Name of input pack file
-#% gisprompt: old,bin,file
 #% key_desc: name.pack
 #%end
 #%option G_OPT_R_OUTPUT

+ 0 - 2
scripts/v.unpack/v.unpack.py

@@ -21,9 +21,7 @@
 #% keywords: copying
 #%end
 #%option G_OPT_F_INPUT
-#% gisprompt: old,bin,file
 #% description: Name of input pack file
-#% required : yes
 #%end
 #%option G_OPT_V_OUTPUT
 #% label: Name for output vector map