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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-07-09 07:03:36 -0700 (Sat, 09 Jul 2011)
New Revision: 47071

Modified:
   grass/trunk/gui/wxpython/gui_modules/render.py
Log:
wxGUI/mapdisp: fix PNG_READ for standalone app


Modified: grass/trunk/gui/wxpython/gui_modules/render.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/render.py	2011-07-09 12:59:44 UTC (rev 47070)
+++ grass/trunk/gui/wxpython/gui_modules/render.py	2011-07-09 14:03:36 UTC (rev 47071)
@@ -376,14 +376,12 @@
         env = {"GRASS_BACKGROUNDCOLOR" : "FFFFFF",
                "GRASS_COMPRESSION"     : "0",
                "GRASS_TRUECOLOR"       : "TRUE",
-               "GRASS_TRANSPARENT"     :  "TRUE"
+               "GRASS_TRANSPARENT"     : "TRUE",
+               "GRASS_PNG_READ"        : "FALSE",
                }
-        if self.cmdfile:
-            env["GRASS_PNG_READ"] = "TRUE"
-        else:
-            env["GRASS_PNG_READ"] = "FALSE"
-
+        
         self._writeEnvFile(env)
+        self._writeEnvFile({"GRASS_PNG_READ" : "TRUE"})
         for k, v in env.iteritems():
             os.environ[k] = v
         
@@ -868,6 +866,7 @@
             cmdLines = fd.readlines()
             gcmd.RunCommand('g.gisenv',
                             set = 'MONITOR_%s_CMDFILE=' % self.monitor)
+            
             for cmd in cmdLines:
                 cmdStr = cmd.strip().split(' ')
                 cmd = utils.CmdToTuple(cmdStr)
@@ -902,6 +901,8 @@
             gcmd.RunCommand('g.gisenv',
                             set = 'MONITOR=%s' % self.monitor)
         
+        grass.try_remove(self.mapfileCmd) # GRASS_PNG_READ is TRUE
+        
         nlayers = self._parseCmdFile()
         
         if currMon != self.monitor: