Procházet zdrojové kódy

wxGUI: remove wx.Yield from progress bar because with wxpython 2.9 it causes problems

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@58068 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová před 11 roky
rodič
revize
ff1957372e

+ 1 - 13
gui/wxpython/mapdisp/statusbar.py

@@ -1104,19 +1104,7 @@ class SbProgress(SbItem):
         return self.widget.IsShown()
 
     def SetValue(self, value):
-        """!Sets value of progressbar.
-        
-        Calls wx.Yield which allows
-        to update gui for displaying progress.
-        """
-        self.SafeSetValue(value)
-        wx.Yield()
-
-    def SafeSetValue(self, value):
-        """! Thread save SetValue method.
-        
-        Needed for wxNVIZ.
-        """
+        """!Sets value of progressbar."""
         if value > self.GetRange():
             self.Hide()
             return

+ 3 - 3
gui/wxpython/nviz/mapwindow.py

@@ -1168,10 +1168,10 @@ class GLWindow(MapWindowBase, glcanvas.GLCanvas):
         if self.render['quick'] is False:
             self.parent.GetProgressBar().Show()
             self.parent.GetProgressBar().SetRange(2)
-            self.parent.GetProgressBar().SafeSetValue(0)
+            self.parent.GetProgressBar().SetValue(0)
         
         if self.render['quick'] is False:
-            self.parent.GetProgressBar().SafeSetValue(1)
+            self.parent.GetProgressBar().SetValue(1)
             self._display.Draw(False, -1)
             if self.saveHistory:
                 self.ViewHistory(view = self.view, iview = self.iview)
@@ -1207,7 +1207,7 @@ class GLWindow(MapWindowBase, glcanvas.GLCanvas):
         stop = time.clock()
         
         if self.render['quick'] is False:
-            self.parent.GetProgressBar().SafeSetValue(2)
+            self.parent.GetProgressBar().SetValue(2)
             # hide process bar
             self.parent.GetProgressBar().Hide()
         

+ 1 - 1
gui/wxpython/nviz/wxnviz.py

@@ -70,7 +70,7 @@ def print_progress(value):
     if progress:
         if not progress.GetRange() == 100:
             progress.SetRange(100)
-        progress.SafeSetValue(value)
+        progress.SetValue(value)
     else:
         print value