Prechádzať zdrojové kódy

wxGUI/nviz: do not use progress bar on mac, causes recursion for unknown reason

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@64564 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 10 rokov pred
rodič
commit
8a493236da
1 zmenil súbory, kde vykonal 12 pridanie a 9 odobranie
  1. 12 9
      gui/wxpython/nviz/mapwindow.py

+ 12 - 9
gui/wxpython/nviz/mapwindow.py

@@ -1168,12 +1168,14 @@ class GLWindow(MapWindowBase, glcanvas.GLCanvas):
         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 @@ class GLWindow(MapWindowBase, glcanvas.GLCanvas):
         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)))