Changeset 5c6002a in sasview

Timestamp:

Apr 7, 2017 5:49:55 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:

d6353fb

Parents:

f2cc00b

Message:

Logic sorted

We now check for a) quick submissions b) whether something is already
running and if it is chuck any intermediate stages

File:

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

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

@@ -250 +250 @@
 
         # And a home for the thread submission times
-        self.lastTimeFitSubmitted = None
+        self.lastTimeFitSubmitted = 0.00
 
     def set_index_model(self, index):
@@ -1707 +1707 @@
         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):
-                # 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:
-                    while self.threadedDrawQueue.empty() != True:
-                        self.threadedDrawQueue.get()
-                        self.threadedDrawQueue.task_done()
-
-                    self.threadedDrawQueue.put([update_chisqr, source])
-                    print 'rejected'
-        
+        # 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:
-            self.threadedDrawQueue.put([update_chisqr, source])
+            pass
 
         self.lastTimeFitSubmitted = currentTime
@@ -1732 +1720 @@
     def _threaded_draw_worker(self, threadedDrawQueue):
         while True:
-            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()):
-                pass
+            #Â Check if a manager exists and it's 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 'added'
+                print 'run'                
 
     def _draw_model_after(self, update_chisqr=True, source='model'):