[GRASS-SVN] r63227 - in grass/trunk/scripts: d.correlate d.out.file d.rast.leg d.redraw d.shadedmap d.to.rast d.vect.thematic d.what.rast d.what.vect
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Nov 28 01:43:14 PST 2014
Author: neteler
Date: 2014-11-28 01:43:14 -0800 (Fri, 28 Nov 2014)
New Revision: 63227
Modified:
grass/trunk/scripts/d.correlate/d.correlate.py
grass/trunk/scripts/d.out.file/d.out.file.py
grass/trunk/scripts/d.rast.leg/d.rast.leg.py
grass/trunk/scripts/d.redraw/d.redraw.py
grass/trunk/scripts/d.shadedmap/d.shadedmap.py
grass/trunk/scripts/d.to.rast/d.to.rast.py
grass/trunk/scripts/d.vect.thematic/d.vect.thematic.py
grass/trunk/scripts/d.what.rast/d.what.rast.py
grass/trunk/scripts/d.what.vect/d.what.vect.py
Log:
d.* scripts: check if graphics device is open
Modified: grass/trunk/scripts/d.correlate/d.correlate.py
===================================================================
--- grass/trunk/scripts/d.correlate/d.correlate.py 2014-11-28 09:30:10 UTC (rev 63226)
+++ grass/trunk/scripts/d.correlate/d.correlate.py 2014-11-28 09:43:14 UTC (rev 63227)
@@ -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/trunk/scripts/d.out.file/d.out.file.py
===================================================================
--- grass/trunk/scripts/d.out.file/d.out.file.py 2014-11-28 09:30:10 UTC (rev 63226)
+++ grass/trunk/scripts/d.out.file/d.out.file.py 2014-11-28 09:43:14 UTC (rev 63227)
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+
############################################################################
#
# MODULE: d.out.file
Modified: grass/trunk/scripts/d.rast.leg/d.rast.leg.py
===================================================================
--- grass/trunk/scripts/d.rast.leg/d.rast.leg.py 2014-11-28 09:30:10 UTC (rev 63226)
+++ grass/trunk/scripts/d.rast.leg/d.rast.leg.py 2014-11-28 09:43:14 UTC (rev 63227)
@@ -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/trunk/scripts/d.redraw/d.redraw.py
===================================================================
--- grass/trunk/scripts/d.redraw/d.redraw.py 2014-11-28 09:30:10 UTC (rev 63226)
+++ grass/trunk/scripts/d.redraw/d.redraw.py 2014-11-28 09:43:14 UTC (rev 63227)
@@ -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/trunk/scripts/d.shadedmap/d.shadedmap.py
===================================================================
--- grass/trunk/scripts/d.shadedmap/d.shadedmap.py 2014-11-28 09:30:10 UTC (rev 63226)
+++ grass/trunk/scripts/d.shadedmap/d.shadedmap.py 2014-11-28 09:43:14 UTC (rev 63227)
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-#
+
############################################################################
#
# MODULE: d.shadedmap
@@ -47,6 +47,11 @@
def main():
options, unused = gcore.parser()
+ 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/trunk/scripts/d.to.rast/d.to.rast.py
===================================================================
--- grass/trunk/scripts/d.to.rast/d.to.rast.py 2014-11-28 09:30:10 UTC (rev 63226)
+++ grass/trunk/scripts/d.to.rast/d.to.rast.py 2014-11-28 09:43:14 UTC (rev 63227)
@@ -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/trunk/scripts/d.vect.thematic/d.vect.thematic.py
===================================================================
--- grass/trunk/scripts/d.vect.thematic/d.vect.thematic.py 2014-11-28 09:30:10 UTC (rev 63226)
+++ grass/trunk/scripts/d.vect.thematic/d.vect.thematic.py 2014-11-28 09:43:14 UTC (rev 63227)
@@ -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/trunk/scripts/d.what.rast/d.what.rast.py
===================================================================
--- grass/trunk/scripts/d.what.rast/d.what.rast.py 2014-11-28 09:30:10 UTC (rev 63226)
+++ grass/trunk/scripts/d.what.rast/d.what.rast.py 2014-11-28 09:43:14 UTC (rev 63227)
@@ -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/trunk/scripts/d.what.vect/d.what.vect.py
===================================================================
--- grass/trunk/scripts/d.what.vect/d.what.vect.py 2014-11-28 09:30:10 UTC (rev 63226)
+++ grass/trunk/scripts/d.what.vect/d.what.vect.py 2014-11-28 09:43:14 UTC (rev 63227)
@@ -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