Procházet zdrojové kódy

wxGUI/mapdisp: fix PNG_READ for standalone app

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47071 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa před 14 roky
rodič
revize
54667e9ddb
1 změnil soubory, kde provedl 7 přidání a 6 odebrání
  1. 7 6
      gui/wxpython/gui_modules/render.py

+ 7 - 6
gui/wxpython/gui_modules/render.py

@@ -376,14 +376,12 @@ class Map(object):
         env = {"GRASS_BACKGROUNDCOLOR" : "FFFFFF",
         env = {"GRASS_BACKGROUNDCOLOR" : "FFFFFF",
                "GRASS_COMPRESSION"     : "0",
                "GRASS_COMPRESSION"     : "0",
                "GRASS_TRUECOLOR"       : "TRUE",
                "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(env)
+        self._writeEnvFile({"GRASS_PNG_READ" : "TRUE"})
         for k, v in env.iteritems():
         for k, v in env.iteritems():
             os.environ[k] = v
             os.environ[k] = v
         
         
@@ -868,6 +866,7 @@ class Map(object):
             cmdLines = fd.readlines()
             cmdLines = fd.readlines()
             gcmd.RunCommand('g.gisenv',
             gcmd.RunCommand('g.gisenv',
                             set = 'MONITOR_%s_CMDFILE=' % self.monitor)
                             set = 'MONITOR_%s_CMDFILE=' % self.monitor)
+            
             for cmd in cmdLines:
             for cmd in cmdLines:
                 cmdStr = cmd.strip().split(' ')
                 cmdStr = cmd.strip().split(' ')
                 cmd = utils.CmdToTuple(cmdStr)
                 cmd = utils.CmdToTuple(cmdStr)
@@ -902,6 +901,8 @@ class Map(object):
             gcmd.RunCommand('g.gisenv',
             gcmd.RunCommand('g.gisenv',
                             set = 'MONITOR=%s' % self.monitor)
                             set = 'MONITOR=%s' % self.monitor)
         
         
+        grass.try_remove(self.mapfileCmd) # GRASS_PNG_READ is TRUE
+        
         nlayers = self._parseCmdFile()
         nlayers = self._parseCmdFile()
         
         
         if currMon != self.monitor:
         if currMon != self.monitor: