[GRASS-SVN] r45057 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: mmetz
Date: 2011-01-17 01:28:24 -0800 (Mon, 17 Jan 2011)
New Revision: 45057

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gcpmanager.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py
Log:
backport r45055 from trunk

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gcpmanager.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gcpmanager.py	2011-01-17 09:26:33 UTC (rev 45056)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gcpmanager.py	2011-01-17 09:28:24 UTC (rev 45057)
@@ -861,14 +861,15 @@
         #
         # show new display & draw map
         #
-        self.MapWindow = self.SrcMapWindow
-        self.Map = self.SrcMap
-        self.OnZoomToMap(None)
         if self.show_target:
             self.MapWindow = self.TgtMapWindow
             self.Map = self.TgtMap
             self.OnZoomToMap(None)
 
+        self.MapWindow = self.SrcMapWindow
+        self.Map = self.SrcMap
+        self.OnZoomToMap(None)
+
         #
         # bindings
         #

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py	2011-01-17 09:26:33 UTC (rev 45056)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/render.py	2011-01-17 09:28:24 UTC (rev 45057)
@@ -138,12 +138,22 @@
         # start monitor
         #
         if UserSettings.Get(group='display', key='driver', subkey='type') == 'cairo':
-            os.environ["GRASS_CAIROFILE"] = self.mapfile
-            if 'cairo' not in gcmd.RunCommand('d.mon',
-                                              flags='p',
-                                              read = True):
-                gcmd.RunCommand('d.mon',
-                                start = 'cairo')
+#            os.environ["GRASS_CAIROFILE"] = self.mapfile
+#            if 'cairo' not in gcmd.RunCommand('d.mon',
+#                                              flags='p',
+#                                              read = True):
+#                gcmd.RunCommand('d.mon',
+#                                start = 'cairo')
+            if not self.mapfile:
+                self.gtemp = tempfile.mkstemp()[1]
+                self.maskfile = self.gtemp + ".pgm"
+                if self.type == 'overlay':
+                    self.mapfile  = self.gtemp + ".png"
+                else:
+                    self.mapfile  = self.gtemp + ".ppm"
+
+            if self.mapfile:
+                os.environ["GRASS_CAIROFILE"] = self.mapfile
         else:
             if not self.mapfile:
                 self.gtemp = tempfile.mkstemp()[1]
@@ -204,8 +214,8 @@
         # stop monitor
         #
         if UserSettings.Get(group='display', key='driver', subkey='type') == 'cairo':
-            gcmd.RunCommand('d.mon',
-                            stop = 'cairo')
+#            gcmd.RunCommand('d.mon',
+#                            stop = 'cairo')
             del os.environ["GRASS_CAIROFILE"]
         elif os.environ.has_key("GRASS_PNGFILE"):
             del os.environ["GRASS_PNGFILE"]
@@ -870,6 +880,7 @@
             os.environ["GRASS_AUTO_WRITE"] = "TRUE"
             if os.environ.has_key("GRASS_RENDER_IMMEDIATE"):
                 del os.environ["GRASS_RENDER_IMMEDIATE"]
+            os.environ["GRASS_RENDER_IMMEDIATE"] = "TRUE"
         else:
             os.environ["GRASS_PNG_AUTO_WRITE"] = "TRUE"
             os.environ["GRASS_PNG_READ"] = "FALSE"