pyobs-gui 2.1.0__tar.gz → 2.3.0__tar.gz

{pyobs_gui-2.1.0 → pyobs_gui-2.3.0}/PKG-INFO

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

{pyobs_gui-2.1.0 → pyobs_gui-2.3.0}/pyobs_gui/__init__.py

@@ -17,6 +17,7 @@ from .datadisplaywidget import DataDisplayWidget
 from .coolingwidget import CoolingWidget
 from .shellwidget import ShellWidget
 from .videowidget import VideoWidget
+from .videograbwidget import VideoGrabWidget
 from .focuswidget import FocusWidget
 from .telescopewidget import TelescopeWidget
 from .weatherwidget import WeatherWidget

{pyobs_gui-2.1.0 → pyobs_gui-2.3.0}/pyobs_gui/acquisitionwidget.py

@@ -5,7 +5,7 @@ from typing import Any
 from PySide6 import QtCore, QtWidgets  # type: ignore
 
 os.environ["QT_API"] = "PySide6"
-from matplotlib import pyplot as plt
+from matplotlib.figure import Figure
 from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
 from matplotlib.ticker import MaxNLocator
 
@@ -36,8 +36,14 @@ class AcquisitionWidget(BaseWidget, Ui_AcquisitionWidget):
         self._running = False
         self._result: AcquisitionResult | None = None
 
-        # add plots: distance vs. attempt, and the 2D offset trajectory
-        self.figure, (self.ax, self.ax2) = plt.subplots(1, 2)
+        # add plots: distance vs. attempt, and the 2D offset trajectory -- built via the plain OO
+        # Figure API, not pyplot: pyplot.subplots() does one-time GUI-backend registration (and
+        # can pop up a throwaway Qt window) on its first call anywhere in the process,
+        # synchronously on whatever thread calls it. In this app that's the shared qasync loop,
+        # so the first widget of this kind to open in a session stalls the event loop for
+        # several seconds. Figure() sidesteps pyplot entirely.
+        self.figure = Figure()
+        self.ax, self.ax2 = self.figure.subplots(1, 2)
         layout = QtWidgets.QVBoxLayout(self.framePlot)
         self.canvas = FigureCanvas(self.figure)
         layout.addWidget(self.canvas)

{pyobs_gui-2.1.0 → pyobs_gui-2.3.0}/pyobs_gui/autofocuswidget.py

@@ -5,7 +5,7 @@ from typing import Any
 from PySide6 import QtCore, QtWidgets  # type: ignore
 
 os.environ["QT_API"] = "PySide6"
-from matplotlib import pyplot as plt
+from matplotlib.figure import Figure
 from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
 
 from pyobs.events import Event, FocusFoundEvent
@@ -28,8 +28,10 @@ class AutoFocusWidget(BaseWidget, Ui_AutoFocusWidget):
         self._running = False
         self._last_result: tuple[float, float] | None = None
 
-        # add plot
-        self.figure, self.ax = plt.subplots()
+        # add plot -- built via the plain OO Figure API, not pyplot: see comment in
+        # acquisitionwidget.py for why (avoids a several-second first-use event-loop stall)
+        self.figure = Figure()
+        self.ax = self.figure.add_subplot()
         layout = QtWidgets.QVBoxLayout(self.framePlot)
         self.canvas = FigureCanvas(self.figure)
         layout.addWidget(self.canvas)

{pyobs_gui-2.1.0 → pyobs_gui-2.3.0}/pyobs_gui/autoguidingwidget.py

@@ -7,7 +7,7 @@ from typing import Any
 from PySide6 import QtCore, QtWidgets  # type: ignore
 
 os.environ["QT_API"] = "PySide6"
-from matplotlib import pyplot as plt
+from matplotlib.figure import Figure
 from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
 from matplotlib.ticker import MaxNLocator
 
@@ -37,8 +37,11 @@ class AutoGuidingWidget(BaseWidget, Ui_AutoGuidingWidget):
         self._offset: tuple[float, float] | None = None  # last (lon, lat), arcsec
         self._offset_history: deque[tuple[float, float]] = deque(maxlen=_HISTORY_LENGTH)
 
-        # add plots: offset magnitude vs. sample, and the lon/lat scatter
-        self.figure, (self.ax, self.ax2) = plt.subplots(1, 2)
+        # add plots: offset magnitude vs. sample, and the lon/lat scatter -- built via the plain
+        # OO Figure API, not pyplot: see comment in acquisitionwidget.py for why (avoids a
+        # several-second first-use event-loop stall)
+        self.figure = Figure()
+        self.ax, self.ax2 = self.figure.subplots(1, 2)
         layout = QtWidgets.QVBoxLayout(self.framePlot)
         self.canvas = FigureCanvas(self.figure)
         layout.addWidget(self.canvas)

