gui: support setting histogram X axis

artiq/gui/displays.py

@@ -5,43 +5,63 @@ import pyqtgraph as pg
 from pyqtgraph import dockarea
 
 
-class _SimpleSettings(QtGui.QDialog):
+class _BaseSettings(QtGui.QDialog):
-    def __init__(self, parent, prev_name, prev_settings,
+    def __init__(self, parent, window_title, prev_name, create_cb):
-                 result_list, create_cb):
         QtGui.QDialog.__init__(self, parent=parent)
-        self.setWindowTitle(self._window_title)
+        self.setWindowTitle(window_title)
 
-        grid = QtGui.QGridLayout()
+        self.grid = QtGui.QGridLayout()
-        self.setLayout(grid)
+        self.setLayout(self.grid)
 
-        grid.addWidget(QtGui.QLabel("Name:"), 0, 0)
+        self.grid.addWidget(QtGui.QLabel("Name:"), 0, 0)
-        self.name = name = QtGui.QLineEdit()
+        self.name = QtGui.QLineEdit()
-        grid.addWidget(name, 0, 1)
+        self.grid.addWidget(self.name, 0, 1)
         if prev_name is not None:
-            name.insert(prev_name)
+            self.name.setText(prev_name)
 
-        grid.addWidget(QtGui.QLabel("Result:"))
+        def on_accept():
-        self.result = result = QtGui.QComboBox()
+            create_cb(self.name.text(), self.get_input())
-        grid.addWidget(result, 1, 1)
+        self.accepted.connect(on_accept)
-        result.addItems(result_list)
-        result.setEditable(True)
-        if "result" in prev_settings:
-            result.setEditText(prev_settings["result"])
 
+    def add_buttons(self):
         buttons = QtGui.QDialogButtonBox(
             QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.Cancel)
-        grid.addWidget(buttons, 2, 0, 1, 2)
+        self.grid.addWidget(buttons, self.grid.rowCount(), 0, 1, 2)
         buttons.accepted.connect(self.accept)
         buttons.rejected.connect(self.reject)
 
-        def on_accept():
-            create_cb(name.text(), {"result": result.currentText()})
-        self.accepted.connect(on_accept)
-
     def accept(self):
-        if self.name.text() and self.result.currentText():
+        if self.name.text() and self.validate_input():
             QtGui.QDialog.accept(self)
 
+    def validate_input(self):
+        raise NotImplementedError
+
+    def get_input(self):
+        raise NotImplementedError
+
+
+class _SimpleSettings(_BaseSettings):
+    def __init__(self, parent, prev_name, prev_settings,
+                 result_list, create_cb):
+        _BaseSettings.__init__(self, parent, self._window_title,
+                               prev_name, create_cb)
+
+        self.grid.addWidget(QtGui.QLabel("Result:"))
+        self.result = QtGui.QComboBox()
+        self.grid.addWidget(self.result, 1, 1)
+        self.result.addItems(result_list)
+        self.result.setEditable(True)
+        if "result" in prev_settings:
+            self.result.setEditText(prev_settings["result"])
+        self.add_buttons()
+
+    def validate_input(self):
+        return bool(self.result.currentText())
+
+    def get_input(self):
+        return {"result": self.result.currentText()}
+
 
 class NumberDisplaySettings(_SimpleSettings):
     _window_title = "Number display"
@@ -95,8 +115,30 @@ class XYDisplay(dockarea.Dock):
         self.plot.plot(y)
 
 
-class HistogramDisplaySettings(_SimpleSettings):
+class HistogramDisplaySettings(_BaseSettings):
-    _window_title = "Histogram"
+    def __init__(self, parent, prev_name, prev_settings,
+                 result_list, create_cb):
+        _BaseSettings.__init__(self, parent, "Histogram",
+                               prev_name, create_cb)
+
+        for row, axis in enumerate("yx"):
+            self.grid.addWidget(QtGui.QLabel(axis.upper() + ":"))
+            w = QtGui.QComboBox()
+            self.grid.addWidget(w, row + 1, 1)
+            if axis == "x":
+                w.addItem("<None>")
+            w.addItems(result_list)
+            w.setEditable(True)
+            if axis in prev_settings:
+                w.setEditText(prev_settings["y"])
+            setattr(self, axis, w)
+        self.add_buttons()
+
+    def validate_input(self):
+        return bool(self.y.currentText()) and bool(self.x.currentText())
+
+    def get_input(self):
+        return {"y": self.y.currentText(), "x": self.x.currentText()}
 
 
 class HistogramDisplay(dockarea.Dock):
@@ -108,19 +150,28 @@ class HistogramDisplay(dockarea.Dock):
         self.addWidget(self.plot)
 
     def data_sources(self):
-        return {self.settings["result"]}
+        s = {self.settings["y"]}
+        if self.settings["x"] != "<None>":
+            s.add(self.settings["x"])
+        return s
 
     def update_data(self, data):
-        result = self.settings["result"]
+        result_y = self.settings["y"]
+        result_x = self.settings["x"]
         try:
-            y = data[result]
+            y = data[result_y]
+            if result_x == "<None>":
+                x = None
+            else:
+                x = data[result_x]
         except KeyError:
             return
-        x = list(range(len(y)+1))
+        if x is None:
-        self.plot.clear()
+            x = list(range(len(y)+1))
-        if not y:
+
-            return
+        if y and len(x) == len(y) + 1:
-        self.plot.plot(x, y, stepMode=True, fillLevel=0, brush=(0, 0, 255, 150))
+            self.plot.clear()
+            self.plot.plot(x, y, stepMode=True, fillLevel=0, brush=(0, 0, 255, 150))
 
 
 display_types = OrderedDict([