Changeset 6300dfe in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Aug 23, 2017 8:05:45 AM (7 years ago)

Author:

Tim Snow <tim.snow@…>

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:

f0a16d5

Parents:

367a31c (diff), f001bc9 (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 'master' into ticket-869

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
@@ -241 +243 @@
         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):
         """
@@ -1693 +1706 @@
         :param chisqr: update chisqr value [bool]
         """
-        wx.CallAfter(self._draw_model_after, update_chisqr, source)
+        # 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()
 
     def _draw_model_after(self, update_chisqr=True, source='model'):
@@ -1716 +1762 @@
             toggle_mode_on = self.model_view.IsEnabled()
             is_2d = self._is_2D()
+
             self._manager.draw_model(self.model,
                                      data=self.data,