[GRASS-SVN] r63221 - in grass/trunk: gui/scripts raster/r.in.bin raster/r.in.png raster3d/r3.in.bin scripts/db.in.ogr scripts/r.in.wms scripts/r.unpack scripts/v.unpack

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-28 01:01:38 -0800 (Fri, 28 Nov 2014)
New Revision: 63221

Modified:
   grass/trunk/gui/scripts/d.wms.py
   grass/trunk/raster/r.in.bin/main.c
   grass/trunk/raster/r.in.png/main.c
   grass/trunk/raster3d/r3.in.bin/main.c
   grass/trunk/scripts/db.in.ogr/db.in.ogr.py
   grass/trunk/scripts/r.in.wms/r.in.wms.py
   grass/trunk/scripts/r.unpack/r.unpack.py
   grass/trunk/scripts/v.unpack/v.unpack.py
Log:
update modules to use G_OPT_F_BIN_INPUT


Modified: grass/trunk/gui/scripts/d.wms.py
===================================================================
--- grass/trunk/gui/scripts/d.wms.py	2014-11-28 09:01:00 UTC (rev 63220)
+++ grass/trunk/gui/scripts/d.wms.py	2014-11-28 09:01:38 UTC (rev 63221)
@@ -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
 

Modified: grass/trunk/raster/r.in.bin/main.c
===================================================================
--- grass/trunk/raster/r.in.bin/main.c	2014-11-28 09:01:00 UTC (rev 63220)
+++ grass/trunk/raster/r.in.bin/main.c	2014-11-28 09:01:38 UTC (rev 63221)
@@ -284,10 +284,8 @@
     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");

Modified: grass/trunk/raster/r.in.png/main.c
===================================================================
--- grass/trunk/raster/r.in.png/main.c	2014-11-28 09:01:00 UTC (rev 63220)
+++ grass/trunk/raster/r.in.png/main.c	2014-11-28 09:01:38 UTC (rev 63221)
@@ -521,8 +521,7 @@
     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);
 

Modified: grass/trunk/raster3d/r3.in.bin/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.bin/main.c	2014-11-28 09:01:00 UTC (rev 63220)
+++ grass/trunk/raster3d/r3.in.bin/main.c	2014-11-28 09:01:38 UTC (rev 63221)
@@ -254,9 +254,8 @@
 	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);
 

Modified: grass/trunk/scripts/db.in.ogr/db.in.ogr.py
===================================================================
--- grass/trunk/scripts/db.in.ogr/db.in.ogr.py	2014-11-28 09:01:00 UTC (rev 63220)
+++ grass/trunk/scripts/db.in.ogr/db.in.ogr.py	2014-11-28 09:01:38 UTC (rev 63221)
@@ -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

Modified: grass/trunk/scripts/r.in.wms/r.in.wms.py
===================================================================
--- grass/trunk/scripts/r.in.wms/r.in.wms.py	2014-11-28 09:01:00 UTC (rev 63220)
+++ grass/trunk/scripts/r.in.wms/r.in.wms.py	2014-11-28 09:01:38 UTC (rev 63221)
@@ -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
 

Modified: grass/trunk/scripts/r.unpack/r.unpack.py
===================================================================
--- grass/trunk/scripts/r.unpack/r.unpack.py	2014-11-28 09:01:00 UTC (rev 63220)
+++ grass/trunk/scripts/r.unpack/r.unpack.py	2014-11-28 09:01:38 UTC (rev 63221)
@@ -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

Modified: grass/trunk/scripts/v.unpack/v.unpack.py
===================================================================
--- grass/trunk/scripts/v.unpack/v.unpack.py	2014-11-28 09:01:00 UTC (rev 63220)
+++ grass/trunk/scripts/v.unpack/v.unpack.py	2014-11-28 09:01:38 UTC (rev 63221)
@@ -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