[GRASS-SVN] r33105 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-08-26 21:10:09 -0400 (Tue, 26 Aug 2008)
New Revision: 33105

Modified:
   grass/trunk/gui/wxpython/gui_modules/mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/render.py
Log:
Remove references to d.mon


Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-08-27 01:07:05 UTC (rev 33104)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-08-27 01:10:09 UTC (rev 33105)
@@ -3865,9 +3865,6 @@
                                 grassenv.GetGRASSVariable("LOCATION_NAME"))
     gm_map.MainLoop()
 
-    if grassenv.env.has_key("MONITOR"):
-        os.system("d.mon sel=%s" % grassenv.GetGRASSVariable("MONITOR"))
-
     os.remove(cmdfilename)
     os.system("""g.gisenv set="GRASS_PYCMDFILE" """)
 

Modified: grass/trunk/gui/wxpython/gui_modules/render.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/render.py	2008-08-27 01:07:05 UTC (rev 33104)
+++ grass/trunk/gui/wxpython/gui_modules/render.py	2008-08-27 01:10:09 UTC (rev 33105)
@@ -132,14 +132,8 @@
         #
         # start monitor
         #
-        if UserSettings.Get(group='display', key='driver', subkey='type') == 'cairo':
-            os.environ["GRASS_CAIROFILE"] = self.mapfile
-            if 'cairo' not in gcmd.Command(['d.mon', '-p']).ReadStdOutput()[0]:
-                gcmd.Command(['d.mon',
-                              'start=cairo'], stderr=None)
-        else:
-            if self.mapfile:
-                os.environ["GRASS_PNGFILE"] = self.mapfile
+	if self.mapfile:
+	    os.environ["GRASS_PNGFILE"] = self.mapfile
                 
         #
         # execute command
@@ -174,12 +168,7 @@
         #
         # stop monitor
         #
-        if UserSettings.Get(group='display', key='driver', subkey='type') == 'cairo':
-            gcmd.Command(['d.mon',
-                          'stop=cairo'], stderr=None)
-            os.unsetenv("GRASS_CAIROFILE")
-        else:
-            os.unsetenv("GRASS_PNGFILE")
+	os.unsetenv("GRASS_PNGFILE")
 
         self.force_render = False
         
@@ -857,14 +846,10 @@
         os.environ["GRASS_REGION"] = self.SetRegion(windres)
         os.environ["GRASS_WIDTH"]  = str(self.width)
         os.environ["GRASS_HEIGHT"] = str(self.height)
-        if UserSettings.Get(group='display', key='driver', subkey='type') == 'cairo':
-            os.environ["GRASS_AUTO_WRITE"] = "TRUE"
-            os.unsetenv("GRASS_RENDER_IMMEDIATE")
-        else:
-            os.environ["GRASS_PNG_AUTO_WRITE"] = "TRUE"
-            os.environ["GRASS_COMPRESSION"] = "0"
-            os.environ["GRASS_TRUECOLOR"] = "TRUE"
-            os.environ["GRASS_RENDER_IMMEDIATE"] = "TRUE"
+	os.environ["GRASS_PNG_AUTO_WRITE"] = "TRUE"
+	os.environ["GRASS_COMPRESSION"] = "0"
+	os.environ["GRASS_TRUECOLOR"] = "TRUE"
+	os.environ["GRASS_RENDER_IMMEDIATE"] = "TRUE"
         
         self._renderLayers(force, mapWindow, maps, masks, opacities)