pyobs-gui 2.0.0.dev9__tar.gz → 2.0.0.dev11__tar.gz

{pyobs_gui-2.0.0.dev9 → pyobs_gui-2.0.0.dev11}/PKG-INFO

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

{pyobs_gui-2.0.0.dev9 → pyobs_gui-2.0.0.dev11}/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.dev9 → pyobs_gui-2.0.0.dev11}/pyobs_gui/qt/telescopewidget.ui

@@ -1079,6 +1079,9 @@
                  <property name="suffix">
                   <string/>
                  </property>
+                 <property name="decimals">
+                  <number>4</number>
+                 </property>
                  <property name="minimum">
                   <double>0.000000000000000</double>
                  </property>
@@ -1111,6 +1114,9 @@
                  <property name="suffix">
                   <string> °</string>
                  </property>
+                 <property name="decimals">
+                  <number>4</number>
+                 </property>
                  <property name="minimum">
                   <double>0.000000000000000</double>
                  </property>

{pyobs_gui-2.0.0.dev9 → pyobs_gui-2.0.0.dev11}/pyobs_gui/qt/telescopewidget_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'telescopewidget.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.10.1
+## Created by: Qt User Interface Compiler version 6.11.1
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -510,6 +510,7 @@ class Ui_TelescopeWidget(object):
         self.spinMoveHelioprojectiveRadialMu.setObjectName(u"spinMoveHelioprojectiveRadialMu")
         sizePolicy.setHeightForWidth(self.spinMoveHelioprojectiveRadialMu.sizePolicy().hasHeightForWidth())
         self.spinMoveHelioprojectiveRadialMu.setSizePolicy(sizePolicy)
+        self.spinMoveHelioprojectiveRadialMu.setDecimals(4)
         self.spinMoveHelioprojectiveRadialMu.setMinimum(0.000000000000000)
         self.spinMoveHelioprojectiveRadialMu.setMaximum(1.000000000000000)
         self.spinMoveHelioprojectiveRadialMu.setSingleStep(0.100000000000000)
@@ -526,6 +527,7 @@ class Ui_TelescopeWidget(object):
         self.spinMoveHelioprojectiveRadialPsi.setObjectName(u"spinMoveHelioprojectiveRadialPsi")
         sizePolicy.setHeightForWidth(self.spinMoveHelioprojectiveRadialPsi.sizePolicy().hasHeightForWidth())
         self.spinMoveHelioprojectiveRadialPsi.setSizePolicy(sizePolicy)
+        self.spinMoveHelioprojectiveRadialPsi.setDecimals(4)
         self.spinMoveHelioprojectiveRadialPsi.setMinimum(0.000000000000000)
         self.spinMoveHelioprojectiveRadialPsi.setMaximum(359.000000000000000)
 

{pyobs_gui-2.0.0.dev9 → pyobs_gui-2.0.0.dev11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyobs-gui"
-version = "2.0.0.dev9"
+version = "2.0.0.dev11"
 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.dev11/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.dev9 → pyobs_gui-2.0.0.dev11}/uv.lock

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