pyobs-gui 2.0.0.dev3__py3-none-any.whl → 2.0.0.dev4__py3-none-any.whl

pyobs_gui/camerawidget.py

@@ -17,7 +17,6 @@ from pyobs.interfaces import (
     IBinning,
     BinningState,
     IWindow,
-    WindowState,
     IFilters,
     ICooling,
     ITemperatures,
@@ -58,13 +57,6 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
         self.exposure_time_left = 0.0
         self.exposure_progress = 0.0
 
-        self.spinWindowLeft.init_modified(self.labelWindowLeft).committed.connect(self._window_changed)
-        self.spinWindowTop.init_modified(self.labelWindowTop).committed.connect(self._window_changed)
-        self.spinWindowWidth.init_modified(self.labelWindowWidth).committed.connect(self._window_changed)
-        self.spinWindowHeight.init_modified(self.labelWindowHeight).committed.connect(self._window_changed)
-        self.spinGain.init_modified(self.labelGain).committed.connect(self._gain_changed)
-        self.spinGainOffset.init_modified(self.labelGain).committed.connect(self._gain_changed)
-
     async def open(
         self,
         modules: list[str] | None = None,
@@ -80,7 +72,7 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
         image_types = sorted([it.name for it in ImageType])
         self.comboImageType.addItems(image_types)
 
-        # before first update, disable mys
+        # before first update, disable myself
         self.setEnabled(False)
 
         # hide groups, if necessary
@@ -118,10 +110,25 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
 
     async def _init(self) -> None:
         # window
+        window_caps = await self.comm.get_capabilities(self.module, IWindow)
+        if window_caps is not None:
+            self.spinWindowLeft.setMaximum(int(window_caps.full_frame_width))
+            self.spinWindowTop.setMaximum(int(window_caps.full_frame_height))
+            self.spinWindowWidth.setMaximum(int(window_caps.full_frame_width))
+            self.spinWindowHeight.setMaximum(int(window_caps.full_frame_height))
         async with self.comm.safe_proxy(self.module, IWindow) as proxy:
             if proxy is not None:
-                await self.comm.subscribe_state(self.module, IWindow, self._update_window)
-                await self.set_full_frame()
+                state = await proxy.wait_for_state(IWindow)
+                if state is not None:
+                    self.spinWindowLeft.setValue(state.x)
+                    self.spinWindowTop.setValue(state.y)
+                    self.spinWindowWidth.setValue(state.width)
+                    self.spinWindowHeight.setValue(state.height)
+                elif window_caps is not None:
+                    self.spinWindowLeft.setValue(window_caps.full_frame_x)
+                    self.spinWindowTop.setValue(window_caps.full_frame_y)
+                    self.spinWindowWidth.setValue(window_caps.full_frame_width)
+                    self.spinWindowHeight.setValue(window_caps.full_frame_height)
 
         # binning
         binning_caps = await self.comm.get_capabilities(self.module, IBinning)
@@ -129,11 +136,21 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
             binnings = [f"{b.x}x{b.y}" for b in binning_caps.binnings]
             self.comboBinning.clear()
             self.comboBinning.addItems(binnings)
-            await self.comm.subscribe_state(self.module, IBinning, self._update_binning)
+        async with self.comm.safe_proxy(self.module, IBinning) as proxy:
+            if proxy is not None:
+                state = await proxy.wait_for_state(IBinning)
+                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)
 
-        # gain — initial values delivered by subscription callback
-        if await self.comm.has_proxy(self.module, IGain):
-            await self.comm.subscribe_state(self.module, IGain, self._update_gain)
+        # gain
+        async with self.comm.safe_proxy(self.module, IGain) as proxy:
+            if proxy is not None:
+                state = await proxy.wait_for_state(IGain)
+                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)
 
         # image format
         image_format_caps = await self.comm.get_capabilities(self.module, IImageFormat)
@@ -141,38 +158,52 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
             image_formats = [ImageFormat(f) for f in image_format_caps.image_formats]
             self.comboImageFormat.clear()
             self.comboImageFormat.addItems([f.name for f in image_formats])
-            await self.comm.subscribe_state(self.module, IImageFormat, self._update_image_format)
+        async with self.comm.safe_proxy(self.module, IImageFormat) as proxy:
+            if proxy is not None:
+                state = await proxy.wait_for_state(IImageFormat)
+                if state is not None:
+                    self.comboImageFormat.setCurrentText(state.image_format.name)
+        await self.comm.subscribe_state(self.module, IImageFormat, self._update_image_format)
 
+        # image type
         async with self.comm.safe_proxy(self.module, IImageType) as proxy:
             if proxy is not None:
-                await self.comm.subscribe_state(self.module, IImageType, self._update_image_type)
+                state = await proxy.wait_for_state(IImageType)
+                if state is not None:
+                    self.comboImageType.setCurrentText(state.image_type.name)
+        await self.comm.subscribe_state(self.module, IImageType, self._update_image_type)
 
+        # exposure (status, progress, time left)
         async with self.comm.safe_proxy(self.module, IExposure) as proxy:
             if proxy is not None:
