[GRASS-SVN] r65210 - grass/trunk/gui/wxpython/core

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-05-10 04:14:26 -0700 (Sun, 10 May 2015)
New Revision: 65210

Modified:
   grass/trunk/gui/wxpython/core/render.py
Log:
wxGUI: fix Map.AbortAllThreads()


Modified: grass/trunk/gui/wxpython/core/render.py
===================================================================
--- grass/trunk/gui/wxpython/core/render.py	2015-05-10 10:08:29 UTC (rev 65209)
+++ grass/trunk/gui/wxpython/core/render.py	2015-05-10 11:14:26 UTC (rev 65210)
@@ -370,7 +370,8 @@
         
     def Abort(self):
         """Abort rendering process"""
-        self.thread.abort(abortall = True)        
+        Debug.msg(1, "RenderLayerMgr({}).Abort()".format(self.layer))
+        self.thread.abort(abortall = True)
 
     def IsDownloading(self):
         """Is downloading
@@ -538,8 +539,13 @@
 
     def Abort(self):
         """Abort all rendering processes"""
+        Debug.msg(1, "RenderMapMgr.Abort()")
         for layer in self.layers:
             layer.GetRenderMgr().Abort()
+
+        self._init()
+        wx.EndBusyCursor()
+        self.updateProgress.emit(range=0, value=0, text=_("Rendering aborted"))
         
     def ReportProgress(self, layer=None):
         """Calculates progress in rendering/downloading
@@ -1418,5 +1424,4 @@
 
     def AbortAllThreads(self):
         """Abort all layers threads e. g. donwloading data"""
-        for l in self.layers + self.overlays:
-            l.AbortThread()
+        self.renderMgr.Abort()