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

Timestamp:

Apr 6, 2017 12:42:32 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:

5c6002a

Parents:

922ef55

Message:

End of day commit

This is rejecting and accepting calculations from the GUI as desired,
will remove print statements and test this tomorrow.

File:

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

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

@@ -1709 +1709 @@
         # # 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):
@@ -1717 +1718 @@
                     print 'here'
                 else:
+                    while self.threadedDrawQueue.empty() != True:
+                        self.threadedDrawQueue.get()
+                        self.threadedDrawQueue.task_done()
+
+                    self.threadedDrawQueue.put([update_chisqr, source])
                     print 'rejected'
+        
         else:
             self.threadedDrawQueue.put([update_chisqr, source])
@@ -1725 +1732 @@
     def _threaded_draw_worker(self, threadedDrawQueue):
         while True:
-            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()
+            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
+            else:
+                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'
 
     def _draw_model_after(self, update_chisqr=True, source='model'):