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

Timestamp:

Apr 7, 2017 9:47:34 AM (8 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:

503eb52

Parents:

4b402a1 (diff), 861f1880 (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

@@ -13 +13 @@
 import traceback
 
+from time import time
+from Queue import Queue
+from threading import Thread
 from collections import defaultdict
 from wx.lib.scrolledpanel import ScrolledPanel
@@ -239 +242 @@
         self.set_layout()
 
+        # Setting up a thread for the fitting
+        self.threadedDrawQueue = Queue()
+
+        self.threadedDrawWorker = Thread(target = self._threaded_draw_worker,
+                                         args = (self.threadedDrawQueue,))
+        self.threadedDrawWorker.setDaemon(True)
+        self.threadedDrawWorker.start()
+
+        # And a home for the thread submission times
+        self.lastTimeFitSubmitted = 0.00
+
     def set_index_model(self, index):
         """
@@ -1691 +1705 @@
         :param chisqr: update chisqr value [bool]
         """
-        wx.CallAfter(self._draw_model_after, update_chisqr, source)
+        # Get the time
+        currentTime = time()
+
+        # When loading we slam a number of fits through here
+        # let's filter these out to start with
+        if currentTime > (self.lastTimeFitSubmitted + 0.1):
+            # Submitting the rest
+            self.threadedDrawQueue.put([update_chisqr, source])
+            print 'submitted!'
+        else:
+            pass
+
+        self.lastTimeFitSubmitted = currentTime
+
+    def _threaded_draw_worker(self, threadedDrawQueue):
+        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() == True)) or ((self._manager.calc_2D is not None)\
+                and (self._manager.calc_2D.isrunning() == True)):
+                # If a manager is running a calculation 
+                # then trim the queue
+                if self.threadedDrawQueue.qsize() > 1:
+                    print '2'
+                    for loopIter in range(threadedDrawQueue.qsize() - 1):
+                        dump = self.threadedDrawQueue.get()
+                        self.threadedDrawQueue.task_done()
+                        print 'bounced'
+                    print 'one element left'
+            else:
+                # Otherwise, just run
+                inputVariables = threadedDrawQueue.get()
+                self._draw_model_after(inputVariables[0], inputVariables[1])
+                wx.PostEvent(self._manager.parent, StatusEvent(status = 
+                            "Computation is in progress...", type = "progress"))
+                threadedDrawQueue.task_done()
+                print 'run'                
 
     def _draw_model_after(self, update_chisqr=True, source='model'):
@@ -1714 +1764 @@
             toggle_mode_on = self.model_view.IsEnabled()
             is_2d = self._is_2D()
+
             self._manager.draw_model(self.model,
                                      data=self.data,