{pyobs_gui-2.1.0 → pyobs_gui-2.3.0}/pyobs_gui/camerawidget.py

@@ -57,6 +57,15 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
         BaseWidget.__init__(self, **kwargs)
         self.setupUi(self)  # type: ignore
 
+        # scrollArea's horizontal scrollbar is off (this panel should never need to scroll
+        # sideways), but with widgetResizable=True that leaves nothing to widen the scroll area
+        # itself to fit its content -- it was clipping the right edge of every group box
+        # (values/buttons ran past the visible border) because the .ui's Designer-time width hint
+        # (239px) is narrower than the controls' actual required width. Size it from the real
+        # content instead of a hardcoded guess; recomputed again at the end of _init() once
+        # capability-dependent combo boxes (binning, image format) have their real items.
+        self._size_scroll_area_to_content()
+
         # variables
         self.new_image = False
         self.image_filename = None
@@ -130,9 +139,16 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
             self._init_once("data_sequence", self._init_data_sequence),
         )
 
+        # capability-dependent combo boxes (binning, image format) may have widened the panel
+        # further, now that they're populated
+        self._size_scroll_area_to_content()
+
         # update GUI
         self.signal_update_gui.emit()
 
+    def _size_scroll_area_to_content(self) -> None:
+        self.scrollArea.setMinimumWidth(self.scrollAreaWidgetContents.sizeHint().width())
+
     async def _init_window(self) -> None:
         # window
         window_caps = await self.comm.get_capabilities(self.module, IWindow)
@@ -167,7 +183,7 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
                 state = await proxy.wait_for_state(IBinning, timeout=_WAIT_FOR_STATE_TIMEOUT)
                 if state is not None:
                     self.comboBinning.setCurrentText(f"{state.x}x{state.y}")
-        await self.comm.subscribe_state(self.module, IBinning, self._update_binning)
+                await self.comm.subscribe_state(self.module, IBinning, self._update_binning)
 
     async def _init_gain(self) -> None:
         # gain
@@ -177,7 +193,7 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
                 if state is not None:
                     self.spinGain.setValue(state.gain)
                     self.spinGainOffset.setValue(state.offset)
-        await self.comm.subscribe_state(self.module, IGain, self._update_gain)
+                await self.comm.subscribe_state(self.module, IGain, self._update_gain)
 
     async def _init_image_format(self) -> None:
         # image format
@@ -191,7 +207,7 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
                 state = await proxy.wait_for_state(IImageFormat, timeout=_WAIT_FOR_STATE_TIMEOUT)
                 if state is not None:
                     self.comboImageFormat.setCurrentText(state.image_format.name)
-        await self.comm.subscribe_state(self.module, IImageFormat, self._update_image_format)
+                await self.comm.subscribe_state(self.module, IImageFormat, self._update_image_format)
 
     async def _init_image_type(self) -> None:
         # image type
@@ -200,7 +216,7 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
                 state = await proxy.wait_for_state(IImageType, timeout=_WAIT_FOR_STATE_TIMEOUT)
                 if state is not None:
                     self.comboImageType.setCurrentText(state.image_type.name)
-        await self.comm.subscribe_state(self.module, IImageType, self._update_image_type)
+                await self.comm.subscribe_state(self.module, IImageType, self._update_image_type)
 
     async def _init_exposure(self) -> None:
         # exposure (status, progress, time left)
@@ -211,7 +227,7 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
                     self.exposure_status = state.status
                     self.exposure_progress = state.progress
                     self.exposure_time_left = state.exposure_time_left
-        await self.comm.subscribe_state(self.module, IExposure, self._update_exposure)
+                await self.comm.subscribe_state(self.module, IExposure, self._update_exposure)
 
     async def _init_exposure_time(self) -> None:
         # exposure time
@@ -220,7 +236,7 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
                 state = await proxy.wait_for_state(IExposureTime, timeout=_WAIT_FOR_STATE_TIMEOUT)
                 if state is not None:
                     self.spinExpTime.setValue(state.exposure_time)
-        await self.comm.subscribe_state(self.module, IExposureTime, self._update_exposure_time)
+                await self.comm.subscribe_state(self.module, IExposureTime, self._update_exposure_time)
 
     async def _init_data_sequence(self) -> None:
         # data sequence

{pyobs_gui-2.1.0 → pyobs_gui-2.3.0}/pyobs_gui/datadisplaywidget.py

@@ -5,9 +5,9 @@ import os
 from typing import Any, TYPE_CHECKING
 import numpy as np
 from PySide6 import QtWidgets, QtCore  # type: ignore
-from matplotlib import pyplot as plt
 
 os.environ["QT_API"] = "PySide6"
+from matplotlib.figure import Figure
 from matplotlib.backends.backend_qtagg import NavigationToolbar2QT  # pyrefly: ignore [missing-module-attribute]
 from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
 from qfitswidget import QFitsWidget  # type: ignore