-                await self.comm.subscribe_state(self.module, IExposure, self._update_exposure)
-
+                state = await proxy.wait_for_state(IExposure)
+                if state is not None:
+                    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)
+
+        # exposure time
         async with self.comm.safe_proxy(self.module, IExposureTime) as proxy:
             if proxy is not None:
-                await self.comm.subscribe_state(self.module, IExposureTime, self._update_exposure_time)
+                state = await proxy.wait_for_state(IExposureTime)
+                if state is not None:
+                    self.spinExpTime.setValue(state.exposure_time)
+        await self.comm.subscribe_state(self.module, IExposureTime, self._update_exposure_time)
 
+        # data sequence
         if await self.comm.has_proxy(self.module, IDataSequence):
             await self.comm.subscribe_state(self.module, IDataSequence, self._update_sequence)
 
         # update GUI
         self.signal_update_gui.emit()
 
-    def _update_window(self, state: WindowState):
-        self.labelWindowLeft.setText(str(state.x))
-        self.labelWindowTop.setText(str(state.y))
-        self.labelWindowWidth.setText(str(state.width))
-        self.labelWindowHeight.setText(str(state.height))
-
     def _update_binning(self, state: BinningState):
         self.comboBinning.setCurrentText(f"{state.x}x{state.y}")
 
     def _update_gain(self, state: GainState):
-        self.labelGain.setText(str(state.gain))
-        self.labelGainOffset.setText(str(state.offset))
+        self.spinGain.setValue(state.gain)
+        self.spinGainOffset.setValue(state.offset)
 
     def _update_image_format(self, state: ImageFormatState):
         self.comboImageFormat.setCurrentText(state.image_format.name)
@@ -194,14 +225,6 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
         self.exposures_left = state.count_left
         self.update_gui()
 
-    @qasync.asyncSlot()
-    async def _window_changed(self):
-        print("ok")
-
-    @qasync.asyncSlot()
-    async def _gain_changed(self):
-        print("ok")
-
     @qasync.asyncSlot()  # type: ignore
     async def set_full_frame(self) -> None:
         caps = await self.comm.get_capabilities(self.module, IWindow)
@@ -247,18 +270,75 @@ class CameraWidget(BaseWidget, Ui_CameraWidget):
 
     @qasync.asyncSlot()  # type: ignore
     async def expose(self) -> None:
+        # set binning
+        async with self.comm.safe_proxy(self.module, IBinning) as proxy:
+            if proxy is not None:
+                binning = int(self.comboBinning.currentText()[0])
+                try:
+                    await proxy.set_binning(binning, binning)
+                except Exception:
+                    log.exception("bla")
+                    QtWidgets.QMessageBox.information(self, "Error", "Could not set binning.")
+                    return
+            else:
+                binning = 1
+
+        # set window
+        async with self.comm.safe_proxy(self.module, IWindow) as proxy:
+            if proxy is not None:
+                left, top = self.spinWindowLeft.value(), self.spinWindowTop.value()
+                width, height = self.spinWindowWidth.value(), self.spinWindowHeight.value()
+                try:
+                    await proxy.set_window(left, top, width * binning, height * binning)
+                except Exception:
+                    QtWidgets.QMessageBox.information(self, "Error", "Could not set window.")
+                    return
+
+        # set image format
+        async with self.comm.safe_proxy(self.module, IImageFormat) as proxy:
+            if proxy is not None:
+                image_format = ImageFormat[self.comboImageFormat.currentText()]
+                await proxy.set_image_format(image_format)
+
+        # set exposure time
+        async with self.comm.safe_proxy(self.module, IExposureTime) as proxy:
+            if proxy is not None:
+                # get exp_time
+                exp_time = self.spinExpTime.value()
+
+                # unit
+                if self.comboExpTimeUnit.currentText() == "ms":
+                    exp_time /= 1e3
+                elif self.comboExpTimeUnit.currentText() == "µs":
+                    exp_time /= 1e6
+
+                # set it
+                await proxy.set_exposure_time(exp_time)
+
+        # set gain and offset
+        async with self.comm.safe_proxy(self.module, IGain) as proxy:
+            if proxy is not None:
+                await proxy.set_gain(self.spinGain.value())
+                await proxy.set_offset(self.spinGainOffset.value())
+
+        # set image type
+        image_type = ImageType.OBJECT
+        async with self.comm.safe_proxy(self.module, IImageType) as proxy:
+            if proxy is not None:
+                image_type = ImageType(self.comboImageType.currentText().lower())
+                await proxy.set_image_type(image_type)
+
+        # set initial image count
+        self.exposures_left = self.spinCount.value()
         broadcast = self.checkBroadcast.isChecked()
-        count = self.spinCount.value()
 
-        # if the module can grab a counted sequence server-side, let it -- progress comes
-        # back via the DataSequenceState subscription
+        # 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(count, broadcast)
+                await proxy.grab_sequence(self.exposures_left, broadcast)
                 return
 
         # fall back to a client-side loop for modules that don't support IDataSequence
-        self.exposures_left = count
         while self.exposures_left > 0:
             await self.datadisplay.grab_data(broadcast)
             self.exposures_left -= 1

pyobs_gui/qt/camerawidget.ui

