pyobs-gui 2.0.0.dev8__tar.gz → 2.0.0.dev10__tar.gz

{pyobs_gui-2.0.0.dev8 → pyobs_gui-2.0.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobs-gui
-Version: 2.0.0.dev8
+Version: 2.0.0.dev10
 Summary: A remote GUI for pyobs
 Author-email: Tim-Oliver Husser <thusser@uni-goettingen.de>
 License-Expression: MIT

{pyobs_gui-2.0.0.dev8 → pyobs_gui-2.0.0.dev10}/pyobs_gui/acquisitionwidget.py

@@ -123,19 +123,28 @@ class AcquisitionWidget(BaseWidget, Ui_AcquisitionWidget):
             xlabel, ylabel = "Offset 1 [deg]", "Offset 2 [deg]"
         if points:
             xs, ys = zip(*points, strict=True)
-            self.ax2.axhline(0, color="gray", linewidth=0.5)
-            self.ax2.axvline(0, color="gray", linewidth=0.5)
             self.ax2.plot(xs, ys, marker="o", color="tab:orange")
             self.ax2.plot(xs[0], ys[0], marker="s", color="tab:red", markersize=8, linestyle="", label="start")
             self.ax2.plot(xs[-1], ys[-1], marker="*", color="tab:green", markersize=12, linestyle="", label="latest")
             self.ax2.legend(fontsize="small")
-            self.ax2.set_aspect("equal", adjustable="datalim")
         self.ax2.set_xlabel(xlabel)
         self.ax2.set_ylabel(ylabel)
         self.ax2.grid(linestyle=":", alpha=0.5)
         self.ax2.set_axisbelow(True)
 
         self.figure.tight_layout()
+
+        if points:
+            # lock in the aspect/view from the actual data -- after tight_layout, so the axes
+            # box size is already final -- before adding the crosshair lines below, which
+            # otherwise feed (0, 0) into the data limits and force the plot to zoom out to
+            # include the origin even when every point is far from it
+            self.ax2.set_aspect("equal", adjustable="datalim")
+            self.ax2.apply_aspect()
+            self.ax2.autoscale(False)
+            self.ax2.axhline(0, color="gray", linewidth=0.5, zorder=0)
+            self.ax2.axvline(0, color="gray", linewidth=0.5, zorder=0)
+
         self.canvas.draw()
 
     @qasync.asyncSlot()  # type: ignore

{pyobs_gui-2.0.0.dev8 → pyobs_gui-2.0.0.dev10}/pyobs_gui/camerawidget.py

@@ -332,13 +332,17 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
         self.exposures_left = self.spinCount.value()
         broadcast = self.checkBroadcast.isChecked()
 
-        # if the module can grab a counted sequence server-side, let it
-        async with self.comm.safe_proxy(self.module, IDataSequence) as proxy:
-            if proxy is not None:
-                await proxy.grab_sequence(self.exposures_left, broadcast)
-                return
+        # if the module can grab a counted sequence server-side, let it -- but only when
+        # broadcasting, since grab_sequence() doesn't hand filenames back to the caller and
+        # the client has no other way to learn an image is ready to display
+        if broadcast:
+            async with self.comm.safe_proxy(self.module, IDataSequence) as proxy:
+                if proxy is not None:
+                    await proxy.grab_sequence(self.exposures_left, broadcast)
+                    return
 
-        # fall back to a client-side loop for modules that don't support IDataSequence
+        # fall back to a client-side loop for modules that don't support IDataSequence, or
+        # when not broadcasting (grab_data() returns the filename directly for display)
         while self.exposures_left > 0:
             await self.datadisplay.grab_data(broadcast)
             self.exposures_left -= 1

{pyobs_gui-2.0.0.dev8 → pyobs_gui-2.0.0.dev10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyobs-gui"
-version = "2.0.0.dev8"
+version = "2.0.0.dev10"
 description = "A remote GUI for pyobs"
 authors = [{ name = "Tim-Oliver Husser", email = "thusser@uni-goettingen.de" }]
 requires-python = ">=3.11,<3.14"

pyobs_gui-2.0.0.dev10/tests/test_camerawidget.py

@@ -0,0 +1,85 @@
+from types import SimpleNamespace
+from unittest.mock import AsyncMock
+
+import pytest
+
+from pyobs.interfaces import IDataSequence
+from pyobs_gui.camerawidget import CameraWidget
+
+
+class _AsyncProxyCM:
+    """Mimics Comm.safe_proxy()'s async context manager, yielding a fixed proxy (or None)."""
+
+    def __init__(self, value):
+        self._value = value
+
+    async def __aenter__(self):
+        return self._value
+
+    async def __aexit__(self, *exc_info):
+        return False
+
+
+class FakeComm:
+    """Only implements what CameraWidget.expose() touches; every optional interface except
+    IDataSequence resolves to "not supported" (proxy is None)."""
+
+    def __init__(self, data_sequence_proxy=None):
+        self._data_sequence_proxy = data_sequence_proxy
+
+    def safe_proxy(self, module, interface):
+        value = self._data_sequence_proxy if interface is IDataSequence else None
+        return _AsyncProxyCM(value)
+
+
+def make_widget(data_sequence_proxy) -> CameraWidget:
+    widget = CameraWidget()
+    widget.modules = ["camera"]
+    widget._comm = FakeComm(data_sequence_proxy=data_sequence_proxy)
+    widget.datadisplay.grab_data = AsyncMock()
+    return widget
+
+
+@pytest.mark.asyncio
+async def test_expose_uses_server_side_sequence_when_broadcasting(qapp) -> None:
+    proxy = SimpleNamespace(grab_sequence=AsyncMock())
+    widget = make_widget(proxy)
+    widget.checkBroadcast.setChecked(True)
+    widget.spinCount.setValue(3)
+
+    await widget.expose()
+
+    proxy.grab_sequence.assert_awaited_once_with(3, True)
+    widget.datadisplay.grab_data.assert_not_called()
+    widget.close()
+
+
+@pytest.mark.asyncio
+async def test_expose_falls_back_to_client_side_loop_when_not_broadcasting(qapp) -> None:
+    """Regression test: grab_sequence() has no way to hand a filename back to the caller, so
+    without broadcasting, taking the server-side sequence path would leave the GUI with no way
+    to learn an image is ready and nothing would ever be displayed (issue #122)."""
+    proxy = SimpleNamespace(grab_sequence=AsyncMock())
+    widget = make_widget(proxy)
+    widget.checkBroadcast.setChecked(False)
+    widget.spinCount.setValue(2)
+
+    await widget.expose()
+
+    proxy.grab_sequence.assert_not_called()
+    assert widget.datadisplay.grab_data.await_count == 2
+    widget.datadisplay.grab_data.assert_awaited_with(False)
+    widget.close()
+
+
+@pytest.mark.asyncio
+async def test_expose_falls_back_when_module_has_no_data_sequence_support(qapp) -> None:
+    widget = make_widget(data_sequence_proxy=None)
+    widget.checkBroadcast.setChecked(True)
+    widget.spinCount.setValue(1)
+
+    await widget.expose()
+
+    assert widget.datadisplay.grab_data.await_count == 1
+    widget.datadisplay.grab_data.assert_awaited_with(True)
+    widget.close()

{pyobs_gui-2.0.0.dev8 → pyobs_gui-2.0.0.dev10}/uv.lock

@@ -2375,7 +2375,7 @@ wheels = [
 
 [[package]]
 name = "pyobs-gui"
-version = "2.0.0.dev8"
+version = "2.0.0.dev10"
 source = { editable = "." }
 dependencies = [
     { name = "astroplan" },