@@ -19,7 +19,6 @@ from .base import BaseWidget
 from .qt.datadisplaywidget_ui import Ui_DataDisplayWidget
 
 if TYPE_CHECKING:
-    from matplotlib.figure import Figure
     from matplotlib.axes import Axes
     from astropy.io import fits
 
@@ -66,7 +65,10 @@ class DataDisplayWidget(BaseWidget, Ui_DataDisplayWidget):
         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()
+            # built via the plain OO Figure API, not pyplot: see comment in acquisitionwidget.py
+            # for why (avoids a several-second first-use event-loop stall)
+            self.figure = Figure()
+            self.ax = self.figure.add_subplot()
             self.canvas = FigureCanvas(self.figure)
             self.plotTools = NavigationToolbar2QT(self.canvas, self.tabImage)
             self.imageLayout.addWidget(self.plotTools)

{pyobs_gui-2.1.0 → pyobs_gui-2.3.0}/pyobs_gui/mainwindow.py

@@ -53,6 +53,7 @@ from .telescopewidget import TelescopeWidget
 from .focuswidget import FocusWidget
 from .temperatureswidget import TemperaturesWidget
 from .weatherwidget import WeatherWidget
+from .videograbwidget import VideoGrabWidget
 from .videowidget import VideoWidget
 from .qt.mainwindow_ui import Ui_MainWindow
 from .logmodel import LogModel, LogModelProxy
@@ -83,8 +84,11 @@ class MainWidgetEntry:
     # cross-interface demotion: only promoted into `main` when nothing else matched (D1)
     sidebar_preferred: bool = False
     # same-interface pairing: always rendered together whenever this entry survives into `main`
-    # (D6); no MAIN_WIDGETS entry sets this yet -- first consumer is the VideoWidget split,
-    # tracked separately in specs/2026-09-01-gui-video-widget-split.md
+    # (D6); no MAIN_WIDGETS entry sets this yet. specs/2026-09-01-gui-video-widget-split.md's
+    # original plan was going to be the first consumer, but VideoWidget ended up split into two
+    # independent same-interface entries (see the two IVideo rows below) instead -- each tab is
+    # fully self-contained, with no state to share across a widget boundary, so this mechanism
+    # wasn't needed after all.
     paired_sidebar_widget: Optional[Type[BaseWidget]] = None
 
 
