diff --git a/pyobs_gui/camerawidget.py b/pyobs_gui/camerawidget.py index 33dec0f..2834700 100644 --- a/pyobs_gui/camerawidget.py +++ b/pyobs_gui/camerawidget.py @@ -231,6 +231,8 @@ async def expose(self) -> None: exp_time /= 1e3 elif self.comboExpTimeUnit.currentText() == "µs": exp_time /= 1e6 + elif self.comboExpTimeUnit.currentText() == "min": + exp_time *= 60 # set it await self.module.set_exposure_time(exp_time) diff --git a/pyobs_gui/qt/camerawidget_ui.py b/pyobs_gui/qt/camerawidget_ui.py index ca20bc3..f14fdcd 100644 --- a/pyobs_gui/qt/camerawidget_ui.py +++ b/pyobs_gui/qt/camerawidget_ui.py @@ -132,11 +132,12 @@ def setupUi(self, CameraWidget): self.spinExpTime.setObjectName("spinExpTime") self.layoutExpTime.addWidget(self.spinExpTime) self.comboExpTimeUnit = QtWidgets.QComboBox(self.groupExpTime) - self.comboExpTimeUnit.setMinimumContentsLength(2) + self.comboExpTimeUnit.setMinimumContentsLength(3) self.comboExpTimeUnit.setObjectName("comboExpTimeUnit") self.comboExpTimeUnit.addItem("") self.comboExpTimeUnit.addItem("") self.comboExpTimeUnit.addItem("") + self.comboExpTimeUnit.addItem("") self.layoutExpTime.addWidget(self.comboExpTimeUnit) self.layoutExpTime.setStretch(0, 1) self.gridLayout_5.addLayout(self.layoutExpTime, 0, 1, 1, 1) @@ -517,9 +518,10 @@ def retranslateUi(self, CameraWidget): self.label_5.setText(_translate("CameraWidget", "Binning:")) self.label_11.setText(_translate("CameraWidget", "Gain:")) self.label_12.setText(_translate("CameraWidget", "ExpTime:")) - self.comboExpTimeUnit.setItemText(0, _translate("CameraWidget", "s")) - self.comboExpTimeUnit.setItemText(1, _translate("CameraWidget", "ms")) - self.comboExpTimeUnit.setItemText(2, _translate("CameraWidget", "µs")) + self.comboExpTimeUnit.setItemText(0, _translate("CameraWidget", "min")) + self.comboExpTimeUnit.setItemText(1, _translate("CameraWidget", "s")) + self.comboExpTimeUnit.setItemText(2, _translate("CameraWidget", "ms")) + self.comboExpTimeUnit.setItemText(3, _translate("CameraWidget", "µs")) self.labelImageType.setText(_translate("CameraWidget", "Type:")) self.butAbort.setText(_translate("CameraWidget", "Abort")) self.label_8.setText(_translate("CameraWidget", "Count:")) @@ -527,5 +529,7 @@ def retranslateUi(self, CameraWidget): self.checkBroadcast.setText(_translate("CameraWidget", "Broadcast")) self.labelStatus.setText(_translate("CameraWidget", "IDLE")) self.labelExposuresLeft.setText(_translate("CameraWidget", "IDLE")) + + from ..datadisplaywidget import DataDisplayWidget from . import resources_rc