From e37e0bdc1c5a7c2ca30457e591387783ac34c178 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 13 Jan 2016 05:52:33 -0700
Subject: [PATCH] applets/plot_xy_hist: use applets.simple and datasets

---
 artiq/applets/plot_xy_hist.py | 87 ++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 36 deletions(-)

diff --git a/artiq/applets/plot_xy_hist.py b/artiq/applets/plot_xy_hist.py
index 71edd43be..b74dd724d 100755
--- a/artiq/applets/plot_xy_hist.py
+++ b/artiq/applets/plot_xy_hist.py
@@ -1,69 +1,84 @@
 #!/usr/bin/env python3.5
 
-from pyqtgraph.Qt import QtGui, QtCore
-import pyqtgraph as pg
-
 import numpy as np
+import pyqtgraph
 
-class XYHistPlot:
-    def __init__(self):
-        self.graphics_window = pg.GraphicsWindow(title="XY/Histogram")
-        self.graphics_window.resize(1000,600)
-        self.graphics_window.setWindowTitle("XY/Histogram")
+from artiq.applets.simple import SimpleApplet
 
-        self.xy_plot = self.graphics_window.addPlot()
+
+class XYHistPlot(pyqtgraph.GraphicsWindow):
+    def __init__(self, args):
+        pyqtgraph.GraphicsWindow.__init__(self, title="XY/Histogram")
+        self.resize(1000,600)
+        self.setWindowTitle("XY/Histogram")
+
+        self.xy_plot = self.addPlot()
         self.xy_plot_data = None
         self.arrow = None
 
-        self.hist_plot = self.graphics_window.addPlot()
+        self.hist_plot = self.addPlot()
         self.hist_plot_data = None
 
-    def set_data(self, xs, histograms_bins, histograms_counts):
+        self.args = args
+
+    def _set_full_data(self, xs, histogram_bins, histograms_counts):
+        self.xy_plot.clear()
+        self.hist_plot.clear()
+        self.xy_plot_data = None
+        self.hist_plot_data = None
+        self.arrow = None
+
+        self.histogram_bins = histogram_bins
+        bin_centers = np.empty(len(histogram_bins)-1)
+        for i in range(len(bin_centers)):
+            bin_centers[i] = (histogram_bins[i] + histogram_bins[i+1])/2
+
         ys = np.empty_like(xs)
-        ys.fill(np.nan)
-        for n, (bins, counts) in enumerate(zip(histograms_bins,
-                                               histograms_counts)):
-            bin_centers = np.empty(len(bins)-1)
-            for i in range(len(bin_centers)):
-                bin_centers[i] = (bins[i] + bins[i+1])/2
-            ys[n] = sum(bin_centers*counts)/sum(bin_centers)
+        for n, counts in enumerate(histograms_counts):
+            ys[n] = sum(bin_centers*counts)/sum(counts)
 
         self.xy_plot_data = self.xy_plot.plot(x=xs, y=ys,
                                               pen=None,
                                               symbol="x", symbolSize=20)
-        self.xy_plot_data.sigPointsClicked.connect(self.point_clicked)
-        for point, bins, counts in zip(self.xy_plot_data.scatter.points(),
-                                       histograms_bins, histograms_counts):
-            point.histogram_bins = bins
+        self.xy_plot_data.sigPointsClicked.connect(self._point_clicked)
+        for point, counts in zip(self.xy_plot_data.scatter.points(),
+                                 histograms_counts):
             point.histogram_counts = counts
 
         self.hist_plot_data = self.hist_plot.plot(
-                            stepMode=True, fillLevel=0,
-                            brush=(0, 0, 255, 150))
+            stepMode=True, fillLevel=0,
+            brush=(0, 0, 255, 150))
 
-    def point_clicked(self, data_item, spot_items):
+    def _point_clicked(self, data_item, spot_items):
         spot_item = spot_items[0]
         position = spot_item.pos()
         if self.arrow is None:
-            self.arrow = pg.ArrowItem(angle=-120, tipAngle=30, baseAngle=20,
-                                      headLen=40, tailLen=40, tailWidth=8,
-                                      pen=None, brush="y")
+            self.arrow = pyqtgraph.ArrowItem(
+                angle=-120, tipAngle=30, baseAngle=20, headLen=40,
+                tailLen=40, tailWidth=8, pen=None, brush="y")
             self.arrow.setPos(position)
             # NB: temporary glitch if addItem is done before setPos
             self.xy_plot.addItem(self.arrow)
         else:
             self.arrow.setPos(position)
-        self.hist_plot_data.setData(x=spot_item.histogram_bins,
+        self.hist_plot_data.setData(x=self.histogram_bins,
                                     y=spot_item.histogram_counts)
+
+    def data_changed(self, data, mods):
+        xs = data[self.args.xs][1]
+        histogram_bins = data[self.args.histogram_bins][1]
+        histograms_counts = data[self.args.histograms_counts][1]
+        self._set_full_data(xs, histogram_bins, histograms_counts)
         
 
 def main():
-    app = QtGui.QApplication([])
-    plot = XYHistPlot()
-    plot.set_data(np.array([1, 2, 3, 4, 1]),
-                  np.array([[1, 2, 3], [1, 2, 3], [1, 2, 3], [40, 70, 100], [4, 7, 10, 20]]),
-                  np.array([[1, 1], [2, 3], [10, 20], [3, 1], [100, 67, 102]]))
-    app.exec_()
+    applet = SimpleApplet(XYHistPlot)
+    applet.add_dataset("xs", "1D array of point abscissas")
+    applet.add_dataset("histogram_bins",
+                       "1D array of histogram bin boundaries")
+    applet.add_dataset("histograms_counts",
+                       "2D array of histogram counts, for each point")
+    applet.run()
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()