[GRASS-SVN] r63223 - in grass/branches/releasebranch_7_0: . 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
svn_grass at osgeo.org
Fri Nov 28 01:05:14 PST 2014
Author: martinl
Date: 2014-11-28 01:05:13 -0800 (Fri, 28 Nov 2014)
New Revision: 63223
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/gui/scripts/d.wms.py
grass/branches/releasebranch_7_0/raster/r.in.bin/main.c
grass/branches/releasebranch_7_0/raster/r.in.png/main.c
grass/branches/releasebranch_7_0/raster3d/r3.in.bin/main.c
grass/branches/releasebranch_7_0/scripts/db.in.ogr/db.in.ogr.py
grass/branches/releasebranch_7_0/scripts/r.in.wms/r.in.wms.py
grass/branches/releasebranch_7_0/scripts/r.unpack/r.unpack.py
grass/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py
Log:
update modules to use G_OPT_F_BIN_INPUT
(merge r63221 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,
63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,
63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221
Modified: grass/branches/releasebranch_7_0/gui/scripts/d.wms.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/scripts/d.wms.py 2014-11-28 09:04:17 UTC (rev 63222)
+++ grass/branches/releasebranch_7_0/gui/scripts/d.wms.py 2014-11-28 09:05:13 UTC (rev 63223)
@@ -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/branches/releasebranch_7_0/raster/r.in.bin/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.bin/main.c 2014-11-28 09:04:17 UTC (rev 63222)
+++ grass/branches/releasebranch_7_0/raster/r.in.bin/main.c 2014-11-28 09:05:13 UTC (rev 63223)
@@ -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/branches/releasebranch_7_0/raster/r.in.png/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.png/main.c 2014-11-28 09:04:17 UTC (rev 63222)
+++ grass/branches/releasebranch_7_0/raster/r.in.png/main.c 2014-11-28 09:05:13 UTC (rev 63223)
@@ -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/branches/releasebranch_7_0/raster3d/r3.in.bin/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.in.bin/main.c 2014-11-28 09:04:17 UTC (rev 63222)
+++ grass/branches/releasebranch_7_0/raster3d/r3.in.bin/main.c 2014-11-28 09:05:13 UTC (rev 63223)
@@ -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/branches/releasebranch_7_0/scripts/db.in.ogr/db.in.ogr.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/db.in.ogr/db.in.ogr.py 2014-11-28 09:04:17 UTC (rev 63222)
+++ grass/branches/releasebranch_7_0/scripts/db.in.ogr/db.in.ogr.py 2014-11-28 09:05:13 UTC (rev 63223)
@@ -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/branches/releasebranch_7_0/scripts/r.in.wms/r.in.wms.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.in.wms/r.in.wms.py 2014-11-28 09:04:17 UTC (rev 63222)
+++ grass/branches/releasebranch_7_0/scripts/r.in.wms/r.in.wms.py 2014-11-28 09:05:13 UTC (rev 63223)
@@ -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/branches/releasebranch_7_0/scripts/r.unpack/r.unpack.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.unpack/r.unpack.py 2014-11-28 09:04:17 UTC (rev 63222)
+++ grass/branches/releasebranch_7_0/scripts/r.unpack/r.unpack.py 2014-11-28 09:05:13 UTC (rev 63223)
@@ -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/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py 2014-11-28 09:04:17 UTC (rev 63222)
+++ grass/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py 2014-11-28 09:05:13 UTC (rev 63223)
@@ -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
More information about the grass-commit
mailing list