Changeset c5c247e in sasview

Timestamp:

Apr 6, 2017 9:14:03 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:

922ef55

Parents:

d70f6d2

Message:

Put in a resubmission time constraint

In order to close ticket #14, if a fitting is put in for submission
within 0.1 sec of another fitting, and a fitting is already taking
place, then it will not be submitted to the fitting engine.

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (5 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
@@ -242 +242 @@
         self.set_layout()
 
-        # Putting matplotlib in the background so as not to hang the interface
+        # Setting up a thread for the fitting
         self.threadedDrawQueue = Queue()
 
@@ -249 +249 @@
         self.threadedDrawWorker.start()
 
+        # And a home for the thread submission times
+        self.lastTimeFitSubmitted = None
 
     def set_index_model(self, index):
@@ -1702 +1704 @@
         :param chisqr: update chisqr value [bool]
         """
-        self.threadedDrawQueue.put([update_chisqr, source])
+
+        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])
+        else:
+            self.threadedDrawQueue.put([update_chisqr, source])
+
+        self.lastTimeFitSubmitted = currentTime
 
     def _threaded_draw_worker(self, threadedDrawQueue):
@@ -1732 +1744 @@
             toggle_mode_on = self.model_view.IsEnabled()
             is_2d = self._is_2D()
+
             self._manager.draw_model(self.model,
                                      data=self.data,