@@ -33,7 +33,7 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>238</width>
+        <width>239</width>
         <height>748</height>
        </rect>
       </property>
@@ -64,7 +64,7 @@
            </widget>
           </item>
           <item row="2" column="2">
-           <widget class="ModifiedSpinBox" name="spinWindowWidth">
+           <widget class="QSpinBox" name="spinWindowWidth">
             <property name="minimum">
              <number>1</number>
             </property>
@@ -74,7 +74,7 @@
            </widget>
           </item>
           <item row="0" column="2">
-           <widget class="ModifiedSpinBox" name="spinWindowLeft">
+           <widget class="QSpinBox" name="spinWindowLeft">
             <property name="maximum">
              <number>9999</number>
             </property>
@@ -109,14 +109,14 @@
            </widget>
           </item>
           <item row="1" column="2">
-           <widget class="ModifiedSpinBox" name="spinWindowTop">
+           <widget class="QSpinBox" name="spinWindowTop">
             <property name="maximum">
              <number>9999</number>
             </property>
            </widget>
           </item>
           <item row="3" column="2">
-           <widget class="ModifiedSpinBox" name="spinWindowHeight">
+           <widget class="QSpinBox" name="spinWindowHeight">
             <property name="minimum">
              <number>1</number>
             </property>
@@ -126,54 +126,54 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="WatchedLabel" name="labelWindowLeft">
+           <widget class="QLabel" name="labelWindowLeft">
             <property name="frameShape">
-             <enum>QFrame::Shape::NoFrame</enum>
+             <enum>QFrame::Shape::Box</enum>
             </property>
             <property name="text">
              <string>-</string>
             </property>
             <property name="alignment">
-             <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
+             <set>Qt::AlignmentFlag::AlignCenter</set>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="WatchedLabel" name="labelWindowTop">
+           <widget class="QLabel" name="labelWindowTop">
             <property name="frameShape">
-             <enum>QFrame::Shape::NoFrame</enum>
+             <enum>QFrame::Shape::Box</enum>
             </property>
             <property name="text">
              <string>-</string>
             </property>
             <property name="alignment">
-             <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
+             <set>Qt::AlignmentFlag::AlignCenter</set>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="WatchedLabel" name="labelWindowWidth">
+           <widget class="QLabel" name="labelWindowWidth">
             <property name="frameShape">
-             <enum>QFrame::Shape::NoFrame</enum>
+             <enum>QFrame::Shape::Box</enum>
             </property>
             <property name="text">
              <string>-</string>
             </property>
             <property name="alignment">
-             <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
+             <set>Qt::AlignmentFlag::AlignCenter</set>
             </property>
            </widget>
           </item>
           <item row="3" column="1">
-           <widget class="WatchedLabel" name="labelWindowHeight">
+           <widget class="QLabel" name="labelWindowHeight">
             <property name="frameShape">
-             <enum>QFrame::Shape::NoFrame</enum>
+             <enum>QFrame::Shape::Box</enum>
             </property>
             <property name="text">
              <string>-</string>
             </property>
             <property name="alignment">
-             <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
+             <set>Qt::AlignmentFlag::AlignCenter</set>
             </property>
            </widget>
           </item>
@@ -248,7 +248,7 @@
            </widget>
           </item>
           <item row="0" column="2">
-           <widget class="ModifiedSpinBox" name="spinGain">
+           <widget class="QSpinBox" name="spinGain">
             <property name="minimum">
              <number>1</number>
             </property>
@@ -258,9 +258,9 @@
            </widget>
           </item>
           <item row="1" column="2">
-           <widget class="ModifiedSpinBox" name="spinGainOffset">
+           <widget class="QSpinBox" name="spinGainOffset">
             <property name="minimum">
-             <number>0</number>
+             <number>1</number>
             </property>
             <property name="maximum">
              <number>9999</number>
@@ -268,28 +268,28 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="WatchedLabel" name="labelGain">
+           <widget class="QLabel" name="labelGain">
             <property name="frameShape">
-             <enum>QFrame::Shape::NoFrame</enum>
+             <enum>QFrame::Shape::Box</enum>
             </property>
             <property name="text">
              <string>-</string>
             </property>
             <property name="alignment">
-             <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
+             <set>Qt::AlignmentFlag::AlignCenter</set>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="WatchedLabel" name="labelGainOffset">
+           <widget class="QLabel" name="labelGainOffset">
             <property name="frameShape">
-             <enum>QFrame::Shape::NoFrame</enum>
+             <enum>QFrame::Shape::Box</enum>
             </property>
             <property name="text">
              <string>-</string>
             </property>
             <property name="alignment">
-             <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
+             <set>Qt::AlignmentFlag::AlignCenter</set>
             </property>
            </widget>
           </item>
@@ -312,7 +312,7 @@
           <item row="0" column="2">
            <layout class="QHBoxLayout" name="layoutExpTime" stretch="1,0">
             <item>
-             <widget class="ModifiedDoubleSpinBox" name="spinExpTime">
+             <widget class="QDoubleSpinBox" name="spinExpTime">
               <property name="suffix">
                <string/>
               </property>
@@ -352,7 +352,7 @@
            </layout>
           </item>
           <item row="0" column="1">
