Changes in / [367a31c:a06ee7e] in sasview

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (4 diffs)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -15 +15 @@
 import traceback
 
-from Queue import Queue
-from threading import Thread
 from collections import defaultdict
 from wx.lib.scrolledpanel import ScrolledPanel
@@ -243 +241 @@
         self.set_layout()
 
-        # Setting up a thread for the fitting
-        self.threaded_draw_queue = Queue()
-
-        self.draw_worker_thread = Thread(target = self._threaded_draw_worker,
-                                         args = (self.threaded_draw_queue,))
-        self.draw_worker_thread.setDaemon(True)
-        self.draw_worker_thread.start()
-
-        # And a home for the thread submission times
-        self.last_time_fit_submitted = 0.00
-
     def set_index_model(self, index):
         """
@@ -1706 +1693 @@
         :param chisqr: update chisqr value [bool]
         """
-        # Get the time
-        current_time = time.time()
-
-        # When loading we slam a number of fits through here
-        # let's filter these out to start with
-        if current_time > (self.last_time_fit_submitted + 0.1):
-            # Submitting the rest
-            self.threaded_draw_queue.put([update_chisqr, source])
-        else:
-            pass
-
-        self.last_time_fit_submitted = current_time
-
-    def _threaded_draw_worker(self, threaded_draw_queue):
-        while True:
-            # Check to see is a manager is running and a calc is running
-            if ((self._manager.calc_1D is not None
-                 and self._manager.calc_1D.isrunning()) or
-                (self._manager.calc_2D is not None
-                 and self._manager.calc_2D.isrunning())):
-                # If a manager is running a calculation
-                # then trim the queue
-                if self.threaded_draw_queue.qsize() > 1:
-                    for loopIter in range(threaded_draw_queue.qsize() - 1):
-                        dump = self.threaded_draw_queue.get()
-                        self.threaded_draw_queue.task_done()
-            else:
-                # Otherwise, just run
-                input_variables = threaded_draw_queue.get()
-                self._draw_model_after(input_variables[0], input_variables[1])
-                event = StatusEvent(status="Computation is in progress...",
-                                    type="progress")
-                wx.PostEvent(self._manager.parent, event)
-                threaded_draw_queue.task_done()
+        wx.CallAfter(self._draw_model_after, update_chisqr, source)
 
     def _draw_model_after(self, update_chisqr=True, source='model'):
@@ -1762 +1716 @@
             toggle_mode_on = self.model_view.IsEnabled()
             is_2d = self._is_2D()
-
             self._manager.draw_model(self.model,
                                      data=self.data,