Cancel obsolete requests

.gitattributes

@@ -1 +1,2 @@
 * text=auto eol=lf
+*.py eol=lf diff=python

tests/imageScene2D_test.py

@@ -60,7 +60,7 @@ def testPaintDelay(self):
         # during the while loops below;
         # if your computer is verrry slow and the fudge too small
         # the test will fail...
-        fudge = datetime.timedelta(milliseconds=50)
+        fudge = datetime.timedelta(milliseconds=100)
         d = DirtyIndicator(t, delay=delay)
 
         # make the image a little bit larger to accomodate the tile overlap

volumina/pixelpipeline/datasources/minmaxsource.py

@@ -22,6 +22,9 @@ def wait(self):
 
         return self._result
 
+    def cancel(self):
+        self._rawRequest.cancel()
+
 
 class MinMaxSource(QObject, DataSourceABC):
     """

volumina/pixelpipeline/imagesources/alphamodulated.py

@@ -50,6 +50,9 @@ def __init__(self, arrayrequest, tintColor, normalize=(0, 255)):
     def wait(self):
         return self.toImage()
 
+    def cancel(self):
+        self._arrayreq.cancel()
+
     def toImage(self):
         t = time.time()
 

volumina/pixelpipeline/imagesources/colortable.py

@@ -82,6 +82,9 @@ def __init__(self, arrayrequest, colorTable, normalize, direct=False):
     def wait(self):
         return self.toImage()
 
+    def cancel(self):
+        self._arrayreq.cancel()
+
     def toImage(self):
         t = time.time()
 

volumina/pixelpipeline/imagesources/dummy.py

@@ -59,6 +59,9 @@ def __init__(self, arrayreq, rect):
         self.rect = rect
         self._arrayreq = arrayreq
 
+    def cancel(self):
+        self._arrayreq.cancel()
+
     def wait(self):
         array_data = self._arrayreq.wait()
         # Here's where we would do something with the data...
@@ -88,6 +91,9 @@ def __init__(self, arrayreq, rect):
         self.rectf = QRectF(rect)
         self._arrayreq = arrayreq
 
+    def cancel(self):
+        self._arrayreq.cancel()
+
     def wait(self):
         array_data = self._arrayreq.wait()
         rectf = self.rectf

volumina/pixelpipeline/imagesources/grayscale.py

@@ -58,6 +58,9 @@ def __init__(self, arrayrequest, normalize=None, direct=False):
     def wait(self):
         return self.toImage()
 
+    def cancel(self):
+        self._arrayreq.cancel()
+
     def toImage(self):
         t = time.time()
 
@@ -122,6 +125,3 @@ def toImage(self):
             )
 
         return img
-
-
-# *******************************************************************************

volumina/pixelpipeline/imagesources/rgba.py

@@ -67,6 +67,10 @@ def wait(self):
             req.wait()
         return self.toImage()
 
+    def cancel(self):
+        for req in self._requests:
+            req.cancel()
+
     def toImage(self):
         for i, req in enumerate(self._requests):
             a = req.wait()

volumina/pixelpipeline/imagesources/segmentationedges.py

@@ -64,6 +64,9 @@ def __init__(self, arrayreq, layer, rect, is_clickable):
         self._layer = layer
         self._is_clickable = is_clickable
 
+    def cancel(self):
+        self._arrayreq.cancel()
+
     def wait(self):
         array_data = self._arrayreq.wait()
 

volumina/pixelpipeline/interface.py

@@ -37,6 +37,10 @@ class RequestABC(ABC):
     def wait(self):
         """waits until completion and returns result"""
 
+    @abstractmethod
+    def cancel(self):
+        ...
+
 
 class ImageSourceABC(QABC):
     """

volumina/tiling/__init__.py

@@ -39,7 +39,7 @@
 # PyQt
 from PyQt5.QtCore import QRect, QRectF, QMutex, QObject, pyqtSignal
 from PyQt5.QtWidgets import QGraphicsItem
-from PyQt5.QtGui import QImage, QPainter, QTransform
+from PyQt5.QtGui import QImage, QPainter, QTransform, QColor
 
 # volumina
 from volumina.patchAccessor import PatchAccessor
@@ -248,11 +248,11 @@ def __init__(self, tiling, stackedImageSources, cache_size: int = 100) -> None:
         cache_size                -- maximal number of encountered stacks
                                      to cache, i.e. slices if the imagesources
                                      draw from slicesources (default 10)
-        parent                    -- QObject
 
         """
 
         QObject.__init__(self, parent=None)
+        self._current_requests = {}
 
         self.tiling = tiling
         self.axesSwapped = False
@@ -303,6 +303,8 @@ def waitForTiles(self, rectF=QRectF()):
         while not finished:
             finished = True
             tiles = self.getTiles(rectF)
+            while self._current_requests:
+                time.sleep(0.01)
             for tile in tiles:
                 finished &= tile.progress >= 1.0
 
@@ -315,6 +317,12 @@ def requestRefresh(self, rectF, stack_id=None, prefetch=False, layer_indexes=Non
         """
         stack_id = stack_id or self._current_stack_id
         tile_nos = self.tiling.intersected(rectF)
+        to_cancel = self._current_requests
+        self._current_requests = {}
+
+        for id_, rq in to_cancel.items():
+            rq.cancel()
+
         for tile_no in tile_nos:
             self._refreshTile(stack_id, tile_no, prefetch, layer_indexes)
 
@@ -405,6 +413,7 @@ def _refreshTile(self, stack_id, tile_no, prefetch=False, layer_indexes=None):
                 try:
                     # Create the request object right now, from the main thread.
                     ims_req = ims.request(dataRect, stack_id[1])
+                    self._current_requests[(stack_id[1], ims, tile_no)] = ims_req
                 except IndeterminateRequestError:
                     # In ilastik, the viewer is still churning even as the user might be changing settings in the UI.
                     # Settings changes can cause 'slot not ready' errors during graph setup.
@@ -413,7 +422,7 @@ def _refreshTile(self, stack_id, tile_no, prefetch=False, layer_indexes=None):
                     logger.debug("Failed to create layer tile request", exc_info=True)
                     continue
 
-                timestamp = time.time()
+                timestamp = time.monotonic()
                 fetch_fn = partial(
                     self._fetch_layer_tile, timestamp, ims, transform, tile_no, stack_id, ims_req, self._cache
                 )
@@ -449,6 +458,7 @@ def _blendTile(self, stack_id, tile_nr):
         """
         qimg = None
         p = None
+
         for i, (visible, layerOpacity, layerImageSource) in enumerate(reversed(self._sims)):
             image_type = layerImageSource.image_type()
             if issubclass(image_type, QGraphicsItem):
@@ -552,6 +562,11 @@ def _fetch_layer_tile(self, timestamp, ims, transform, tile_nr, stack_id, ims_re
 
                 if stack_id == self._current_stack_id and cache is self._cache:
                     self.sceneRectChanged.emit(tile_rect)
+            else:
+                ims_req.cancel()
+
+            self._current_requests.pop((stack_id[1], ims, tile_nr), None)
+
         except BaseException:
             logger.debug("Failed to fetch layer tile", exc_info=True)