-           <widget class="WatchedLabel" name="labelExpTime">
+           <widget class="QLabel" name="labelExpTime">
             <property name="frameShape">
              <enum>QFrame::Shape::Box</enum>
             </property>
@@ -1378,21 +1378,6 @@
    <extends>QWidget</extends>
    <header>..datadisplaywidget</header>
   </customwidget>
-  <customwidget>
-   <class>WatchedLabel</class>
-   <extends>QLabel</extends>
-   <header>..watchedlabel</header>
-  </customwidget>
-  <customwidget>
-   <class>ModifiedSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>..modifiedmixin</header>
-  </customwidget>
-  <customwidget>
-   <class>ModifiedDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>..modifiedmixin</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>

pyobs_gui/qt/camerawidget_ui.py

@@ -15,14 +15,12 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
     QFont, QFontDatabase, QGradient, QIcon,
     QImage, QKeySequence, QLinearGradient, QPainter,
     QPalette, QPixmap, QRadialGradient, QTransform)
-from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QFrame,
+from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QDoubleSpinBox,
     QGridLayout, QGroupBox, QHBoxLayout, QLabel,
     QProgressBar, QPushButton, QScrollArea, QSizePolicy,
     QSpacerItem, QSpinBox, QVBoxLayout, QWidget)
 
 from ..datadisplaywidget import DataDisplayWidget
-from ..modifiedmixin import (ModifiedDoubleSpinBox, ModifiedSpinBox)
-from ..watchedlabel import WatchedLabel
 from . import resources_rc
 
 class Ui_CameraWidget(object):
@@ -43,7 +41,7 @@ class Ui_CameraWidget(object):
         self.scrollArea.setWidgetResizable(True)
         self.scrollAreaWidgetContents = QWidget()
         self.scrollAreaWidgetContents.setObjectName(u"scrollAreaWidgetContents")
-        self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 238, 748))
+        self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 295, 748))
         sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
         sizePolicy1.setHorizontalStretch(0)
         sizePolicy1.setVerticalStretch(0)
@@ -57,88 +55,57 @@ class Ui_CameraWidget(object):
         self.gridLayout_2 = QGridLayout(self.groupWindowing)
         self.gridLayout_2.setSpacing(0)
         self.gridLayout_2.setObjectName(u"gridLayout_2")
-        self.label_3 = QLabel(self.groupWindowing)
-        self.label_3.setObjectName(u"label_3")
+        self.label = QLabel(self.groupWindowing)
+        self.label.setObjectName(u"label")
 
-        self.gridLayout_2.addWidget(self.label_3, 2, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1)
 
-        self.spinWindowWidth = ModifiedSpinBox(self.groupWindowing)
+        self.label_2 = QLabel(self.groupWindowing)
+        self.label_2.setObjectName(u"label_2")
+
+        self.gridLayout_2.addWidget(self.label_2, 1, 0, 1, 1)
+
+        self.spinWindowWidth = QSpinBox(self.groupWindowing)
         self.spinWindowWidth.setObjectName(u"spinWindowWidth")
         self.spinWindowWidth.setMinimum(1)
         self.spinWindowWidth.setMaximum(9999)
 
-        self.gridLayout_2.addWidget(self.spinWindowWidth, 2, 2, 1, 1)
-
-        self.spinWindowLeft = ModifiedSpinBox(self.groupWindowing)
-        self.spinWindowLeft.setObjectName(u"spinWindowLeft")
-        self.spinWindowLeft.setMaximum(9999)
-
-        self.gridLayout_2.addWidget(self.spinWindowLeft, 0, 2, 1, 1)
+        self.gridLayout_2.addWidget(self.spinWindowWidth, 2, 1, 1, 1)
 
         self.butFullFrame = QPushButton(self.groupWindowing)
         self.butFullFrame.setObjectName(u"butFullFrame")
 
-        self.gridLayout_2.addWidget(self.butFullFrame, 4, 0, 1, 3)
+        self.gridLayout_2.addWidget(self.butFullFrame, 4, 0, 1, 2)
+
+        self.label_3 = QLabel(self.groupWindowing)
+        self.label_3.setObjectName(u"label_3")
+
+        self.gridLayout_2.addWidget(self.label_3, 2, 0, 1, 1)
 
         self.label_4 = QLabel(self.groupWindowing)
         self.label_4.setObjectName(u"label_4")
 
         self.gridLayout_2.addWidget(self.label_4, 3, 0, 1, 1)
 
-        self.label_2 = QLabel(self.groupWindowing)
-        self.label_2.setObjectName(u"label_2")
-
-        self.gridLayout_2.addWidget(self.label_2, 1, 0, 1, 1)
-
-        self.label = QLabel(self.groupWindowing)
-        self.label.setObjectName(u"label")
-
-        self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1)
-
-        self.spinWindowTop = ModifiedSpinBox(self.groupWindowing)
-        self.spinWindowTop.setObjectName(u"spinWindowTop")
-        self.spinWindowTop.setMaximum(9999)
-
-        self.gridLayout_2.addWidget(self.spinWindowTop, 1, 2, 1, 1)
-
-        self.spinWindowHeight = ModifiedSpinBox(self.groupWindowing)
+        self.spinWindowHeight = QSpinBox(self.groupWindowing)
         self.spinWindowHeight.setObjectName(u"spinWindowHeight")
         self.spinWindowHeight.setMinimum(1)
         self.spinWindowHeight.setMaximum(9999)
 
