v1.0.2

version 1.0.2

Author: thusser

pyobs_gui/__init__.py

@@ -12,3 +12,4 @@
 from .focuswidget import FocusWidget
 from .telescopewidget import TelescopeWidget
 from .weatherwidget import WeatherWidget
+from .modulegui import ModuleGUI

pyobs_gui/mainwindow.py

@@ -18,10 +18,12 @@
     IVideo,
     IAutonomous,
     ISpectrograph,
+    IFilters,
 )
 from pyobs.vfs import VirtualFileSystem
 from .base import BaseWindow, BaseWidget
 from .camerawidget import CameraWidget
+from .filterwidget import FilterWidget
 from .statuswidget import StatusWidget
 from .telescopewidget import TelescopeWidget
 from .focuswidget import FocusWidget
@@ -43,6 +45,7 @@
     IWeather: WeatherWidget,
     IVideo: VideoWidget,
     ISpectrograph: SpectrographWidget,
+    IFilters: FilterWidget,
 }
 
 DEFAULT_ICONS = {
@@ -54,6 +57,7 @@
     IWeather: "fa5s.cloud-sun",
     IVideo: "fa5s.video",
     ISpectrograph: "ei.graph",
+    IFilters: "ei.graph",
 }
 
 
@@ -314,9 +318,7 @@ async def _check_warnings(self) -> None:
         autonomous_clients = await self.comm.clients_with_interface(IAutonomous)
         self.mastermind_running = False
         for auto_client in autonomous_clients:
-            proxy = await self.comm.safe_proxy(
-                auto_client, IAutonomous
-            )
+            proxy = await self.comm.safe_proxy(auto_client, IAutonomous)
             if await proxy.is_running():
                 self.mastermind_running = True
                 break

pyobs_gui/modulegui.py

@@ -0,0 +1,102 @@
+from __future__ import annotations
+import asyncio
+import sys
+from typing import List, Dict, Tuple, Any, Optional
+
+import qasync
+from qasync import QEventLoop  # type: ignore
+from PyQt5 import QtWidgets, QtGui
+
+from pyobs.interfaces import IFitsHeaderBefore
+from pyobs.modules import Module
+from .base import BaseWindow
+from .mainwindow import MainWindow, DEFAULT_WIDGETS
+
+
+class ModuleWindow(QtWidgets.QMainWindow, BaseWindow):
+    def __init__(self, gui_module: ModuleGUI, **kwargs: Any):
+        QtWidgets.QMainWindow.__init__(self)
+        BaseWindow.__init__(self)
+        self.gui_module = gui_module
+
+    async def open(self, module: Optional[Module] = None, **kwargs: Any) -> None:
+        """Open module."""
+
+        # what do we have?
+        widget, icon = None, None
+        for interface, klass in DEFAULT_WIDGETS.items():
+            if isinstance(module, interface):
+                widget = self.create_widget(klass)
+                self.setCentralWidget(widget)
+                break
+
+        # open widgets
+        await BaseWindow.open(self, module=module, **kwargs)
+
+    def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
+        self.gui_module.quit()
+
+
+class ModuleGUI(Module, IFitsHeaderBefore):
+    __module__ = "pyobs_gui"
+
+    app: Optional[QtWidgets.QApplication] = None
+
+    def __init__(
+        self,
+        module: Dict[str, Any],
+        *args: Any,
+        **kwargs: Any,
+    ):
+        """Inits a new module GUI.
+
+        Args:
+            show_shell: Whether to show the shell page.
+            show_events: Whether to show the events page.
+            show_modules: If not empty, show only listed modules.
+            widgets: List of custom widgets.
+            sidebar: List of custom sidebar widgets.
+        """
+
+        # init module
+        Module.__init__(self, *args, **kwargs)
+        self._window: Optional[MainWindow] = None
+        self._module = self.add_child_object(module, Module, own_comm=False)
+
+    @staticmethod
+    def new_event_loop() -> asyncio.AbstractEventLoop:
+        ModuleGUI.app = QtWidgets.QApplication(sys.argv)
+        return qasync.QEventLoop(ModuleGUI.app)
+
+    async def open(self) -> None:
+        """Open module."""
+        await Module.open(self)
+
+        # open module
+        await self._module.open()
+
+        # create new mainwindow
+        self._window = ModuleWindow(self)
+        await self._window.open(
+            module=self._module,
+            comm=self.comm,
+            vfs=self.vfs,
+            observer=self.observer,
+        )
+        self._window.show()
+
+    async def get_fits_header_before(
+        self, namespaces: Optional[List[str]] = None, **kwargs: Any
+    ) -> Dict[str, Tuple[Any, str]]:
+        """Returns FITS header for the current status of this module.
+
+        Args:
+            namespaces: If given, only return FITS headers for the given namespaces.
+
+        Returns:
+            Dictionary containing FITS headers.
+        """
+        if self._window is not None:
+            return self._window.get_fits_headers(namespaces)
+        else:
+            return {}

pyobs_gui/videowidget.py

@@ -100,7 +100,7 @@ async def _init(self) -> None:
 
         # we heed a HttpFile
         if not isinstance(video_file, HttpFile):
-            log.error("VFS path to video of module %s must be an HttpFile.", cast(Module, self.module).name())
+            log.error("VFS path to video of module %s must be an HttpFile.", cast(Module, self.module).name)
             return
 
         # analyse URL
@@ -109,7 +109,7 @@ async def _init(self) -> None:
         # scheme must be http
         # TODO: how to do HTTPS?
         if o.scheme != "http":
-            log.error("URL scheme to video of module %s must be HTTP.", cast(Module, self.module).name())
+            log.error("URL scheme to video of module %s must be HTTP.", cast(Module, self.module).name)
             return
 
         # get info

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyobs-gui"
-version = "1.0.0"
+version = "1.0.2"
 description = "A remote GUI for pyobs"
 authors = ["Tim-Oliver Husser <[email protected]>"]
 license = "MIT"