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

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

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

{pyobs_gui-2.0.0.dev11 → pyobs_gui-2.0.0.dev13}/pyobs_gui/datadisplaywidget.py

@@ -44,6 +44,7 @@ class DataDisplayWidget(BaseWidget, Ui_DataDisplayWidget):
         self.ax: Axes | None = None
         self.canvas: FigureCanvas | None = None
         self.plotTools: NavigationToolbar2QT | None = None
+        self.is_spectrograph = False
 
         # before first update, disable mys
         self.setEnabled(False)
@@ -65,6 +66,7 @@ class DataDisplayWidget(BaseWidget, Ui_DataDisplayWidget):
         # add image panel
         self.imageLayout = QtWidgets.QVBoxLayout(self.tabImage)
         if await self.comm.has_proxy(self.module, ISpectrograph):
+            self.is_spectrograph = True
             self.figure, self.ax = plt.subplots()
             self.canvas = FigureCanvas(self.figure)
             self.plotTools = NavigationToolbar2QT(self.canvas, self.tabImage)
@@ -103,9 +105,9 @@ class DataDisplayWidget(BaseWidget, Ui_DataDisplayWidget):
         if self.data is None:
             return
 
-        if isinstance(self.module, ISpectrograph):
+        if self.is_spectrograph:
             self._plot_spectrum()
-        elif isinstance(self.module, IData) and self.imageView is not None:
+        elif self.imageView is not None:
             self.imageView.display(self.data[0])
 
     def _plot_spectrum(self) -> None:

{pyobs_gui-2.0.0.dev11 → pyobs_gui-2.0.0.dev13}/pyobs_gui/focuswidget.py

@@ -1,3 +1,4 @@
+import asyncio
 import logging
 from typing import Any
 
@@ -66,21 +67,25 @@ class FocusWidget(BaseWidget, Ui_FocusWidget):
         self.butSetFocusOffset.setEnabled(initialized)
         self.butSetFocusBase.setEnabled(initialized)
 
-    @qasync.asyncSlot()  # type: ignore
-    async def _set_focus_base(self) -> None:
+    def _set_focus_base(self) -> None:
         value = self._focus or 0.0
         new_value, ok = QtWidgets.QInputDialog.getDouble(self, "Focus", "New value", value, 0, 100, 2)
         if ok:
-            async with self.comm.proxy(self.module, IFocuser) as proxy:
-                await proxy.set_focus(new_value)
+            asyncio.ensure_future(self._set_focus_base_async(new_value))
 
-    @qasync.asyncSlot()  # type: ignore
-    async def _set_focus_offset(self) -> None:
+    async def _set_focus_base_async(self, new_value: float) -> None:
+        async with self.comm.proxy(self.module, IFocuser) as proxy:
+            await proxy.set_focus(new_value)
+
+    def _set_focus_offset(self) -> None:
         value = self._focus_offset or 0.0
         new_value, ok = QtWidgets.QInputDialog.getDouble(self, "Focus offset", "New value", value, -5, 5, 2)
         if ok:
-            async with self.comm.proxy(self.module, IFocuser) as proxy:
-                await proxy.set_focus_offset(new_value)
+            asyncio.ensure_future(self._set_focus_offset_async(new_value))
+
+    async def _set_focus_offset_async(self, new_value: float) -> None:
+        async with self.comm.proxy(self.module, IFocuser) as proxy:
+            await proxy.set_focus_offset(new_value)
 
     @qasync.asyncSlot()  # type: ignore
     async def _reset_focus_offset(self) -> None:

{pyobs_gui-2.0.0.dev11 → pyobs_gui-2.0.0.dev13}/pyobs_gui/qt/spectrographwidget.ui

@@ -66,6 +66,27 @@
             </property>
            </widget>
           </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayoutCount">
