瀏覽代碼

d.* scripts: check if graphics device is open

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63229 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 10 年之前
父節點
當前提交
1e3e91bfc9

+ 5 - 0
scripts/d.correlate/d.correlate.py

@@ -32,6 +32,11 @@ from grass.script.utils import try_remove
 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:

+ 1 - 0
scripts/d.out.file/d.out.file.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+
 ############################################################################
 #
 # MODULE: d.out.file

+ 26 - 28
scripts/d.rast.leg/d.rast.leg.py

@@ -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 @@ def make_frame(f, b, t, l, r):
     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']

+ 3 - 2
scripts/d.redraw/d.redraw.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+
 ############################################################################
 #
 # MODULE:	d.redraw
@@ -25,7 +26,7 @@ import shlex
 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 @@ def main():
     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:

+ 6 - 1
scripts/d.shadedmap/d.shadedmap.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#
+
 ############################################################################
 #
 # MODULE:        d.shadedmap
@@ -47,6 +47,11 @@ from grass.exceptions import CalledModuleError
 
 
 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']

+ 8 - 2
scripts/d.to.rast/d.to.rast.py

@@ -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 @@ from grass.script import core as gcore
 
 
 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:

+ 6 - 1
scripts/d.vect.thematic/d.vect.thematic.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#
+
 ############################################################################
 #
 # MODULE:       d.vect.thematic
@@ -231,6 +231,11 @@ def out(fh, vars, tmpl):
 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']

+ 7 - 1
scripts/d.what.rast/d.what.rast.py

@@ -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 @@ from grass.script import core as gcore
 
 
 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:

+ 3 - 2
scripts/d.what.vect/d.what.vect.py

@@ -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