-        self.gridLayout_2.addWidget(self.spinWindowHeight, 3, 2, 1, 1)
-
-        self.labelWindowLeft = WatchedLabel(self.groupWindowing)
-        self.labelWindowLeft.setObjectName(u"labelWindowLeft")
-        self.labelWindowLeft.setFrameShape(QFrame.Shape.NoFrame)
-        self.labelWindowLeft.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignVCenter)
-
-        self.gridLayout_2.addWidget(self.labelWindowLeft, 0, 1, 1, 1)
-
-        self.labelWindowTop = WatchedLabel(self.groupWindowing)
-        self.labelWindowTop.setObjectName(u"labelWindowTop")
-        self.labelWindowTop.setFrameShape(QFrame.Shape.NoFrame)
-        self.labelWindowTop.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignVCenter)
+        self.gridLayout_2.addWidget(self.spinWindowHeight, 3, 1, 1, 1)
 
-        self.gridLayout_2.addWidget(self.labelWindowTop, 1, 1, 1, 1)
-
-        self.labelWindowWidth = WatchedLabel(self.groupWindowing)
-        self.labelWindowWidth.setObjectName(u"labelWindowWidth")
-        self.labelWindowWidth.setFrameShape(QFrame.Shape.NoFrame)
-        self.labelWindowWidth.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignVCenter)
+        self.spinWindowLeft = QSpinBox(self.groupWindowing)
+        self.spinWindowLeft.setObjectName(u"spinWindowLeft")
+        self.spinWindowLeft.setMaximum(9999)
 
-        self.gridLayout_2.addWidget(self.labelWindowWidth, 2, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.spinWindowLeft, 0, 1, 1, 1)
 
-        self.labelWindowHeight = WatchedLabel(self.groupWindowing)
-        self.labelWindowHeight.setObjectName(u"labelWindowHeight")
-        self.labelWindowHeight.setFrameShape(QFrame.Shape.NoFrame)
-        self.labelWindowHeight.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignVCenter)
+        self.spinWindowTop = QSpinBox(self.groupWindowing)
+        self.spinWindowTop.setObjectName(u"spinWindowTop")
+        self.spinWindowTop.setMaximum(9999)
 
-        self.gridLayout_2.addWidget(self.labelWindowHeight, 3, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.spinWindowTop, 1, 1, 1, 1)
 
-        self.gridLayout_2.setColumnStretch(0, 2)
-        self.gridLayout_2.setColumnStretch(1, 1)
-        self.gridLayout_2.setColumnStretch(2, 2)
 
         self.verticalLayout.addWidget(self.groupWindowing)
 
@@ -183,47 +150,30 @@ class Ui_CameraWidget(object):
         self.gridLayout = QGridLayout(self.groupGain)
         self.gridLayout.setSpacing(0)
         self.gridLayout.setObjectName(u"gridLayout")
-        self.label_11 = QLabel(self.groupGain)
-        self.label_11.setObjectName(u"label_11")
-
-        self.gridLayout.addWidget(self.label_11, 0, 0, 1, 1)
-
         self.label_13 = QLabel(self.groupGain)
         self.label_13.setObjectName(u"label_13")
 
         self.gridLayout.addWidget(self.label_13, 1, 0, 1, 1)
 
-        self.spinGain = ModifiedSpinBox(self.groupGain)
+        self.label_11 = QLabel(self.groupGain)
+        self.label_11.setObjectName(u"label_11")
+
+        self.gridLayout.addWidget(self.label_11, 0, 0, 1, 1)
+
+        self.spinGain = QSpinBox(self.groupGain)
         self.spinGain.setObjectName(u"spinGain")
         self.spinGain.setMinimum(1)
         self.spinGain.setMaximum(9999)
 
-        self.gridLayout.addWidget(self.spinGain, 0, 2, 1, 1)
+        self.gridLayout.addWidget(self.spinGain, 0, 1, 1, 1)
 
-        self.spinGainOffset = ModifiedSpinBox(self.groupGain)
+        self.spinGainOffset = QSpinBox(self.groupGain)
         self.spinGainOffset.setObjectName(u"spinGainOffset")
-        self.spinGainOffset.setMinimum(0)
+        self.spinGainOffset.setMinimum(1)
         self.spinGainOffset.setMaximum(9999)
 
-        self.gridLayout.addWidget(self.spinGainOffset, 1, 2, 1, 1)
-
-        self.labelGain = WatchedLabel(self.groupGain)
-        self.labelGain.setObjectName(u"labelGain")
-        self.labelGain.setFrameShape(QFrame.Shape.NoFrame)
-        self.labelGain.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignVCenter)
-
-        self.gridLayout.addWidget(self.labelGain, 0, 1, 1, 1)
-
-        self.labelGainOffset = WatchedLabel(self.groupGain)
-        self.labelGainOffset.setObjectName(u"labelGainOffset")
-        self.labelGainOffset.setFrameShape(QFrame.Shape.NoFrame)
-        self.labelGainOffset.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignVCenter)
-
-        self.gridLayout.addWidget(self.labelGainOffset, 1, 1, 1, 1)
+        self.gridLayout.addWidget(self.spinGainOffset, 1, 1, 1, 1)
 
