[GRASS-SVN] r63229 - in grass/branches/releasebranch_7_0: . scripts/d.correlate scripts/d.out.file scripts/d.rast.leg scripts/d.redraw scripts/d.shadedmap scripts/d.to.rast scripts/d.vect.thematic scripts/d.what.rast scripts/d.what.vect
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Nov 28 01:44:05 PST 2014
Author: neteler
Date: 2014-11-28 01:44:05 -0800 (Fri, 28 Nov 2014)
New Revision: 63229
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/scripts/d.correlate/d.correlate.py
grass/branches/releasebranch_7_0/scripts/d.out.file/d.out.file.py
grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.py
grass/branches/releasebranch_7_0/scripts/d.redraw/d.redraw.py
grass/branches/releasebranch_7_0/scripts/d.shadedmap/d.shadedmap.py
grass/branches/releasebranch_7_0/scripts/d.to.rast/d.to.rast.py
grass/branches/releasebranch_7_0/scripts/d.vect.thematic/d.vect.thematic.py
grass/branches/releasebranch_7_0/scripts/d.what.rast/d.what.rast.py
grass/branches/releasebranch_7_0/scripts/d.what.vect/d.what.vect.py
Log:
d.* scripts: check if graphics device is open
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-63221,63224
+ /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,63224,63227
Modified: grass/branches/releasebranch_7_0/scripts/d.correlate/d.correlate.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.correlate/d.correlate.py 2014-11-28 09:43:48 UTC (rev 63228)
+++ grass/branches/releasebranch_7_0/scripts/d.correlate/d.correlate.py 2014-11-28 09:44:05 UTC (rev 63229)
@@ -32,6 +32,11 @@
from grass.script import core as grass
def main():
+ env = grass.gisenv()
+ mon = env.get('MONITOR', None)
+ if not mon:
+ grass.fatal(_("No graphics device selected. Use d.mon to select graphics device."))
+
layers = options['map'].split(',')
if len(layers) < 2:
Modified: grass/branches/releasebranch_7_0/scripts/d.out.file/d.out.file.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.out.file/d.out.file.py 2014-11-28 09:43:48 UTC (rev 63228)
+++ grass/branches/releasebranch_7_0/scripts/d.out.file/d.out.file.py 2014-11-28 09:44:05 UTC (rev 63229)
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+
############################################################################
#
# MODULE: d.out.file
Modified: grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.py 2014-11-28 09:43:48 UTC (rev 63228)
+++ grass/branches/releasebranch_7_0/scripts/d.rast.leg/d.rast.leg.py 2014-11-28 09:44:05 UTC (rev 63229)
@@ -1,45 +1,38 @@
#!/usr/bin/env python
-##############################################################################
-# d.rast.leg (GRASS Shell Script)
+############################################################################
#
-# displays a raster map and its legend on a graphics window.
+# MODULE: d.rast.leg
+# AUTHOR(S):
+# Jianping Xu and Scott Madry, Rutgers University. October 19, 1993
+# Markus Neteler 8/2002: added simple d.legend logic
+# Markus Neteler 10/2003: added g.parser
+# Michael Barton 12/2004: remove reference to (null)
+# Glynn Clements 10/2008: converted to Python
#
-# Usage: d.rast.leg
-# or d.rast.leg help
-# or d.rast.leg rast_map [num_of_lines]
+# PURPOSE: Displays a raster map and its legend on a graphics window.
#
-# Description: d.rast.leg clears the entire screen, divides it into a main
-# (left) and a minor (right) frames, and then display a raster
-# map in the main frame and the map legend in the minor frame.
-# The user can run the program interactively or
-# non-interactively.
+# Description: d.rast.leg clears the entire screen, divides it into a main
+# (left) and a minor (right) frames, and then display a raster
+# map in the main frame and the map legend in the minor frame.
+# The user can run the program interactively or
+# non-interactively.
#
-# Parameters: rast_map A raster map to be displayed.
+# See also: d.rast, d.legend.
#
-# num_of_lines Number of lines to appear in the legend.
-# If this number is not given, the legend frame
-# will display as many lines as number of
-# categories in the map, otherwise, it will
-# display the first num_of_lines minus 1
-# categories with the rest being truncated.
-#
-# Note: The user may adjust the num_of_lines parameter or the size of
-# graphics window to get an appropriate result.
+# COPYRIGHT: (C) 1993-2014 by the GRASS Development Team
#
-# See also: d.rast, d.legend.
+# This program is free software under the GNU General Public
+# License (>=v2). Read the file COPYING that comes with GRASS
+# for details.
#
-# Jianping Xu and Scott Madry, Rutgers University. October 19, 1993
-# Markus Neteler 8/2002: added simple d.legend logic
-# Markus Neteler 10/2003: added g.parser
-# Michael Barton 12/2004: remove reference to (null)
-# Glynn Clements 10/2008: converted to Python
-##############################################################################
+#############################################################################
#%module
#% description: Displays a raster map and its legend on a graphics window
#% keywords: display
#% keywords: cartography
+#% keywords: legend
#%end
#%flag
#% key: f
@@ -88,6 +81,11 @@
os.environ['GRASS_RENDER_FRAME'] = s
def main():
+ env = grass.gisenv()
+ mon = env.get('MONITOR', None)
+ if not mon:
+ grass.fatal(_("No graphics device selected. Use d.mon to select graphics device."))
+
map = options['map']
nlines = options['lines']
rast = options['raster']
Modified: grass/branches/releasebranch_7_0/scripts/d.redraw/d.redraw.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.redraw/d.redraw.py 2014-11-28 09:43:48 UTC (rev 63228)
+++ grass/branches/releasebranch_7_0/scripts/d.redraw/d.redraw.py 2014-11-28 09:44:05 UTC (rev 63229)
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+
############################################################################
#
# MODULE: d.redraw
@@ -25,7 +26,7 @@
from grass.script import core as grass
def split(s):
- """!Platform spefic shlex.split"""
+ """!Platform specific shlex.split"""
if sys.version_info >= (2, 6):
return shlex.split(s, posix = (sys.platform != "win32"))
elif sys.platform == "win32":
@@ -37,7 +38,7 @@
env = grass.gisenv()
mon = env.get('MONITOR', None)
if not mon:
- grass.fatal(_("No monitor selected. Run `d.mon` to select monitor."))
+ grass.fatal(_("No graphics device selected. Use d.mon to select graphics device."))
monCmd = env.get('MONITOR_%s_CMDFILE' % mon.upper())
if not monCmd:
Modified: grass/branches/releasebranch_7_0/scripts/d.shadedmap/d.shadedmap.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.shadedmap/d.shadedmap.py 2014-11-28 09:43:48 UTC (rev 63228)
+++ grass/branches/releasebranch_7_0/scripts/d.shadedmap/d.shadedmap.py 2014-11-28 09:44:05 UTC (rev 63229)
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-#
+
############################################################################
#
# MODULE: d.shadedmap
@@ -47,6 +47,11 @@
def main():
+ env = gcore.gisenv()
+ mon = env.get('MONITOR', None)
+ if not mon:
+ gcore.fatal(_("No graphics device selected. Use d.mon to select graphics device."))
+
drape_map = options['drapemap']
relief_map = options['reliefmap']
brighten = options['brighten']
Modified: grass/branches/releasebranch_7_0/scripts/d.to.rast/d.to.rast.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.to.rast/d.to.rast.py 2014-11-28 09:43:48 UTC (rev 63228)
+++ grass/branches/releasebranch_7_0/scripts/d.to.rast/d.to.rast.py 2014-11-28 09:44:05 UTC (rev 63229)
@@ -1,9 +1,10 @@
#!/usr/bin/env python
+
############################################################################
#
-# MODULE: d.to.rast
+# MODULE: d.to.rast
# AUTHOR(S): Anna Petrasova <kratochanna gmail.com>
-# PURPOSE: Script for exporting content of monitor to raster map
+# PURPOSE: Script for exporting content of monitor to raster map
# COPYRIGHT: (C) 2014 by the GRASS Development Team
#
# This program is free software under the GNU General
@@ -26,6 +27,11 @@
def main():
+ env = gcore.gisenv()
+ mon = env.get('MONITOR', None)
+ if not mon:
+ gcore.fatal(_("No graphics device selected. Use d.mon to select graphics device."))
+
options, flags = gcore.parser()
gisenv = gcore.gisenv()
if 'MONITOR' in gisenv:
Modified: grass/branches/releasebranch_7_0/scripts/d.vect.thematic/d.vect.thematic.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.vect.thematic/d.vect.thematic.py 2014-11-28 09:43:48 UTC (rev 63228)
+++ grass/branches/releasebranch_7_0/scripts/d.vect.thematic/d.vect.thematic.py 2014-11-28 09:44:05 UTC (rev 63229)
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-#
+
############################################################################
#
# MODULE: d.vect.thematic
@@ -231,6 +231,11 @@
def main():
global tmp_graph, tmp_group, tmp_psmap, tmp_psleg, tmp_gisleg
+ env = grass.gisenv()
+ mon = env.get('MONITOR', None)
+ if not mon:
+ grass.fatal(_("No graphics device selected. Use d.mon to select graphics device."))
+
breakpoints = options['breakpoints']
colorscheme = options['colorscheme']
column = options['column']
Modified: grass/branches/releasebranch_7_0/scripts/d.what.rast/d.what.rast.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.what.rast/d.what.rast.py 2014-11-28 09:43:48 UTC (rev 63228)
+++ grass/branches/releasebranch_7_0/scripts/d.what.rast/d.what.rast.py 2014-11-28 09:44:05 UTC (rev 63229)
@@ -1,7 +1,8 @@
#!/usr/bin/env python
+
############################################################################
#
-# MODULE: d.what.rast
+# MODULE: d.what.rast
# AUTHOR(S): Anna Petrasova <kratochanna gmail.com>
# PURPOSE: Script for querying raster maps in d.mon
# COPYRIGHT: (C) 2014 by the GRASS Development Team
@@ -26,6 +27,11 @@
def main():
+ env = gcore.gisenv()
+ mon = env.get('MONITOR', None)
+ if not mon:
+ gcore.fatal(_("No graphics device selected. Use d.mon to select graphics device."))
+
options, flags = gcore.parser()
gisenv = gcore.gisenv()
if 'MONITOR' in gisenv:
Modified: grass/branches/releasebranch_7_0/scripts/d.what.vect/d.what.vect.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.what.vect/d.what.vect.py 2014-11-28 09:43:48 UTC (rev 63228)
+++ grass/branches/releasebranch_7_0/scripts/d.what.vect/d.what.vect.py 2014-11-28 09:44:05 UTC (rev 63229)
@@ -1,9 +1,10 @@
#!/usr/bin/env python
+
############################################################################
#
-# MODULE: d.what.vect
+# MODULE: d.what.vect
# AUTHOR(S): Anna Petrasova <kratochanna gmail.com>
-# PURPOSE: Script for querying vector maps in d.mon
+# PURPOSE: Script for querying vector maps in d.mon
# COPYRIGHT: (C) 2014 by the GRASS Development Team
#
# This program is free software under the GNU General
More information about the grass-commit
mailing list