Try this

Author: blakeNaccarato

lock.json

@@ -68,7 +68,7 @@ dvc-task==0.4.0
 dvc==3.51.2
 entrypoints==0.4
 executing==2.0.1
-fastjsonschema==2.19.1
+fastjsonschema==2.20.0
 fawltydeps==0.15.0
 filelock==3.15.1
 flatten-dict==0.4.2
@@ -207,6 +207,7 @@ pyside6==6.7.1
 pytest-cov==4.1.0
 pytest-custom-exit-code==0.3.0
 pytest-github-actions-annotate-failures==0.2.0
+pytest-qt==4.4.0
 pytest==8.0.0
 python-dateutil==2.9.0.post0
 pytz==2024.1

requirements/requirements.txt

@@ -24,7 +24,8 @@
     mkQApp,
     setConfigOptions,
 )
-from PySide6.QtCore import QTimer
+from PySide6.QtCore import Qt, QTimer, Signal
+from PySide6.QtGui import QKeyEvent
 from pyvisa import ResourceManager, VisaIOError
 from pyvisa.resources import MessageBasedResource
 from simple_pid import PID
@@ -741,6 +742,17 @@ def write(self):
                 csv_writer.writerow(to_write)
 
 
+class GraphicsLayoutWidgetWithKeySignal(GraphicsLayoutWidget):
+    """Emit key signals on `key_signal`."""
+
+    key_signal = Signal(QKeyEvent)
+
+    def keyPressEvent(self, ev: QKeyEvent):  # noqa: N802
+        """Handle keypresses."""
+        super().keyPressEvent(ev)
+        self.key_signal.emit(ev)
+
+
 class Plotter:
     """A plotter for data.
 
@@ -764,7 +776,9 @@ class Plotter:
     """
 
     def __init__(self, title: str, results: list[Result], row: int = 0, col: int = 0):
-        self.window = GraphicsLayoutWidget()
+        self.window = GraphicsLayoutWidgetWithKeySignal()
+        self.app = mkQApp()
+        self.window.key_signal.connect(self.keyPressEvent)
         self.all_results: list[Result] = []
         self.all_curves: list[PlotCurveItem] = []
         self.all_histories: list[deque[float]] = []
@@ -776,6 +790,12 @@ def __init__(self, title: str, results: list[Result], row: int = 0, col: int = 0
         )
         self.add(title, results, row, col)
 
+    def keyPressEvent(self, ev: QKeyEvent):  # noqa: N802
+        """Handle quit events and propagate keypresses to image views."""
+        if ev.key() in (Qt.Key.Key_Escape, Qt.Key.Key_Q, Qt.Key.Key_Enter):
+            self.app.closeAllWindows()
+            ev.accept()
+
     def add(self, title: str, results: list[Result], row: int, col: int):
         """Plot results to a new pane in the plot window.
 
@@ -831,7 +851,6 @@ class Looper:
     def __init__(
         self, writer: Writer, plotter: Plotter, controller: Controller | None = None
     ):
-        self.app = mkQApp()
         self.writer = writer
         self.plotter = plotter
         self.controller: Controller = controller or None  # type: ignore
@@ -845,8 +864,8 @@ def start(self):
         timer.timeout.connect(self.plot_control if self.controller else self.plot)
         timer.start(POLLING_INTERVAL)
         self.plotter.window.show()
-        self.app.exec()
-        self.app.quit()
+        self.plotter.app.exec()
+        self.plotter.app.quit()
         if self.controller:
             self.controller.close()
 

src/boilerdaq/daq.py

@@ -8,17 +8,13 @@
 from boilercore import WarningFilter, filter_certain_warnings
 from boilercore.paths import get_module_rel, walk_modules
 from boilercore.testing import get_session_path
-from debugpy import is_client_connected
-from PySide6.QtCore import QTimer
-from PySide6.QtWidgets import QApplication
+from PySide6.QtCore import Qt, QTimer
+from PySide6.QtTest import QTest
 
 import boilerdaq
 from boilerdaq import INSTRUMENT
 from boilerdaq.daq import Looper, open_instrument
 
-DEBUG = is_client_connected()
-
-
 STAGES_DIR = Path("src") / "boilerdaq" / "stages"
 STAGES: list[Any] = []
 for module in (f"boilerdaq.{module}" for module in walk_modules(STAGES_DIR)):
@@ -48,7 +44,7 @@ def _disable_power_supply():
 
 
 # Can't be session scope
-@pytest.fixture(autouse=True)
+@pytest.fixture()
 def _filter_certain_warnings():
     """Filter certain warnings."""
     filter_certain_warnings([
@@ -61,11 +57,17 @@ def _filter_certain_warnings():
 
 
 @pytest.fixture(params=STAGES)
-def looper(request: pytest.FixtureRequest):
+def looper(qtbot, request: pytest.FixtureRequest):
     """Test example procedures."""
     module = import_module(request.param)
     looper: Looper = getattr(module, "looper", lambda: None)() or module.main()
-    if not DEBUG:
-        app: QApplication = looper.app
-        QTimer.singleShot(2000, app.closeAllWindows)
+    QTimer.singleShot(
+        2000,
+        lambda: qtbot.keyEvent(
+            QTest.KeyAction.Press,
+            looper.plotter.window,
+            Qt.Key.Key_Escape,
+            Qt.KeyboardModifier.NoModifier,
+        ),
+    )
     return looper

tests/boilerdaq_tests/conftest.py

@@ -8,14 +8,14 @@ version = "0.0.0"
 description = "Tests."
 dependencies = [
     # ? Core testing
-    "debugpy==1.8.1",
     "pytest-cov==4.1.0",
     "pytest-custom-exit-code==0.3.0",
     "pytest-github-actions-annotate-failures==0.2.0",
     "pytest==8.0.0",
     # ? Other testing
     # ? Wheels are missing on Linux for PySide6, `uv` doesn't like it
     "pyside6==6.7.1 ; sys_platform != 'linux'",
+    "pytest-qt==4.4.0",
 ]
 
 [tool.fawltydeps]
@@ -34,4 +34,5 @@ ignore_unused = [
     "pytest-custom-exit-code",
     "pytest-github-actions-annotate-failures",
     "pytest",
+    "pytest-qt",
 ]