-        self.gridLayout.setColumnStretch(0, 2)
-        self.gridLayout.setColumnStretch(1, 1)
-        self.gridLayout.setColumnStretch(2, 2)
 
         self.verticalLayout.addWidget(self.groupGain)
 
@@ -238,9 +188,9 @@ class Ui_CameraWidget(object):
 
         self.layoutExpTime = QHBoxLayout()
         self.layoutExpTime.setObjectName(u"layoutExpTime")
-        self.spinExpTime = ModifiedDoubleSpinBox(self.groupExpTime)
+        self.spinExpTime = QDoubleSpinBox(self.groupExpTime)
         self.spinExpTime.setObjectName(u"spinExpTime")
-        self.spinExpTime.setDecimals(1)
+        self.spinExpTime.setDecimals(3)
         self.spinExpTime.setMaximum(999.000000000000000)
         self.spinExpTime.setValue(1.000000000000000)
 
@@ -257,18 +207,8 @@ class Ui_CameraWidget(object):
 
         self.layoutExpTime.setStretch(0, 1)
 
-        self.gridLayout_5.addLayout(self.layoutExpTime, 0, 2, 1, 1)
+        self.gridLayout_5.addLayout(self.layoutExpTime, 0, 1, 1, 1)
 
-        self.labelExpTime = WatchedLabel(self.groupExpTime)
-        self.labelExpTime.setObjectName(u"labelExpTime")
-        self.labelExpTime.setFrameShape(QFrame.Shape.Box)
-        self.labelExpTime.setAlignment(Qt.AlignmentFlag.AlignCenter)
-
-        self.gridLayout_5.addWidget(self.labelExpTime, 0, 1, 1, 1)
-
-        self.gridLayout_5.setColumnStretch(0, 2)
-        self.gridLayout_5.setColumnStretch(1, 1)
-        self.gridLayout_5.setColumnStretch(2, 2)
 
         self.verticalLayout.addWidget(self.groupExpTime)
 
@@ -277,11 +217,10 @@ class Ui_CameraWidget(object):
         self.gridLayout_4 = QGridLayout(self.groupExposure)
         self.gridLayout_4.setSpacing(0)
         self.gridLayout_4.setObjectName(u"gridLayout_4")
-        self.checkBroadcast = QCheckBox(self.groupExposure)
-        self.checkBroadcast.setObjectName(u"checkBroadcast")
-        self.checkBroadcast.setChecked(True)
+        self.labelImageType = QLabel(self.groupExposure)
+        self.labelImageType.setObjectName(u"labelImageType")
 
-        self.gridLayout_4.addWidget(self.checkBroadcast, 2, 1, 1, 1)
+        self.gridLayout_4.addWidget(self.labelImageType, 0, 0, 1, 1)
 
         self.spinCount = QSpinBox(self.groupExposure)
         self.spinCount.setObjectName(u"spinCount")
@@ -375,10 +314,10 @@ class Ui_CameraWidget(object):
 
         self.gridLayout_4.addWidget(self.butAbort, 4, 0, 1, 2)
 
-        self.comboImageType = QComboBox(self.groupExposure)
-        self.comboImageType.setObjectName(u"comboImageType")
+        self.label_8 = QLabel(self.groupExposure)
+        self.label_8.setObjectName(u"label_8")
 
-        self.gridLayout_4.addWidget(self.comboImageType, 0, 1, 1, 1)
+        self.gridLayout_4.addWidget(self.label_8, 1, 0, 1, 1)
 
         self.butExpose = QPushButton(self.groupExposure)
         self.butExpose.setObjectName(u"butExpose")
@@ -457,15 +396,16 @@ class Ui_CameraWidget(object):
 
         self.gridLayout_4.addWidget(self.butExpose, 3, 0, 1, 2)
 
-        self.label_8 = QLabel(self.groupExposure)
-        self.label_8.setObjectName(u"label_8")
+        self.checkBroadcast = QCheckBox(self.groupExposure)
+        self.checkBroadcast.setObjectName(u"checkBroadcast")
+        self.checkBroadcast.setChecked(True)
 
-        self.gridLayout_4.addWidget(self.label_8, 1, 0, 1, 1)
+        self.gridLayout_4.addWidget(self.checkBroadcast, 2, 1, 1, 1)
 
-        self.labelImageType = QLabel(self.groupExposure)
-        self.labelImageType.setObjectName(u"labelImageType")
+        self.comboImageType = QComboBox(self.groupExposure)
+        self.comboImageType.setObjectName(u"comboImageType")
 
-        self.gridLayout_4.addWidget(self.labelImageType, 0, 0, 1, 1)
+        self.gridLayout_4.addWidget(self.comboImageType, 0, 1, 1, 1)
 
 
         self.verticalLayout.addWidget(self.groupExposure)