+            <item>
+             <widget class="QLabel" name="labelCount">
+              <property name="text">
+               <string>Count:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="spinCount">
+              <property name="minimum">
+               <number>1</number>
+              </property>
+              <property name="maximum">
+               <number>9999</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
           <item>
            <widget class="QPushButton" name="butExpose">
             <property name="palette">
@@ -1035,6 +1056,7 @@
  <tabstops>
   <tabstop>scrollArea</tabstop>
   <tabstop>checkBroadcast</tabstop>
+  <tabstop>spinCount</tabstop>
   <tabstop>butExpose</tabstop>
   <tabstop>butAbort</tabstop>
  </tabstops>

{pyobs_gui-2.0.0.dev11 → pyobs_gui-2.0.0.dev13}/pyobs_gui/qt/spectrographwidget_ui.py

@@ -17,7 +17,8 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
     QPalette, QPixmap, QRadialGradient, QTransform)
 from PySide6.QtWidgets import (QApplication, QCheckBox, QGroupBox, QHBoxLayout,
     QLabel, QProgressBar, QPushButton, QScrollArea,
-    QSizePolicy, QSpacerItem, QVBoxLayout, QWidget)
+    QSizePolicy, QSpacerItem, QSpinBox, QVBoxLayout,
+    QWidget)
 
 from ..datadisplaywidget import DataDisplayWidget
 from . import resources_rc
@@ -60,6 +61,23 @@ class Ui_SpectrographWidget(object):
 
         self.verticalLayout_3.addWidget(self.checkBroadcast)
 
+        self.horizontalLayoutCount = QHBoxLayout()
+        self.horizontalLayoutCount.setObjectName(u"horizontalLayoutCount")
+        self.labelCount = QLabel(self.groupExposure)
+        self.labelCount.setObjectName(u"labelCount")
+
+        self.horizontalLayoutCount.addWidget(self.labelCount)
+
+        self.spinCount = QSpinBox(self.groupExposure)
+        self.spinCount.setObjectName(u"spinCount")
+        self.spinCount.setMinimum(1)
+        self.spinCount.setMaximum(9999)
+
+        self.horizontalLayoutCount.addWidget(self.spinCount)
+
+
+        self.verticalLayout_3.addLayout(self.horizontalLayoutCount)
+
         self.butExpose = QPushButton(self.groupExposure)
         self.butExpose.setObjectName(u"butExpose")
         palette = QPalette()
@@ -265,7 +283,8 @@ class Ui_SpectrographWidget(object):
 
         self.horizontalLayout_2.setStretch(1, 1)
         QWidget.setTabOrder(self.scrollArea, self.checkBroadcast)
-        QWidget.setTabOrder(self.checkBroadcast, self.butExpose)
+        QWidget.setTabOrder(self.checkBroadcast, self.spinCount)
+        QWidget.setTabOrder(self.spinCount, self.butExpose)
         QWidget.setTabOrder(self.butExpose, self.butAbort)
 
         self.retranslateUi(SpectrographWidget)
@@ -277,6 +296,7 @@ class Ui_SpectrographWidget(object):
         SpectrographWidget.setWindowTitle(QCoreApplication.translate("SpectrographWidget", u"Form", None))
         self.groupExposure.setTitle(QCoreApplication.translate("SpectrographWidget", u"Exposure", None))
         self.checkBroadcast.setText(QCoreApplication.translate("SpectrographWidget", u"Broadcast", None))
+        self.labelCount.setText(QCoreApplication.translate("SpectrographWidget", u"Count:", None))
         self.butExpose.setText(QCoreApplication.translate("SpectrographWidget", u"Expose", None))
         self.butAbort.setText(QCoreApplication.translate("SpectrographWidget", u"Abort", None))
         self.labelStatus.setText(QCoreApplication.translate("SpectrographWidget", u"IDLE", None))

{pyobs_gui-2.0.0.dev11 → pyobs_gui-2.0.0.dev13}/pyobs_gui/spectrographwidget.py

