[GRASS-SVN] r64599 - grass/branches/releasebranch_7_0/gui/wxpython/nviz

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-02-12 19:07:07 -0800 (Thu, 12 Feb 2015)
New Revision: 64599

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/nviz/mapwindow.py
Log:
wxGUI/nviz: do not use progress bar on mac, causes recursion for unknown reason (merge from trunk, r64564)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/nviz/mapwindow.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/nviz/mapwindow.py	2015-02-13 03:00:53 UTC (rev 64598)
+++ grass/branches/releasebranch_7_0/gui/wxpython/nviz/mapwindow.py	2015-02-13 03:07:07 UTC (rev 64599)
@@ -1168,12 +1168,14 @@
         self.resize = False
         
         if self.render['quick'] is False:
-            self.parent.GetProgressBar().Show()
-            self.parent.GetProgressBar().SetRange(2)
-            self.parent.GetProgressBar().SetValue(0)
-        
+            if sys.platform != 'darwin':  # causes recursion for some reason on Mac
+                self.parent.GetProgressBar().Show()
+                self.parent.GetProgressBar().SetRange(2)
+                self.parent.GetProgressBar().SetValue(0)
+
         if self.render['quick'] is False:
-            self.parent.GetProgressBar().SetValue(1)
+            if sys.platform != 'darwin':
+                self.parent.GetProgressBar().SetValue(1)
             self._display.Draw(False, -1)
             if self.saveHistory:
                 self.ViewHistory(view = self.view, iview = self.iview)
@@ -1209,10 +1211,11 @@
         stop = time.clock()
         
         if self.render['quick'] is False:
-            self.parent.GetProgressBar().SetValue(2)
-            # hide process bar
-            self.parent.GetProgressBar().Hide()
-        
+            if sys.platform != 'darwin':
+                self.parent.GetProgressBar().SetValue(2)
+                # hide process bar
+                self.parent.GetProgressBar().Hide()
+
         Debug.msg(3, "GLWindow.UpdateMap(): quick = %d, -> time = %g" % \
                       (self.render['quick'], (stop-start)))