@@ -530,24 +470,18 @@ class Ui_CameraWidget(object):
     def retranslateUi(self, CameraWidget):
         CameraWidget.setWindowTitle(QCoreApplication.translate("CameraWidget", u"Form", None))
         self.groupWindowing.setTitle("")
-        self.label_3.setText(QCoreApplication.translate("CameraWidget", u"Width:", None))
+        self.label.setText(QCoreApplication.translate("CameraWidget", u"Left:", None))
+        self.label_2.setText(QCoreApplication.translate("CameraWidget", u"Top:", None))
         self.butFullFrame.setText(QCoreApplication.translate("CameraWidget", u"Full Frame", None))
+        self.label_3.setText(QCoreApplication.translate("CameraWidget", u"Width:", None))
         self.label_4.setText(QCoreApplication.translate("CameraWidget", u"Height:", None))
-        self.label_2.setText(QCoreApplication.translate("CameraWidget", u"Top:", None))
-        self.label.setText(QCoreApplication.translate("CameraWidget", u"Left:", None))
-        self.labelWindowLeft.setText(QCoreApplication.translate("CameraWidget", u"-", None))
-        self.labelWindowTop.setText(QCoreApplication.translate("CameraWidget", u"-", None))
-        self.labelWindowWidth.setText(QCoreApplication.translate("CameraWidget", u"-", None))
-        self.labelWindowHeight.setText(QCoreApplication.translate("CameraWidget", u"-", None))
         self.groupImageFormat.setTitle("")
         self.label_10.setText(QCoreApplication.translate("CameraWidget", u"Format:", None))
         self.groupBinning.setTitle("")
         self.label_5.setText(QCoreApplication.translate("CameraWidget", u"Binning:", None))
         self.groupGain.setTitle("")
-        self.label_11.setText(QCoreApplication.translate("CameraWidget", u"Gain:", None))
         self.label_13.setText(QCoreApplication.translate("CameraWidget", u"Offset:", None))
-        self.labelGain.setText(QCoreApplication.translate("CameraWidget", u"-", None))
-        self.labelGainOffset.setText(QCoreApplication.translate("CameraWidget", u"-", None))
+        self.label_11.setText(QCoreApplication.translate("CameraWidget", u"Gain:", None))
         self.groupExpTime.setTitle("")
         self.label_12.setText(QCoreApplication.translate("CameraWidget", u"ExpTime:", None))
         self.spinExpTime.setSuffix("")
@@ -555,13 +489,12 @@ class Ui_CameraWidget(object):
         self.comboExpTimeUnit.setItemText(1, QCoreApplication.translate("CameraWidget", u"ms", None))
         self.comboExpTimeUnit.setItemText(2, QCoreApplication.translate("CameraWidget", u"\u00b5s", None))
 
-        self.labelExpTime.setText(QCoreApplication.translate("CameraWidget", u"-", None))
         self.groupExposure.setTitle("")
-        self.checkBroadcast.setText(QCoreApplication.translate("CameraWidget", u"Broadcast", None))
+        self.labelImageType.setText(QCoreApplication.translate("CameraWidget", u"Type:", None))
         self.butAbort.setText(QCoreApplication.translate("CameraWidget", u"Abort", None))
-        self.butExpose.setText(QCoreApplication.translate("CameraWidget", u"Expose", None))
         self.label_8.setText(QCoreApplication.translate("CameraWidget", u"Count:", None))
-        self.labelImageType.setText(QCoreApplication.translate("CameraWidget", u"Type:", None))
+        self.butExpose.setText(QCoreApplication.translate("CameraWidget", u"Expose", None))
+        self.checkBroadcast.setText(QCoreApplication.translate("CameraWidget", u"Broadcast", None))
         self.labelStatus.setText(QCoreApplication.translate("CameraWidget", u"IDLE", None))
         self.labelExposuresLeft.setText(QCoreApplication.translate("CameraWidget", u"IDLE", None))
     # retranslateUi

