Pārlūkot izejas kodu

wxGUI: fix Map.AbortAllThreads()

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@65210 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 gadi atpakaļ
vecāks
revīzija
7faf5e5967
1 mainītis faili ar 8 papildinājumiem un 3 dzēšanām
  1. 8 3
      gui/wxpython/core/render.py

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

@@ -370,7 +370,8 @@ class RenderLayerMgr(wx.EvtHandler):
         
         
     def Abort(self):
     def Abort(self):
         """Abort rendering process"""
         """Abort rendering process"""
-        self.thread.abort(abortall = True)        
+        Debug.msg(1, "RenderLayerMgr({}).Abort()".format(self.layer))
+        self.thread.abort(abortall = True)
 
 
     def IsDownloading(self):
     def IsDownloading(self):
         """Is downloading
         """Is downloading
@@ -538,8 +539,13 @@ class RenderMapMgr(wx.EvtHandler):
 
 
     def Abort(self):
     def Abort(self):
         """Abort all rendering processes"""
         """Abort all rendering processes"""
+        Debug.msg(1, "RenderMapMgr.Abort()")
         for layer in self.layers:
         for layer in self.layers:
             layer.GetRenderMgr().Abort()
             layer.GetRenderMgr().Abort()
+
+        self._init()
+        wx.EndBusyCursor()
+        self.updateProgress.emit(range=0, value=0, text=_("Rendering aborted"))
         
         
     def ReportProgress(self, layer=None):
     def ReportProgress(self, layer=None):
         """Calculates progress in rendering/downloading
         """Calculates progress in rendering/downloading
@@ -1418,5 +1424,4 @@ class Map(object):
 
 
     def AbortAllThreads(self):
     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:
-            l.AbortThread()
+        self.renderMgr.Abort()