Changeset 922ef55 in sasview

Timestamp:

Apr 6, 2017 12:00:22 PM (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:

f2cc00b

Parents:

c5c247e

Message:

Quick stash commit

Changing branches

File:

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

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

@@ -1704 +1704 @@
         :param chisqr: update chisqr value [bool]
         """
-
+        # Get the time
         currentTime = time()
+
         # # So, if a whole pile of jobs are submitted in quick succession, 
         # # let's say in less than 0.1 sec, we'll filter them out, assuming something 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 currentTime > (self.lastTimeFitSubmitted + 0.1):
-                self.threadedDrawQueue.put([update_chisqr, source])
+                # Assuming that things have been 'sensibly' submitted, but there's another
+                # job going, dump the currently queued job and just execute the job requested last
+                if self.threadedDrawQueue.empty() == True:
+                    self.threadedDrawQueue.put([update_chisqr, source])
+                    print 'here'
+                else:
+                    print 'rejected'
         else:
             self.threadedDrawQueue.put([update_chisqr, source])
@@ -1720 +1727 @@
             inputVariables = threadedDrawQueue.get()
             self._draw_model_after(inputVariables[0], inputVariables[1])
-            self.threadedDrawQueue.task_done()
             wx.PostEvent(self._manager.parent, StatusEvent(status="Computation is in progress...", type = "progress"))
+            threadedDrawQueue.task_done()
 
     def _draw_model_after(self, update_chisqr=True, source='model'):