{pyobs_gui-2.0.0.dev3.dist-info → pyobs_gui-2.0.0.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobs-gui
-Version: 2.0.0.dev3
+Version: 2.0.0.dev4
 Summary: A remote GUI for pyobs
 Author-email: Tim-Oliver Husser <thusser@uni-goettingen.de>
 License-Expression: MIT
@@ -12,7 +12,7 @@ Requires-Dist: colour<0.2,>=0.1.5
 Requires-Dist: matplotlib<4,>=3.10.1
 Requires-Dist: pyobs-core<3,>=2.0.0.dev28
 Requires-Dist: pyside6>=6.10.1
-Requires-Dist: qasync<0.28,>=0.27.1
+Requires-Dist: qasync<0.29,>=0.27.1
 Requires-Dist: qfitswidget>=0.13.1
 Requires-Dist: qtawesome<2,>=1.4.0
 Requires-Dist: sunpy[all]>=7.0.1

{pyobs_gui-2.0.0.dev3.dist-info → pyobs_gui-2.0.0.dev4.dist-info}/RECORD

@@ -3,7 +3,7 @@ pyobs_gui/acquisitionwidget.py,sha256=jhytcfVbopFknDoE_y3VXIQ7CgochPsZXqxq17ze-R
 pyobs_gui/autofocuswidget.py,sha256=zgkz9AzSxpvE_xC9kQnUWuFNQze7vOYIfDWGCDkima0,4192
 pyobs_gui/autoguidingwidget.py,sha256=ekahiYxuhUSQRMC84MXGtq0uMyS-_VF_C0WHA1VXvPc,6592
 pyobs_gui/base.py,sha256=onpw_6UnOUjArcXRrxYXdDm4osezfxRL2kG_hTGsk8M,14168
-pyobs_gui/camerawidget.py,sha256=aU4J37aedkqr5x-LUBFpPuz6qloKLqjFFq9jJe4FzYQ,13328
+pyobs_gui/camerawidget.py,sha256=_XairBslsoRge-cddhMiJOWHuml86-H0DG_yWLg80YU,17194
 pyobs_gui/commandinputwidget.py,sha256=VZLUkkaJzjKBAlkz7dOexP_Rula15RpZLFWToavyVdc,1692
 pyobs_gui/compassmovewidget.py,sha256=-RiXcmPrpWwajPFqEujUnfeYD5vOjgfqdRwj51soJpM,3997
 pyobs_gui/coolingwidget.py,sha256=Ex2FWXhXGQswZkNRWxDGO8_gasz_clR76PV4w9JMHw8,1918
@@ -36,8 +36,8 @@ pyobs_gui/qt/autofocuswidget.ui,sha256=LB4qbaD2mWeVGAJCQ1xID5l8SIOBrY5K9bOVNCe2f
 pyobs_gui/qt/autofocuswidget_ui.py,sha256=xm4JChpLY8cF01Zx9gSvxtxwu9veFGUEv7mFpIYHPtQ,5848
 pyobs_gui/qt/autoguidingwidget.ui,sha256=859Qbgm9qvznxmBqjy749HJG4yzkpOCFpbMREmF197s,4494
 pyobs_gui/qt/autoguidingwidget_ui.py,sha256=aWCl6x1DAZVlcjYNeYTQPmGTddodFEXnxgcPN5TSjTA,5701
-pyobs_gui/qt/camerawidget.ui,sha256=ubcv1UCLHvb7Dp7alPXH_lma6qSJtetOazuPzRDSfXY,47431
-pyobs_gui/qt/camerawidget_ui.py,sha256=8uTtBuRBocNF76nHPZa4XEaEuMvrq2Zn-qYqOHQqQ9I,30532
+pyobs_gui/qt/camerawidget.ui,sha256=t7PE1Sb0visQ5c7DAF4-2wff-C-q-oIt5ObJBgYoMfo,46530
+pyobs_gui/qt/camerawidget_ui.py,sha256=irJgPaUjSFMx6dpzpnQvMTSr6zxP9UT0BqVaOTOGljU,26658
 pyobs_gui/qt/compassmoveplugin.py,sha256=Mr5NAPnzNLDgAvQBIm8ysqhhaZaOUf_PJtKzn3eTogM,932
 pyobs_gui/qt/compassmovewidget.py,sha256=fGNHkNJJGuEw4jF5hp4pYxjyrW607CNzxtOyv_4mtBk,229
 pyobs_gui/qt/compassmovewidget.ui,sha256=h2pEVaAEIlD8s-lXSfXj_YprpLBr4LkA3Q8juOfJp9c,2553
@@ -91,7 +91,7 @@ pyobs_gui/qt/resources/cloud-sun-solid.svg,sha256=qXGvtPuQYIAHlLc1Cqiy5M6s2-JOPF
 pyobs_gui/qt/resources/edit-solid.svg,sha256=R2lehJgb5DxyOXMmj5ACJsxOTqi9heXhj6WB9fdLelY,735
 pyobs_gui/qt/resources/search-solid.svg,sha256=8WR3B4MQyr76HrFvw6f7vQGyCWS7vQXF1WPWCWr3heQ,577
 pyobs_gui/qt/resources/undo-solid.svg,sha256=6O_Pyjo59fCCynMz5XhWU4wI1egQ3anNpToH9fpmISw,767
-pyobs_gui-2.0.0.dev3.dist-info/METADATA,sha256=Nt_MQqUZNi_MdZQ9qPESm2HZUg_CZySYjrN8qVVa5Nk,575
-pyobs_gui-2.0.0.dev3.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-pyobs_gui-2.0.0.dev3.dist-info/licenses/LICENSE,sha256=gC8djBliCENDmuRvzCoejpWbsn8eqKx61Hc8bmDZ2LI,1099
-pyobs_gui-2.0.0.dev3.dist-info/RECORD,,
+pyobs_gui-2.0.0.dev4.dist-info/METADATA,sha256=PR9S8dsGWqe4U12q5Qr9iF9bCWH9_buQm4bCgIjt_BE,575
+pyobs_gui-2.0.0.dev4.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+pyobs_gui-2.0.0.dev4.dist-info/licenses/LICENSE,sha256=gC8djBliCENDmuRvzCoejpWbsn8eqKx61Hc8bmDZ2LI,1099
+pyobs_gui-2.0.0.dev4.dist-info/RECORD,,