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

Timestamp:

Apr 6, 2017 10:03:48 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:

d70f6d2

Parents:

07b50df9

Message:

Threaded plot drawing

However, need a status update as it looks like the plot has hung

File:

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

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

@@ -12 +12 @@
 import logging
 import traceback
+
+from Queue import Queue
+from threading import Thread
 
 from collections import defaultdict
@@ -239 +242 @@
         self.set_layout()
 
+        # Putting matplotlib in the background so as not to hang the interface
+        self.threadedDrawQueue = Queue()
+
+        self.threadedDrawWorker = Thread(target = self._threaded_draw_worker, args = (self.threadedDrawQueue,))
+        self.threadedDrawWorker.setDaemon(True)
+        self.threadedDrawWorker.start()
+
+
     def set_index_model(self, index):
         """
@@ -1691 +1702 @@
         :param chisqr: update chisqr value [bool]
         """
-        wx.CallAfter(self._draw_model_after, update_chisqr, source)
+        self.threadedDrawQueue.put([update_chisqr, source])
+
+    def _threaded_draw_worker(self, threadedDrawQueue):
+        while True:
+            inputVariables = threadedDrawQueue.get()
+            self._draw_model_after(inputVariables[0], inputVariables[1])
+            self.threadedDrawQueue.task_done()
 
     def _draw_model_after(self, update_chisqr=True, source='model'):