@@ -29,6 +29,7 @@ class SpectrographWidget(BaseWidget, Ui_SpectrographWidget):
 
         # cached state
         self.exposure_status = ExposureStatus.IDLE
+        self.exposures_left = 0
 
         # before first update, disable myself
         self.setEnabled(False)
@@ -61,11 +62,20 @@ class SpectrographWidget(BaseWidget, Ui_SpectrographWidget):
     @qasync.asyncSlot()  # type: ignore
     async def grab_spectrum(self) -> None:
         broadcast = self.checkBroadcast.isChecked()
-        await self.datadisplay.grab_data(broadcast)
+
+        # take the requested number of spectra; an exception (e.g. from a failed exposure,
+        # or abort() zeroing exposures_left mid-loop) stops the sequence
+        self.exposures_left = self.spinCount.value()
         self.signal_update_gui.emit()
+        while self.exposures_left > 0:
+            await self.datadisplay.grab_data(broadcast)
+            self.exposures_left -= 1
+            self.signal_update_gui.emit()
 
     @qasync.asyncSlot()  # type: ignore
     async def abort(self) -> None:
+        # stop the sequence after the current spectrum finishes aborting
+        self.exposures_left = 0
         async with self.comm.proxy(self.module, IAbortable) as proxy:
             await proxy.abort()
 
@@ -75,6 +85,13 @@ class SpectrographWidget(BaseWidget, Ui_SpectrographWidget):
         self.butExpose.setEnabled(self.exposure_status == ExposureStatus.IDLE)
         self.butAbort.setEnabled(self.exposure_status != ExposureStatus.IDLE)
 
+        self.butAbort.setText("Abort sequence" if self.exposures_left > 1 else "Abort")
+
+        if self.exposures_left > 0:
+            self.labelExposuresLeft.setText(f"{self.exposures_left} spectrum/spectra left")
+        else:
+            self.labelExposuresLeft.setText("")
+
         msg = ""
         if self.exposure_status == ExposureStatus.IDLE:
             self.progressExposure.setValue(0)

{pyobs_gui-2.0.0.dev11 → pyobs_gui-2.0.0.dev13}/pyobs_gui/weatherwidget.py

@@ -1,6 +1,6 @@
 import os
 from collections import deque
-from typing import Any, Deque, Dict, Tuple, TYPE_CHECKING
+from typing import Any, cast, Deque, Dict, Tuple, TYPE_CHECKING
 from PySide6 import QtWidgets, QtGui, QtCore  # type: ignore
 import logging
 
@@ -16,6 +16,7 @@ from .base import BaseWidget
 
 if TYPE_CHECKING:
     from pyobs.utils.time import Time
+    from matplotlib.axes import Axes
 
 
 log = logging.getLogger(__name__)
@@ -186,9 +187,8 @@ class WeatherWidget(BaseWidget, Ui_WeatherWidget):
             self.canvas.draw()
             return
 
-        axes = self.figure.subplots(len(sensors), 1, sharex=True)
-        if len(sensors) == 1:
-            axes = [axes]
+        subplots = self.figure.subplots(len(sensors), 1, sharex=True)
+        axes = cast("list[Axes]", [subplots] if len(sensors) == 1 else list(subplots))
         for ax, sensor in zip(axes, sensors, strict=True):
             times, values = zip(*self._history[sensor], strict=True)
             ax.plot([t.to_datetime() for t in times], values, color="tab:blue")

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

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

@@ -35,7 +35,7 @@ class FakeComm:
 def make_widget(data_sequence_proxy) -> CameraWidget:
     widget = CameraWidget()
     widget.modules = ["camera"]
-    widget._comm = FakeComm(data_sequence_proxy=data_sequence_proxy)
+    widget._comm = FakeComm(data_sequence_proxy=data_sequence_proxy)  # pyrefly: ignore [bad-assignment]
     widget.datadisplay.grab_data = AsyncMock()
     return widget