v1.0.6

version 1.0.6

Author: thusser

poetry.lock

@@ -34,12 +34,58 @@
 class BaseWindow:
     def __init__(self) -> None:
         """Base class for MainWindow and all widgets."""
-        self.module: Optional[Proxy] = None
+        self.modules: List[Proxy] = []
         self.comm: Optional[Comm] = None
         self.observer: Optional[Observer] = None
         self.vfs: Optional[Union[VirtualFileSystem, Dict[str, Any]]] = None
         self._base_widgets: List[BaseWidget] = []
 
+    @property
+    def module(self) -> Optional[Proxy]:
+        """Returns the first module in the list or None, if list is empty"""
+        return self.modules[0] if len(self.modules) > 0 else None
+
+    def module_by_name(self, name: str) -> Optional[Proxy]:
+        """Return the module with the given name or None, if not exists.
+
+        Args:
+            name: Name of module to return.
+
+        Returns:
+            Module or None.
+        """
+
+        # loop all modules and check name
+        for module in self.modules:
+            if module.name == name:
+                return module
+
+        # nothing found
+        return None
+
+    def modules_by_interface(self, interface: Any) -> List[Proxy]:
+        """Returns all modules that implement the given interface.
+
+        Args:
+            interface: Interface that modules must implement.
+
+        Returns:
+            List of modules.
+        """
+        return list(filter(lambda m: isinstance(m, interface), self.modules))
+
+    def module_by_interface(self, interface: Any) -> Optional[Proxy]:
+        """Returns first modules that implement the given interface, or None, if no exist.
+
+        Args:
+            interface: Interface that module must implement.
+
+        Returns:
+            Module or None.
+        """
+        modules = self.modules_by_interface(interface)
+        return None if len(modules) == 0 else modules[0]
+
     def create_widget(self, config: Union[Dict[str, Any], type], **kwargs: Any) -> "BaseWidget":
         """Creates new widget.
 
@@ -67,13 +113,13 @@ def create_widget(self, config: Union[Dict[str, Any], type], **kwargs: Any) -> "
 
     async def open(
         self,
-        module: Optional[Proxy] = None,
+        modules: Optional[List[Proxy]] = None,
         comm: Optional[Comm] = None,
         observer: Optional[Observer] = None,
         vfs: Optional[Union[VirtualFileSystem, Dict[str, Any]]] = None,
     ) -> None:
         # store
-        self.module = module
+        self.modules = [] if modules is None else modules
         self.vfs = vfs
         self.comm = comm
         self.observer = observer
@@ -83,7 +129,7 @@ async def open(
             await self._open_child(widget)
 
     async def _open_child(self, widget: BaseWidget):
-        await widget.open(module=self.module, vfs=self.vfs, comm=self.comm, observer=self.observer)
+        await widget.open(modules=self.modules, vfs=self.vfs, comm=self.comm, observer=self.observer)
 
 
 class BaseWidget(BaseWindow):

pyobs_gui/base.py

@@ -1,7 +1,7 @@
 import asyncio
 import logging
 import os
-from typing import Any, Optional, Union, Dict
+from typing import Any, Optional, Union, Dict, List
 from PyQt5 import QtWidgets, QtCore
 from astroplan import Observer
 
@@ -53,14 +53,14 @@ def __init__(self, **kwargs: Any):
 
     async def open(
         self,
-        module: Optional[Proxy] = None,
+        modules: Optional[List[Proxy]] = None,
         comm: Optional[Comm] = None,
         observer: Optional[Observer] = None,
         vfs: Optional[Union[VirtualFileSystem, Dict[str, Any]]] = None,
     ) -> None:
         """Open module."""
-        await BaseWidget.open(self, module=module, comm=comm, observer=observer, vfs=vfs)
-        await self.datadisplay.open(module=module, comm=comm, observer=observer, vfs=vfs)
+        await BaseWidget.open(self, modules=modules, comm=comm, observer=observer, vfs=vfs)
+        await self.datadisplay.open(modules=modules, comm=comm, observer=observer, vfs=vfs)
 
         # set exposure types
         image_types = sorted([it.name for it in ImageType])

pyobs_gui/camerawidget.py

@@ -1,6 +1,6 @@
 import logging
 import os
-from typing import Any, Optional, cast, Union, Dict
+from typing import Any, Optional, cast, Union, Dict, List
 import numpy as np
 from PyQt5 import QtWidgets, QtCore
 from astroplan import Observer
@@ -55,13 +55,13 @@ def __init__(self, parent, **kwargs: Any):
 
     async def open(
         self,
-        module: Optional[Proxy] = None,
+        modules: Optional[List[Proxy]] = None,
         comm: Optional[Comm] = None,
         observer: Optional[Observer] = None,
         vfs: Optional[Union[VirtualFileSystem, Dict[str, Any]]] = None,
     ) -> None:
         """Open module."""
-        await BaseWidget.open(self, module=module, comm=comm, observer=observer, vfs=vfs)
+        await BaseWidget.open(self, modules=modules, comm=comm, observer=observer, vfs=vfs)
 
         # add image panel
         self.imageLayout = QtWidgets.QVBoxLayout(self.tabImage)

pyobs_gui/datadisplaywidget.py

@@ -1,7 +1,7 @@
 import asyncio
 from datetime import datetime
 from enum import Enum, EnumMeta
-from typing import Any, Type, Dict, Optional, Union, get_origin, get_args
+from typing import Any, Type, Dict, Optional, Union, get_origin, get_args, List
 from PyQt5 import QtWidgets, QtCore
 import inspect
 
@@ -30,13 +30,13 @@ def __init__(self, **kwargs: Any):
 
     async def open(
         self,
-        module: Optional[Proxy] = None,
+        modules: Optional[List[Proxy]] = None,
         comm: Optional[Comm] = None,
         observer: Optional[Observer] = None,
         vfs: Optional[Union[VirtualFileSystem, Dict[str, Any]]] = None,
     ) -> None:
         """Open module."""
-        await BaseWidget.open(self, module=module, comm=comm, observer=observer, vfs=vfs)
+        await BaseWidget.open(self, modules=modules, comm=comm, observer=observer, vfs=vfs)
 
         # loop all event types
         for name, cls in pyobs.events.__dict__.items():

pyobs_gui/eventswidget.py

@@ -32,13 +32,13 @@ def __init__(self, **kwargs: Any):
 
     async def open(
         self,
-        module: Optional[Proxy] = None,
+        modules: Optional[List[Proxy]] = None,
         comm: Optional[Comm] = None,
         observer: Optional[Observer] = None,
         vfs: Optional[Union[VirtualFileSystem, Dict[str, Any]]] = None,
     ) -> None:
         """Open module."""
-        await BaseWidget.open(self, module=module, comm=comm, observer=observer, vfs=vfs)
+        await BaseWidget.open(self, modules=modules, comm=comm, observer=observer, vfs=vfs)
 
         # subscribe to events
         await self.comm.register_event(FilterChangedEvent, self._on_filter_changed)

pyobs_gui/filterwidget.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Optional, Union, Dict
+from typing import Any, Optional, Union, Dict, List
 
 from PyQt5 import QtWidgets, QtCore
 from astroplan import Observer
@@ -43,13 +43,13 @@ def __init__(self, **kwargs: Any):
 
     async def open(
         self,
-        module: Optional[Proxy] = None,
+        modules: Optional[List[Proxy]] = None,
         comm: Optional[Comm] = None,
         observer: Optional[Observer] = None,
         vfs: Optional[Union[VirtualFileSystem, Dict[str, Any]]] = None,
     ) -> None:
         """Open module."""
-        await BaseWidget.open(self, module=module, comm=comm, observer=observer, vfs=vfs)
+        await BaseWidget.open(self, modules=modules, comm=comm, observer=observer, vfs=vfs)
 
         # subscribe to events
         if self.comm is not None:

pyobs_gui/focuswidget.py

@@ -61,6 +61,21 @@
 }
 
 
+DEFAULT_CONFIG = [
+    {"widget": ShellWidget, "label": "Shell", "always": True},
+    {"widget": EventsWidget, "label": "Events", "always": True},
+    {"widget": StatusWidget, "label": "Status", "always": True},
+    {"widget": CameraWidget, "interfaces": "ICamera", "icon": "fa5s.camera"},
+    {"widget": TelescopeWidget, "interfaces": "ITelescope", "icon": "msc.telescope"},
+    {"widget": RoofWidget, "interfaces": "IRoof", "icon": "ph.house"},
+    {"widget": FocusWidget, "interfaces": "IFocuser", "icon": "mdi.image-filter-center-focus"},
+    {"widget": WeatherWidget, "interfaces": "IWeather", "icon": "fa5s.cloud-sun"},
+    {"widget": VideoWidget, "interfaces": "IVideo", "icon": "fa5s.video"},
+    {"widget": SpectrographWidget, "interfaces": "ISpectrograph", "icon": "ei.graph"},
+    {"widget": FilterWidget, "interfaces": "IFilters", "icon": "mdi.air-filter"},
+]
+
+
 class PagesListWidgetItem(QtWidgets.QListWidgetItem):
     """ListWidgetItem for the pages list. Always sorts Shell and Events first"""
 
@@ -152,8 +167,11 @@ def __init__(
     async def open(self, **kwargs: Any) -> None:
         """Open module."""
 
+        # get module
+        module = kwargs.pop("module")
+
         # open widgets
-        await BaseWindow.open(self, **kwargs)
+        await BaseWindow.open(self, modules=[module], **kwargs)
 
         # shell
         if self.show_shell:
@@ -229,7 +247,7 @@ async def _add_client(
         self.listPages.sortItems()
 
         # open and add widget
-        await widget.open(module=proxy, comm=self.comm, observer=self.observer, vfs=self.vfs)
+        await widget.open(modules=[proxy], comm=self.comm, observer=self.observer, vfs=self.vfs)
         self.stackedWidget.addWidget(widget)
 
         # store

pyobs_gui/mainwindow.py

@@ -31,7 +31,7 @@ async def open(self, module: Optional[Module] = None, **kwargs: Any) -> None:
                 break
 
         # open widgets
-        await BaseWindow.open(self, module=module, **kwargs)
+        await BaseWindow.open(self, modules=[module], **kwargs)
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         self.gui_module.quit()