Changeset d3b0c77 in sasview for src/sas/sasgui/perspectives/fitting/basepage.py

Timestamp:

Sep 23, 2017 4:24:27 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b963b20, fca1f50

Parents:

9706d88 (diff), dba8557 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ticket-887-reorg' into ticket-853-fit-gui-to-calc

File:

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

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

@@ -12 +12 @@
 import logging
 import traceback
+from Queue import Queue
+from threading import Thread
 from collections import defaultdict
 
@@ -248 +250 @@
         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):
         """
@@ -1735 +1748 @@
         :param chisqr: update chisqr value [bool]
         """
-        wx.CallAfter(self._draw_model_after, update_chisqr, source)
+        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()
 
     def _draw_model_after(self, update_chisqr=True, source='model'):
@@ -1757 +1787 @@
             toggle_mode_on = self.model_view.IsEnabled()
             is_2d = self._is_2D()
+
             self._manager.draw_model(self.model,
                                      data=self.data,