@@ -105,7 +109,16 @@ MAIN_WIDGETS: List[MainWidgetEntry] = [
     MainWidgetEntry(IAcquisition, AcquisitionWidget, "Acquisition", "mdi.target"),
     MainWidgetEntry(IAutoGuiding, AutoGuidingWidget, "Auto guiding", "mdi.crosshairs-gps"),
     MainWidgetEntry(IWeather, WeatherWidget, "Weather", "fa5s.cloud-sun"),
-    MainWidgetEntry(IVideo, VideoWidget, "Video", "fa5s.video", sidebar=((None, FitsHeadersWidget),)),
+    # two entries sharing one interface: collect_main_widgets() matches every entry whose
+    # interface the module implements (D2), so both render as separate tabs for any IVideo
+    # module -- live view and the FITS-grab controls, fully independent widgets/state
+    # (previously one VideoWidget combining both; see
+    # specs/2026-09-01-gui-video-widget-split.md). Note: a custom `widgets:` config entry with
+    # `interface: IVideo` can only ever replace the first of these two matches (mainwindow.py's
+    # replace-in-place lookup keys on interface name, not registry position) -- a known, unused
+    # edge case, not a blocker for this pair.
+    MainWidgetEntry(IVideo, VideoWidget, "Live View", "fa5s.video"),
+    MainWidgetEntry(IVideo, VideoGrabWidget, "FITS Image", "fa5s.image", sidebar=((None, FitsHeadersWidget),)),
     MainWidgetEntry(ISpectrograph, SpectrographWidget, "Spectrograph", "ei.graph"),
     MainWidgetEntry(IFilters, FilterWidget, "Filter wheel", "mdi.air-filter", sidebar_preferred=True),
     MainWidgetEntry(ITemperatures, TemperaturesWidget, "Temperatures", "mdi.thermometer", sidebar_preferred=True),

{pyobs_gui-2.1.0 → pyobs_gui-2.3.0}/pyobs_gui/modewidget.py

@@ -24,6 +24,11 @@ class ModeWidget(BaseWidget, Ui_ModeWidget):
         self._mode_options: dict[str, list[str]] = {}
         self._modes: dict[str, str] = {}
         self._motion_status = MotionStatus.UNKNOWN
+        # whether self.module implements IMotion at all -- an IMode module doesn't have to be a
+        # motion device (e.g. a plain camera's fiber-hole/video-path selector), and gating the
+        # edit button on motion status for one that isn't left it permanently disabled: the
+        # IMotion state subscription below never fires, so _motion_status never leaves UNKNOWN
+        self._has_motion = False
         self._mode_widgets: dict[str, tuple[QtWidgets.QLineEdit, QtWidgets.QToolButton]] = {}
 
         # connect signals
@@ -42,7 +47,9 @@ class ModeWidget(BaseWidget, Ui_ModeWidget):
         await self.register_event(ModeChangedEvent, self._on_mode_changed)
 
     async def _init(self) -> None:
-        await self.comm.subscribe_state(self.module, IMotion, self._on_motion_state)
+        self._has_motion = await self.comm.has_proxy(self.module, IMotion)
+        if self._has_motion:
+            await self.comm.subscribe_state(self.module, IMotion, self._on_motion_state)
 
         # permitted methods (ACLs)
         await self._fetch_permitted_methods()
@@ -80,7 +87,7 @@ class ModeWidget(BaseWidget, Ui_ModeWidget):
     def update_gui(self) -> None:
         self.setEnabled(True)
         self.textStatus.setText(self._motion_status.name)
-        initialized = self._motion_status in [
+        initialized = not self._has_motion or self._motion_status in [
             MotionStatus.SLEWING,
             MotionStatus.TRACKING,
             MotionStatus.IDLE,

pyobs_gui-2.3.0/pyobs_gui/qt/videograbwidget.ui

@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VideoGrabWidget</class>
+ <widget class="QWidget" name="VideoGrabWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>618</width>
+    <height>530</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,0">
+   <item>
+    <widget class="QFrame" name="frame_2">
+     <property name="frameShape">
+      <enum>QFrame::Shape::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Shadow::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QGroupBox" name="groupExposure_2">
+        <property name="title">
+         <string>Exposure</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_5">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="labelImageType">
+           <property name="text">
+            <string>Type:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_9">
+           <property name="text">
+            <string>Count:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QCheckBox" name="checkBroadcast">
+           <property name="text">
+            <string>Broadcast</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0" colspan="2">
+          <widget class="QPushButton" name="buttonGrabImage">
+           <property name="palette">
+            <palette>
+             <active>
+              <colorrole role="Button">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>0</red>
+                 <green>85</green>
+                 <blue>0</blue>
+                </color>
+               </brush>
+              </colorrole>
+              <colorrole role="ButtonText">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>255</red>
+                 <green>255</green>
+                 <blue>255</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </active>
+             <inactive>
+              <colorrole role="Button">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>0</red>
+                 <green>85</green>
+                 <blue>0</blue>
+                </color>
+               </brush>
+              </colorrole>
+              <colorrole role="ButtonText">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>255</red>
+                 <green>255</green>
+                 <blue>255</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </inactive>
+             <disabled>
+              <colorrole role="Button">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>0</red>
+                 <green>85</green>
+                 <blue>0</blue>
+                </color>
+               </brush>
+              </colorrole>
+              <colorrole role="ButtonText">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>0</red>
+                 <green>42</green>
+                 <blue>0</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </disabled>
+            </palette>
+           </property>
+           <property name="text">
+            <string>Grab image</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QSpinBox" name="spinCount">
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>9999</number>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QComboBox" name="comboImageType"/>
+         </item>
+         <item row="4" column="0" colspan="2">
+          <widget class="QPushButton" name="buttonAbort">
+           <property name="palette">
+            <palette>
+             <active>
+              <colorrole role="Button">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>170</red>
+                 <green>0</green>
+                 <blue>0</blue>
+                </color>
+               </brush>
+              </colorrole>
+              <colorrole role="ButtonText">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>0</red>
+                 <green>0</green>
+                 <blue>0</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </active>
+             <inactive>
+              <colorrole role="Button">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>170</red>
+                 <green>0</green>
+                 <blue>0</blue>
+                </color>
+               </brush>
+              </colorrole>
+              <colorrole role="ButtonText">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>0</red>
+                 <green>0</green>
+                 <blue>0</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </inactive>
+             <disabled>
+              <colorrole role="Button">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>170</red>
+                 <green>0</green>
+                 <blue>0</blue>
+                </color>
+               </brush>
+              </colorrole>
+              <colorrole role="ButtonText">
+               <brush brushstyle="SolidPattern">
+                <color alpha="255">
+                 <red>85</red>
+                 <green>0</green>
+                 <blue>0</blue>
+                </color>
+               </brush>
+              </colorrole>
+             </disabled>
+            </palette>
+           </property>
+           <property name="text">
+            <string>Abort sequence</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Orientation::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="labelExposuresLeft">
+        <property name="text">
+         <string>IDLE</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="DataDisplayWidget" name="datadisplay" native="true"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>DataDisplayWidget</class>
+   <extends>QWidget</extends>
+   <header>..datadisplaywidget</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>