v0.19.4

version 0.19.4

Author: thusser

pyobs_gui/camerawidget.py

@@ -28,7 +28,6 @@
 from .temperatureswidget import TemperaturesWidget
 from .fitsheaderswidget import FitsHeadersWidget
 from .qt.camerawidget_ui import Ui_CameraWidget
-from .datadisplaywidget import DataDisplayWidget
 
 log = logging.getLogger(__name__)
 
@@ -52,10 +51,6 @@ def __init__(self, **kwargs: Any):
         self.exposure_time_left = 0.0
         self.exposure_progress = 0.0
 
-        # data display
-        # self.widgetDataDisplay = self.create_widget(WidgetDataDisplay, module=self.module)
-        # self.frameImageGrabber.layout().addWidget(self.widgetDataDisplay)
-
     async def open(
         self,
         module: Optional[Proxy] = None,
@@ -257,7 +252,7 @@ async def expose(self) -> None:
         while self.exposures_left > 0:
             # expose
             broadcast = self.checkBroadcast.isChecked()
-            await self.widgetDataDisplay.grab_data(broadcast, image_type)
+            await self.datadisplay.grab_data(broadcast, image_type)
 
             # decrement number of exposures left
             self.exposures_left -= 1

pyobs_gui/gui.py

@@ -1,6 +1,8 @@
 import asyncio
 import sys
 from typing import List, Dict, Tuple, Any, Optional
+
+import qasync
 from qasync import QEventLoop  # type: ignore
 from PyQt5 import QtWidgets
 
@@ -12,6 +14,8 @@
 class GUI(Module, IFitsHeaderBefore):
     __module__ = "pyobs_gui"
 
+    app: Optional[QtWidgets.QApplication] = None
+
     def __init__(
         self,
         show_shell: bool = True,
@@ -33,11 +37,6 @@ def __init__(
             sidebar: List of custom sidebar widgets.
         """
 
-        # init Qt with asyncio
-        self._app = QtWidgets.QApplication(sys.argv)
-        loop = QEventLoop(self._app)
-        asyncio.set_event_loop(loop)
-
         # init module
         Module.__init__(self, *args, **kwargs)
         self._window: Optional[MainWindow] = None
@@ -48,6 +47,11 @@ def __init__(
         self._custom_widgets = widgets
         self._custom_sidebar_widgets = sidebar
 
+    @staticmethod
+    def new_event_loop() -> asyncio.AbstractEventLoop:
+        GUI.app = QtWidgets.QApplication(sys.argv)
+        return qasync.QEventLoop(GUI.app)
+
     async def open(self) -> None:
         """Open module."""
         await Module.open(self)
@@ -62,6 +66,7 @@ async def open(self) -> None:
             sidebar=self._custom_sidebar_widgets,
         )
         await self._window.open(
+            module=self,
             comm=self.comm,
             vfs=self.vfs,
             observer=self.observer,

pyobs_gui/mainwindow.py

@@ -105,8 +105,8 @@ def __init__(
             widgets: List of custom widgets.
             sidebar: List of custom widgets for the sidebar.
         """
-        QtWidgets.QMainWindow.__init__(self, **kwargs)
-        BaseWindow.__init__(self)
+        QtWidgets.QMainWindow.__init__(self)
+        BaseWindow.__init__(self, **kwargs)
         self.setupUi(self)
         self.resize(1300, 800)
 
@@ -118,6 +118,7 @@ def __init__(
         self.show_shell = show_shell
         self.show_events = show_events
         self.show_status = show_status
+        self.warning_task: Optional[asyncio.Task] = None
 
         # splitters
         self.splitterClients.setSizes([self.width() - 200, 200])
@@ -190,7 +191,13 @@ async def open(self, **kwargs: Any) -> None:
             await self._client_connected(Event(), client_name)
 
         # add timer for checking warnings
-        asyncio.create_task(self._check_warning_task())
+        self.warning_task = asyncio.create_task(self._check_warning_task())
+
+    def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
+        if self.warning_task is not None:
+            self.warning_task.cancel()
+        if self.module is not None:
+            self.module.quit()
 
     async def _add_client(
         self, client: str, icon: QtGui.QIcon, widget: BaseWidget, proxy: Optional[Proxy] = None

pyobs_gui/statuswidget.py

@@ -1,4 +1,5 @@
 import asyncio
+from asyncio import Task
 from datetime import datetime
 from typing import Any, Type, Dict, Optional, cast, Union
 from PyQt5 import QtWidgets, QtCore
@@ -92,7 +93,7 @@ def button_clicked(self) -> None:
 class StatusWidget(QtWidgets.QTableWidget, BaseWidget):
     def __init__(self, **kwargs: Any):
         QtWidgets.QTableWidget.__init__(self)
-        BaseWidget.__init__(self, **kwargs)
+        BaseWidget.__init__(self, update_func=self._update_status, **kwargs)
 
         # table settings
         self.setColumnCount(3)
@@ -103,6 +104,9 @@ def __init__(self, **kwargs: Any):
         self.horizontalHeader().setMinimumSectionSize(200)
         self.verticalHeader().hide()
 
+        # stuff
+        self._status_task: Optional[Task] = None
+
     async def open(
         self,
         module: Optional[Proxy] = None,
@@ -122,7 +126,7 @@ async def open(
             await self._module_opened(ModuleOpenedEvent(), mod)
 
         # trigger status updates
-        asyncio.create_task(self._update_status())
+        #self._status_task = asyncio.create_task(self._update_status())
 
     async def _module_opened(self, event: Event, sender: str) -> bool:
         """Called when module was opened."""

pyobs_gui/telescopewidget.py

@@ -127,7 +127,6 @@ async def open(
             await self.comm.register_event(MotionStatusChangedEvent, self._on_motion_status_changed)
 
         # add coord types
-        print(isinstance(self.module, IOffsetsAltAz), isinstance(self.module, IOffsetsRaDec))
         if isinstance(self.module, IPointingRaDec):
             self.comboMoveType.addItem(COORDS.EQUITORIAL.value)
             # self.comboMoveType.addItem(COORDS.ORBIT_ELEMENTS.value)
@@ -503,15 +502,10 @@ def _query_horizons(self) -> None:
             QtWidgets.QMessageBox.critical(self, "MPC", "No result found")
             return
 
-        print(obj)
-        print(obj.uri)
         try:
             eph = obj.elements()
         except ValueError:
             pass
-        print(eph)
-        print(eph.columns)
-        print(obj.uri)
 
         self.spinOrbitElementsEcc.setValue(eph["e"][0])
         self.spinOrbitElementsIncl.setValue(eph["incl"][0])

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyobs-gui"
-version = "0.19.3"
+version = "0.19.4"
 description = "A remote GUI for pyobs"
 authors = ["Tim-Oliver Husser <thusser@uni-goettingen.de>"]
 license = "MIT"