Sfoglia il codice sorgente

wxGUI: fix AbortAllThreads & EVT_UPDATE_PRGBAR
patch provided by Stepan Turek


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54611 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 12 anni fa
parent
commit
4cd2dfa96e

+ 3 - 8
gui/wxpython/core/render.py

@@ -33,19 +33,15 @@ import tempfile
 import types
 import types
 
 
 import wx
 import wx
-from wx.lib.newevent import NewEvent
 
 
 from grass.script import core as grass
 from grass.script import core as grass
 
 
 from core          import utils
 from core          import utils
+from core.ws       import RenderWMSMgr, wxUpdateProgressBar
 from core.gcmd     import GException, GError, RunCommand
 from core.gcmd     import GException, GError, RunCommand
 from core.debug    import Debug
 from core.debug    import Debug
 from core.settings import UserSettings
 from core.settings import UserSettings
 
 
-wxUpdateProgressBar, EVT_UPDATE_PRGBAR = NewEvent()
-
-from core.ws       import RenderWMSMgr
-
 USE_GPNMCOMP = True
 USE_GPNMCOMP = True
 
 
 class Layer(object):
 class Layer(object):
@@ -1372,8 +1368,7 @@ class Map(object):
             if l.GetRenderMgr():
             if l.GetRenderMgr():
                 l.GetRenderMgr().SetReceiver(self.receiver)
                 l.GetRenderMgr().SetReceiver(self.receiver)
 
 
-    def AbortAllThreads(self, old_receiver = None):
+    def AbortAllThreads(self):
         """!Abort all layers threads e. g. donwloading data"""
         """!Abort all layers threads e. g. donwloading data"""
         for l in self.layers + self.overlays:
         for l in self.layers + self.overlays:
-            l.AbortThread(old_receiver)
- 
+            l.AbortThread()

+ 3 - 1
gui/wxpython/core/ws.py

@@ -20,12 +20,12 @@ import os
 import sys
 import sys
 
 
 import wx
 import wx
+from wx.lib.newevent import NewEvent
 
 
 from grass.script import core as grass
 from grass.script import core as grass
 
 
 from core          import utils
 from core          import utils
 from core.events   import gUpdateMap
 from core.events   import gUpdateMap
-from core.render   import wxUpdateProgressBar
 from core.debug    import Debug
 from core.debug    import Debug
 
 
 from core.gconsole import CmdThread, GStderr, EVT_CMD_DONE, EVT_CMD_OUTPUT
 from core.gconsole import CmdThread, GStderr, EVT_CMD_DONE, EVT_CMD_OUTPUT
@@ -38,6 +38,8 @@ try:
 except ImportError:
 except ImportError:
     haveGdal = False
     haveGdal = False
 
 
+wxUpdateProgressBar, EVT_UPDATE_PRGBAR = NewEvent()
+
 class RenderWMSMgr(wx.EvtHandler):
 class RenderWMSMgr(wx.EvtHandler):
     """!Fetch and prepare WMS data for rendering.
     """!Fetch and prepare WMS data for rendering.
     """
     """

+ 2 - 1
gui/wxpython/mapdisp/frame.py

@@ -35,7 +35,8 @@ sys.path.append(os.path.join(globalvar.ETCWXDIR, "icons"))
 sys.path.append(os.path.join(globalvar.ETCDIR,   "python"))
 sys.path.append(os.path.join(globalvar.ETCDIR,   "python"))
 
 
 from core               import globalvar
 from core               import globalvar
-from core.render        import EVT_UPDATE_PRGBAR, Map
+from core.render        import Map
+from core.ws            import EVT_UPDATE_PRGBAR
 from vdigit.toolbars    import VDigitToolbar
 from vdigit.toolbars    import VDigitToolbar
 from mapdisp.toolbars   import MapToolbar, NvizIcons
 from mapdisp.toolbars   import MapToolbar, NvizIcons
 from mapdisp.gprint     import PrintOptions
 from mapdisp.gprint     import PrintOptions

+ 1 - 1
gui/wxpython/mapdisp/mapwindow.py

@@ -36,7 +36,7 @@ from core.debug         import Debug
 from core.settings      import UserSettings
 from core.settings      import UserSettings
 from core.events        import gZoomChanged, EVT_UPDATE_MAP
 from core.events        import gZoomChanged, EVT_UPDATE_MAP
 from gui_core.mapwindow import MapWindow
 from gui_core.mapwindow import MapWindow
-from core.render        import EVT_UPDATE_PRGBAR
+from core.ws            import EVT_UPDATE_PRGBAR
 from core.utils         import GetGEventAttribsForHandler
 from core.utils         import GetGEventAttribsForHandler
 
 
 try:
 try: