[GRASS-SVN] r63315 - in grass/trunk/scripts: d.correlate d.rast.leg d.shade d.vect.thematic

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Dec 1 08:43:45 PST 2014


Author: glynn
Date: 2014-12-01 08:43:44 -0800 (Mon, 01 Dec 2014)
New Revision: 63315

Modified:
   grass/trunk/scripts/d.correlate/d.correlate.py
   grass/trunk/scripts/d.rast.leg/d.rast.leg.py
   grass/trunk/scripts/d.shade/d.shade.py
   grass/trunk/scripts/d.vect.thematic/d.vect.thematic.py
Log:
Remove nonsense MONITOR checks from scripts


Modified: grass/trunk/scripts/d.correlate/d.correlate.py
===================================================================
--- grass/trunk/scripts/d.correlate/d.correlate.py	2014-12-01 15:53:14 UTC (rev 63314)
+++ grass/trunk/scripts/d.correlate/d.correlate.py	2014-12-01 16:43:44 UTC (rev 63315)
@@ -32,11 +32,6 @@
 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.rast.leg/d.rast.leg.py
===================================================================
--- grass/trunk/scripts/d.rast.leg/d.rast.leg.py	2014-12-01 15:53:14 UTC (rev 63314)
+++ grass/trunk/scripts/d.rast.leg/d.rast.leg.py	2014-12-01 16:43:44 UTC (rev 63315)
@@ -81,11 +81,6 @@
     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.shade/d.shade.py
===================================================================
--- grass/trunk/scripts/d.shade/d.shade.py	2014-12-01 15:53:14 UTC (rev 63314)
+++ grass/trunk/scripts/d.shade/d.shade.py	2014-12-01 16:43:44 UTC (rev 63315)
@@ -47,15 +47,6 @@
 def main():
     options, unused = gcore.parser()
 
-    env = gcore.gisenv()
-    mon = env.get('MONITOR', None)
-    if not mon:
-        # os is needed only here
-        import os
-        if not 'GRASS_RENDER_IMMEDIATE' in os.environ:
-            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.vect.thematic/d.vect.thematic.py
===================================================================
--- grass/trunk/scripts/d.vect.thematic/d.vect.thematic.py	2014-12-01 15:53:14 UTC (rev 63314)
+++ grass/trunk/scripts/d.vect.thematic/d.vect.thematic.py	2014-12-01 16:43:44 UTC (rev 63315)
@@ -231,13 +231,6 @@
 def main():
     global tmp_graph, tmp_group, tmp_psmap, tmp_psleg, tmp_gisleg
 
-    env = gcore.gisenv()
-    mon = env.get('MONITOR', None)
-    if not mon:
-        if not 'GRASS_RENDER_IMMEDIATE' in os.environ:
-            gcore.fatal(_("No graphics device selected."
-                          " Use d.mon to select graphics device."))
-
     breakpoints = options['breakpoints']
     colorscheme = options['colorscheme']
     column = options['column']



More information about the grass-commit mailing list