The plotting is now asynchronous with the main thread as well.

JLuebben · JLuebben · commit df3a0cc8e6de · 2016-08-24T15:01:33.000+02:00
diff --git a/floppy/reportWidget.py b/floppy/reportWidget.py
@@ -92,7 +92,9 @@ def _update(self):
         # url = QtCore.QUrl.fromLocalFile(self.fileBase)
         url = QtCore.QUrl.fromLocalFile(QtCore.QDir(self.fileBase).absoluteFilePath('dummy.html'))
         QtWebKit.QWebSettings.clearMemoryCaches()
-        self.setHtml(tmplt(data, self.cache[:], self.fileBase), url)
+        html = tmplt(data, self.cache[:], self.fileBase)
+        if html:
+            self.setHtml(html, url)
 
 
 @template
diff --git a/floppy/templates.py b/floppy/templates.py
@@ -2,9 +2,12 @@
 import matplotlib.pyplot as plt
 from floppy.reportWidget import template
 from numpy import array, arange
+import threading
+import time
 import os
 
 _pointCache = None
+plotting = False
 
 @template
 def plotTemplate(data, cache, fileBase):
@@ -117,34 +120,72 @@ def programTemplate(data, cache, fileBase):
                                        name, varType, value in data['outputs']]),
                    stdout=data['stdout'].replace('\\n', '<br>'))
 
+
+def plotBars(points, cache, fileName):
+    globals()['_pointCache'] = cache
+    # thisPlot = time.time()
+    # try:
+    #     if thisPlot - lastPlot < 5:
+    #         return
+    # except:
+    #     lastPlot = thisPlot
+    #     return
+    # lastPlot = thisPlot
+    x, y = zip(*points)
+    n_groups = len(x)
+    fig, ax = plt.subplots()
+    index = arange(n_groups)
+    bar_width = 0.35
+    opacity = .4
+    rects1 = plt.bar(index, x, bar_width,
+                     alpha=opacity,
+                     color='b',
+                     label='A')
+    rects2 = plt.bar(index + bar_width, y, bar_width,
+                     alpha=opacity,
+                     color='r',
+                     label='B')
+    plt.xticks(index+bar_width)
+    plt.legend()
+    plt.tight_layout()
+    savefig(fileName)
+    global plotting
+    plotting = False
+
 @template
 def plotBarsGroupedTemplate(data, cache, fileBase):
     points = data['points']
     fileName = fileBase+'/_ppy_{}.svg'.format(data['ID'])
     #fileName = os.path.join(fileBase, '_ppy_{}.svg'.format(data['ID']))
     # fileName = '_ppy_{}.svg'.format(data['ID'])
     # print(fileName)
-
+    global plotting
     if not points == globals()['_pointCache'] and points:
-        x, y = zip(*points)
-        n_groups = len(x)
-        fig, ax = plt.subplots()
-        index = arange(n_groups)
-        bar_width = 0.35
-        opacity = .4
-        rects1 = plt.bar(index, x, bar_width,
-                         alpha=opacity,
-                         color='b',
-                         label='A')
-        rects2 = plt.bar(index + bar_width, y, bar_width,
-                         alpha=opacity,
-                         color='r',
-                         label='B')
-        plt.xticks(index+bar_width)
-        plt.legend()
-        plt.tight_layout()
-        savefig(fileName)
-        globals()['_pointCache'] = cache[:]
+        if not plotting:
+            plotting = True
+            threading.Thread(target=plotBars, args=(points, cache, fileName)).start()
+        else:
+            return None
+        # x, y = zip(*points)
+        # n_groups = len(x)
+        # fig, ax = plt.subplots()
+        # index = arange(n_groups)
+        # bar_width = 0.35
+        # opacity = .4
+        # rects1 = plt.bar(index, x, bar_width,
+        #                  alpha=opacity,
+        #                  color='b',
+        #                  label='A')
+        # rects2 = plt.bar(index + bar_width, y, bar_width,
+        #                  alpha=opacity,
+        #                  color='r',
+        #                  label='B')
+        # plt.xticks(index+bar_width)
+        # plt.legend()
+        # plt.tight_layout()
+        # savefig(fileName)
+        # globals()['_pointCache'] = cache[:]
+
     fileName = '_ppy_{}.svg'.format(data['ID'])
     return """<h1 id="head">{nodeName} -- {nodeID}</h1>
         <style>
