Changes in / [38a1e63:4b001f3] 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]
         """
-        self.threaded_draw_queue.put([copy.copy(update_chisqr), copy.copy(source)])
-
-    def _threaded_draw_worker(self, threaded_draw_queue):
-        while True:
-            # sit and wait for the next task
-            next_task = threaded_draw_queue.get()
-
-            # sleep for 1/10th second in case some other tasks accumulate
-            time.sleep(0.1)
-
-            # skip all intermediate tasks
-            while self.threaded_draw_queue.qsize() > 0:
-                self.threaded_draw_queue.task_done()
-                next_task = self.threaded_draw_queue.get()
-
-            # and finally, do the task
-            self._draw_model_after(*next_task)
-            threaded_draw_queue.task_done()
+        wx.CallAfter(self._draw_model_after, update_chisqr, source)
 
     def _draw_model_after(self, update_chisqr=True, source='model'):
@@ -1746 +1716 @@
             toggle_mode_on = self.model_view.IsEnabled()
             is_2d = self._is_2D()
-
             self._manager.draw_model(self.model,
                                      data=self.data,