Changeset 9603:96f043b17452 in orange

Timestamp:

01/30/12 13:26:35 (16 months ago)

Author:

ales_erjavec

Branch:

default

rebase_source:

93d9a8315adfd1a4bbb151a4cc36a5ecd53e784f

Message:

Added support task canceling (before it is run).

File:

• orange/OrangeWidgets/OWConcurrent.py (modified) (7 diffs)

orange/OrangeWidgets/OWConcurrent.py

@@ -4 +4 @@
 
 General helper functions and classes for Orange Canvas
-concurent programming
+concurrent programming
+
 """
 from __future__ import with_statement
@@ -37 +38 @@
         self._kwargs = kwargs
         self.threadPool = None
+        
+        self._connected = True
+        self._cancelRequested = False
+        self._started = False
+        self._cancelled = False
+        
         if thread is not None:
             self.moveToThread(thread)
@@ -49 +56 @@
             
         self.connect(self, SIGNAL("_async_start()"), self.execute, Qt.QueuedConnection)
-        self._connected = True
+        
 
 
@@ -57 +64 @@
         """
         assert(self.thread() is QThread.currentThread())
+        if self._cancelRequested:
+            self._cancelled = True
+            self._status = 2
+            self.emit(SIGNAL("finished(QString)"), QString("Cancelled"))
+            return
+        self._started = True
         self.emit(SIGNAL("starting()"))
         try:
@@ -118 +131 @@
         """
         self.join(processEvents=processEvents)
-        if self.poll() != 0:
+        if self.poll() != 0: 
             # re-raise the error
             raise self._exc_info[0], self._exc_info[1]
@@ -269 +282 @@
 A multiprocessing like API
 ==========================
+
+Incomplette
 """
 
@@ -329 +344 @@
     def start(self, ):
         pass
-
+