Merge pull request 'gitlab refs removed' (#2) from gitlab_hunt into master

Reviewed-on: #2

.gitlab-ci.yml

@@ -1,29 +1,64 @@
 stages:
-  - Test
+  - Tests
+  - OptionalTests
+
+.install-grum-test: &install-grum-test
+  - pip install pytest pytest-random-order pytest-cov
+  - pip install -e ./
+  - apt-get update
+  - apt-get install -y ffmpeg libnss3 libxcomposite1 libxtst6 libxdamage1
 
 tests:
-  stage: Test
+  stage: Tests
+  image: python:3.8
   variables:
     QT_QPA_PLATFORM: "offscreen"
     XDG_RUNTIME_DIR: "/tmp/runtime-root"
-
+    PYTHONFAULTHANDLER: 1
   script:
-    - pip install pytest pytest-random-order pytest-cov
-    - pip install -e ./
-    - pip install PyQtWebEngine
-
-    - apt-get update
-    - apt-get install -y ffmpeg libnss3 libxcomposite1 libxtst6
-
-#    - python -m unittest discover -f ./tests
-#    - coverage run --source=./grum -m unittest discover -f ./tests
-    - coverage run --source=./grum -m pytest ./tests
+    - *install-grum-test
+    - coverage run --source=./grum -m pytest ./tests --junitxml=report-junit.xml
     - coverage report
     - coverage xml
-
   coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
   artifacts:
+    when: always
     reports:
-      cobertura: coverage.xml
+      junit: report.xml
+      coverage_report:
+        coverage_format: cobertura
+        path: coverage.xml
 
+tests-3.6:
+  stage: OptionalTests
+  image: python:3.6
+  needs: ["tests"]
+  allow_failure: true
+  variables:
+    QT_QPA_PLATFORM: "offscreen"
+    XDG_RUNTIME_DIR: "/tmp/runtime-root"
+    PYTHONFAULTHANDLER: 1
+  script: 
+    - *install-grum-test
+    - pytest ./tests
+
+tests-3.7:
+  extends: "tests-3.6"
+  image: python:3.7
+
+#tests-3.8:
+#  extends: "tests-3.6"
+#  image: python:3.8
+
+tests-3.9:
+  extends: "tests-3.6"
+  image: python:3.9
+
+tests-3.10:
+  extends: "tests-3.6"
+  image: python:3.10
+
+tests-3.11:
+  extends: "tests-3.6"
+  image: python:3.11
 

README.md

@@ -1,6 +1,6 @@
 # grum
 
-<img src="https://gitlab.psi.ch/augustin_s/grum/-/wikis/uploads/1a259a1d74e7b79e0230e7bbad3b1284/screenshot2.png" width="50%" />
+<img src="https://gitea.psi.ch/SwissFEL/grum/wiki/raw/uploads%2Fe4cd2be847d26bb7ac7100080edbccce%2Fscreenshot.png" width="50%" />
 
 ## Overview
 
@@ -22,11 +22,11 @@ Via the RPC server, new plots can be created and new data appended to existing p
 
 - `new_plot(name, cfg)`
 
-Creates a new plot named `name` in the grum list. The configuration dict `cfg` is used as arguments for the constructor of [`PlotDescription`](https://gitlab.psi.ch/augustin_s/grum/-/blob/master/grum/plotdesc.py#L4).
+Creates a new plot named `name` in the grum list. The configuration dict `cfg` is used as arguments for the constructor of [`PlotDescription`](https://gitea.psi.ch/SwissFEL/grum/src/grum/descs/plotdesc.py#L4).
 
 - `append_data(name, point)`
 
-Append data point to the plot named `name`. The new `point` is forwarded to [`PlotDescription.append()`](https://gitlab.psi.ch/augustin_s/grum/-/blob/master/grum/plotdesc.py#L18).
+Append data point to the plot named `name`. The new `point` is forwarded to [`PlotDescription.append()`](https://gitea.psi.ch/SwissFEL/grum/src/grum/descs/plotdesc.py#L24).
 
 ### Utility functions
 

grum/cli.py

@@ -25,13 +25,14 @@ def handle_clargs():
     DESC = "grum - GUI for Remote Unified Monitoring"
     parser = argparse.ArgumentParser(description=DESC, formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
-    parser.add_argument("-H", "--host", default="localhost", help="Server host name")
-    parser.add_argument("-P", "--port", default=8000, type=int, help="Server port number")
+    parser.add_argument("-H", "--host", default="localhost", help="RPC server host name")
+    parser.add_argument("-P", "--port", default=8000, type=int, help="RPC server port number")
+    parser.add_argument("-o", "--offline", action="store_true", help="offline mode (do not run RPC server)")
 
-    parser.add_argument("-w", "--window-mode", default="multi", choices=MDIWindowMode.values(), type=unambiguous_window_mode, help="Set the initial window mode")
+    parser.add_argument("-w", "--window-mode", default="multi", choices=MDIWindowMode.values(), type=unambiguous_window_mode, help="set the initial window mode")
 
-    parser.add_argument("-e", "--examples", dest="add_examples", action="store_true", help="Add example data")
-    parser.add_argument("--no-theme", action="store_true", help="Disable theming")
+    parser.add_argument("-e", "--examples", dest="add_examples", action="store_true", help="add example data")
+    parser.add_argument("--no-theme", action="store_true", help="disable theming")
 
     return parser.parse_args().__dict__
 

grum/descs/__init__.py

@@ -0,0 +1,13 @@
+
+from .desc import Description
+from .imgdesc import ImageDescription
+from .plotdesc import PlotDescription
+
+
+DESC_TYPES = {
+    ImageDescription.get_type(): ImageDescription,
+    PlotDescription.get_type():  PlotDescription
+}
+
+
+

grum/descs/desc.py

@@ -0,0 +1,23 @@
+
+class Description:
+
+    def to_dict(self):
+        res = {k: v for k, v in self.__dict__.items() if not k.startswith("_") and k != "name" and v is not None}
+        tn = self.get_type()
+        res.setdefault("type", tn)
+        return res
+
+
+    @classmethod
+    def get_type(cls):
+        tn = cls.__name__
+        suffix = "Description"
+        if not tn.endswith(suffix):
+            raise ValueError(f'"{tn}" does not end with "{suffix}"')
+        tn = tn[:-len(suffix)]
+        tn = tn.casefold()
+        tn = tn or None
+        return tn
+
+
+

grum/descs/imgdesc.py

@@ -0,0 +1,52 @@
+import numpy as np
+import pyqtgraph as pg
+from .desc import Description
+
+
+class ImageDescription(Description):
+
+    def __init__(self, name, title=None, xlabel=None, ylabel=None, image=None, levels=None, cmap="viridis"):
+        self.name = name
+        self.title = title
+        self.xlabel = xlabel
+        self.ylabel = ylabel
+        self.image = image
+        self.levels = levels #TODO: might be better to use vmin and vmax
+        self.cmap = cmap
+
+    @property
+    def data(self):
+        return np.asarray(self.image)
+
+    @data.setter
+    def data(self, value):
+        self.image = value
+
+
+    def append(self, xy):
+        print("ignored image append")
+
+    def extend(self, data):
+        print("ignored image extend")
+
+
+    def make_plot(self, plotwidget, style):
+        res = plotwidget.setImage(self.data, levels=self.levels)
+
+        if self.title:
+            plotwidget.setTitle(self.title)
+
+        if self.xlabel:
+            plotwidget.getView().setLabel("bottom", self.xlabel)
+
+        if self.ylabel:
+            plotwidget.getView().setLabel("left", self.ylabel)
+
+        if self.cmap:
+            cm = pg.colormap.get(self.cmap)
+            plotwidget.setColorMap(cm)
+
+        return res
+
+
+

grum/descs/plotdesc.py

@@ -1,5 +1,7 @@
+from .desc import Description
 
-class PlotDescription:
+
+class PlotDescription(Description):
 
     def __init__(self, name, title=None, xlabel=None, ylabel=None, xs=None, ys=None):
         self.name = name
@@ -14,12 +16,21 @@ class PlotDescription:
     def data(self):
         return (self.xs, self.ys)
 
+    @data.setter
+    def data(self, value):
+        self.xs, self.ys = value
+
 
     def append(self, xy):
         x, y = xy
         self.xs.append(x)
         self.ys.append(y)
 
+    def extend(self, data):
+        xs, ys = data
+        self.xs.extend(xs)
+        self.ys.extend(ys)
+
 
     def make_plot(self, plotwidget, style):
         res = plotwidget.plot(self.xs, self.ys, name=self.name, **style)
@@ -36,8 +47,4 @@ class PlotDescription:
         return res
 
 
-    def to_dict(self):
-        return {k: v for k, v in self.__dict__.items() if not k.startswith("_") and k != "name" and v is not None}
-
-
 

grum/dictlist/dictlist.py

@@ -1,4 +1,7 @@
-from PyQt5.QtWidgets import QWidget, QLineEdit, QVBoxLayout
+import fnmatch
+import re
+
+from PyQt5.QtWidgets import QWidget, QVBoxLayout
 
 from .dictlistwidget import DictListWidget
 from .searchbox import SearchBox
@@ -31,11 +34,26 @@ class DictList(QWidget):
 
 
     def hide_not_matching(self, pattern):
-        pattern = pattern.casefold()
+        g = Globber(pattern)
         for name, itm in self.lst.items.items():
-            name = name.casefold()
-            state = (pattern not in name)
-            itm.setHidden(state)
+            state = g.match(name)
+            itm.setHidden(not state)
+
+
+
+class Globber:
+
+    def __init__(self, pattern):
+        pattern = pattern.casefold()
+        pattern = "*" + pattern + "*"
+        regex = fnmatch.translate(pattern)
+        self.pattern = re.compile(regex)
+
+    def match(self, string):
+        string = string.casefold()
+        matches = self.pattern.match(string)
+        state = bool(matches)
+        return state
 
 
 

grum/dictlist/dictlistitem.py

@@ -3,6 +3,7 @@ from PyQt5.QtWidgets import QListWidgetItem
 from PyQt5.QtGui import QIcon, QPixmap, QPainter
 
 from ..theme import DOT_PEN, DOT_BRUSH, DOT_SIZE
+from .timestamps import Timestamps
 
 
 class DictListItem(QListWidgetItem):
@@ -11,9 +12,25 @@ class DictListItem(QListWidgetItem):
         super().__init__(key, *args, **kwargs)
         self.key = key
         self.value = value
+        self.timestamps = Timestamps()
         self.set_alarm(False)
 
 
+    _sort_key = None
+
+    @classmethod # need to update the class so that all instances are always consistent
+    def set_sort_key(cls, sk):
+        cls._sort_key = staticmethod(sk) # need to attach as staticmethod, otherwise self is inserted as first argument
+
+    def __lt__(self, other):
+        assert self._sort_key == other._sort_key
+        sk = self._sort_key
+        if sk:
+            return sk(self) < sk(other)
+        else:
+            return super().__lt__(other)
+
+
     def set_alarm(self, state):
         self.set_bold(state)
         self.set_dot(state)

grum/dictlist/dictlistwidget.py

@@ -14,8 +14,12 @@ class DictListWidget(QListWidget):
         self.setSelectionMode(QListWidget.ExtendedSelection)
         self.items = {}
         self._add_menu()
+
         shortcut(self, "Del", self.delete_selected, context=Qt.WidgetShortcut)
 
+        self.nkeep = None
+        self.model().rowsInserted.connect(self.on_evict)
+
 
     def _add_menu(self):
         self.menu = menu = RClickMenu(self)
@@ -72,4 +76,69 @@ class DictListWidget(QListWidget):
             i.set_alarm(state)
 
 
+    def set_sort_key(self, sk, reverse=True):
+        DictListItem.set_sort_key(sk)
+
+        if sk is None:
+            self.setSortingEnabled(False)
+        else:
+            self.setSortingEnabled(True)
+            order = Qt.DescendingOrder if reverse else Qt.AscendingOrder
+            self.sortItems(order)
+
+
+    def enable_sort_by_insertion_order(self):
+        # map order in dict to indices
+        mapping = enumerate(self.items.values())
+        mapping = {item.text(): index for index, item in mapping}
+
+        def unsort(x):
+            return mapping[x.text()]
+
+        self.set_sort_key(unsort)
+        self.disable_sorting()
+
+
+    def enable_sort_by_text(self):
+        self.set_sort_key(lambda x: x.text(), reverse=False)
+
+
+    def enable_sort_by_timestamp(self):
+        # fall back to name for identical timestamps
+        self.set_sort_key(lambda x: (x.timestamps.max(), x.text()))
+
+
+    def disable_sorting(self):
+        self.set_sort_key(None)
+
+
+    def set_nkeep(self, n):
+        self.nkeep = n
+        self.on_evict()
+
+
+    def on_evict(self):
+        if self.nkeep:
+            self.evict(self.nkeep)
+
+
+    def evict(self, nkeep):
+        items = self.items.values()
+
+        # map order in dict to indices
+        mapping = enumerate(items)
+        mapping = {item.text(): index for index, item in mapping}
+
+        def sk(x):
+            # fall back to insertion order for identical timestamps
+            return (x.timestamps.max(), mapping[x.text()])
+
+        items = sorted(items, key=sk, reverse=True)
+        items_to_evict = items[nkeep:]
+
+        for i in items_to_evict:
+            self.items.pop(i.key)
+            self.deleteItem(i)
+
+
 

grum/dictlist/searchbox.py

@@ -47,7 +47,7 @@ class SearchBox(QWidget):
 
 class SquareButton(QPushButton):
 
-    def resizeEvent(self, e):
+    def resizeEvent(self, _event):
         height = self.height()
         self.setMinimumWidth(height)
 

grum/exampledata.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from .plotdesc import PlotDescription
+from .descs import PlotDescription, ImageDescription
 
 
 X = np.arange(100) / 10
@@ -20,15 +20,31 @@ for i in range(20):
 
 
 exampledata = {}
-for k, v in exampledata_raw.items():
-    pd = PlotDescription(
-        k,
-#        title=k,
+for name, (xs, ys) in exampledata_raw.items():
+    exampledata[name] = PlotDescription(
+        name,
+#        title=name,
         xlabel="x",
-        ylabel="y"
+        ylabel="y",
+        xs=xs,
+        ys=ys
     )
-    pd.xs, pd.ys = v
-    exampledata[k] = pd
+
+
+name = "image"
+xdim = ydim = 100
+size = xdim * ydim
+shape = (xdim, ydim)
+
+img = np.arange(size).reshape(shape) / size
+img += np.random.random(shape) / 10
+
+exampledata[name] = ImageDescription(
+    name,
+    image=img,
+    xlabel="x",
+    ylabel="y"
+)
 
 
 

grum/io.py

@@ -31,7 +31,7 @@ def read_dict(fn):
             data = node[()]
             if isinstance(data, bytes):
                 data = data.decode("utf-8")
-            res[node.name] = data
+            res[name] = data
 
     with h5py.File(fn, "r") as f:
         f.visititems(visit)
@@ -44,7 +44,7 @@ def unflatten_dict(d, sep="/"):
     for k, v in d.items():
         current = res
         levels = k.split(sep)
-        for l in levels[1:-1]:
+        for l in levels[:-1]:
             if l not in current:
                 current[l] = {}
             current = current[l]

grum/mainwin.py

@@ -2,24 +2,34 @@ from PyQt5.QtCore import Qt, pyqtSignal
 from PyQt5.QtWidgets import QMainWindow, QSplitter
 
 from . import assets
+from .descs import DESC_TYPES, Description, ImageDescription, PlotDescription
 from .dictlist import DictList
 from .exampledata import exampledata
 from .h5filedlg import open_h5_files_dialog, save_h5_file_dialog
 from .io import write_dict, read_dict
-from .mdi import MDIArea, MDISubMultiPlot, MDISubPlot, MDIWindowMode
+from .mdi import MDIArea, MDISubMultiPlot, MDISubPlot, MDISubImage, MDIWindowMode
 from .menus import BarMenu
-from .plotdesc import PlotDescription
 from .rpc import RPCServerThread
 from .shortcut import shortcut
 from .webview import WebView
 
 
+DESC_TYPE_TO_MDI_SUB_TYPE = {
+    ImageDescription: MDISubImage,
+    PlotDescription:  MDISubPlot
+}
+
+
 class MainWindow(QMainWindow):
 
-    sig_make_new_plot = pyqtSignal(str, PlotDescription)
+    sig_make_new_subwin  = pyqtSignal(str, Description)
 
-    def __init__(self, *args, title="grum", host="localhost", port=8000, add_examples=False, window_mode=MDIWindowMode.MULTI, **kwargs):
+    def __init__(self, *args, title="grum", host="localhost", port=8000, offline=False, add_examples=False, window_mode=MDIWindowMode.MULTI, **kwargs):
         super().__init__(*args, **kwargs)
+
+        if offline:
+            title = f"{title} (offline)"
+
         self.setWindowTitle(title)
         self.setWindowIcon(assets.icon())
 
@@ -39,6 +49,19 @@ class MainWindow(QMainWindow):
         lst_menu.addSeparator()
         lst_menu.addAction("Mark selected as seen", self.on_mark_selected_as_seen)
         lst_menu.addAction("Mark selected as not seen", self.on_mark_selected_as_not_seen)
+        lst_menu.addSeparator()
+        sort_group = lst_menu.addGroup()
+        sort_group.addCheckbox("Sort by insertion order", triggered=self.on_sort_by_insertion_order, state=True)
+        sort_group.addCheckbox("Sort by name", triggered=self.on_sort_by_name)
+        sort_group.addCheckbox("Sort by timestamp", triggered=self.on_sort_by_timestamp)
+        sort_group.addCheckbox("Sorting disabled", triggered=self.on_sorting_disabled)
+
+        #TODO: clean up
+        def on_item_about_to_be_moved():
+            sort_group.checkboxes["Sorting disabled"].setChecked(True)
+            self.on_sorting_disabled()
+
+        self.lst.model().rowsAboutToBeMoved.connect(on_item_about_to_be_moved)
 
         shortcut(self, "Ctrl+P", self.on_plot_selected)
 
@@ -52,6 +75,8 @@ class MainWindow(QMainWindow):
 
         self.menu_settings = menu = BarMenu(bar, "&Settings")
         menu.addCheckbox("Open new plots", state=True)
+        menu.addSeparator()
+        menu.addEntrybox("Limit number of entries", placeholder="Maximum number of entries", triggered=lst.set_nkeep)
 
         self.mdi = mdi = MDIArea(bar, window_mode=window_mode)
 
@@ -62,12 +87,16 @@ class MainWindow(QMainWindow):
 
         self.setCentralWidget(splitter)
 
-        self.rst = rst = RPCServerThread(host, port, doc_title_suffix=title)
-        rst.start()
-        rst.server.register_function(self.new_plot)
-        rst.server.register_function(self.append_data)
+        if not offline:
+            self.rst = rst = RPCServerThread(host, port, doc_title_suffix=title)
+            rst.start()
+            rst.server.register_function(self.new_image)
+            rst.server.register_function(self.new_plot)
+            rst.server.register_function(self.append_data)
+            rst.server.register_function(self.extend_data)
+            rst.server.register_function(self.set_data)
 
-        self.sig_make_new_plot.connect(self.on_make_new_plot)
+        self.sig_make_new_subwin.connect(self.on_make_new_subwin)
 
 
     def keyPressEvent(self, event):
@@ -77,29 +106,68 @@ class MainWindow(QMainWindow):
 
     # Remote API calls
 
+    def new_image(self, name, cfg):
+        """
+        Create a new image <name> using the configuration dict <cfg>.
+        The configuration is forwarded to the constructor of ImageDescription.
+        Allowed keys are: title, xlabel, ylabel, image, levels, cmap.
+        """
+        desc = self.add_new_desc_to_list(ImageDescription, name, cfg)
+        if self.menu_settings.checkboxes["Open new plots"].isChecked():
+            sub = self.mdi.findSubWindow(name)
+            if sub:
+                sub.pw.setImage(desc.data) #TODO lacks the list sync
+            else:
+                self.sig_make_new_subwin.emit(name, desc)
+
     def new_plot(self, name, cfg):
-        desc = self.add_new_desc_to_list(name, cfg)
+        """
+        Create a new plot <name> using the configuration dict <cfg>.
+        The configuration is forwarded to the constructor of PlotDescription.
+        Allowed keys are: title, xlabel, ylabel, xs, ys.
+        """
+        desc = self.add_new_desc_to_list(PlotDescription, name, cfg)
         if self.menu_settings.checkboxes["Open new plots"].isChecked():
             if not self.mdi.findSubWindow(name):
-                self.sig_make_new_plot.emit(name, desc)
+                self.sig_make_new_subwin.emit(name, desc)
 
     def append_data(self, name, point):
+        """
+        Append a new data point <point> to the (existing) plot <name>.
+        The point is forwarded to the append method of PlotDescription.
+        """
         item = self.lst.get(name)
         desc = item.value
         desc.append(point)
-        alarm = True
-        for sub in self.mdi.subWindowList():
-            if name in sub.plots:
-                plot = sub.plots[name]
-                plot.setData(*desc.data)
-                alarm = False
-        item.set_alarm(alarm)
+        self.sync_item_and_plots(item)
+
+    def extend_data(self, name, data):
+        """
+        Extend the current data of the (existing) plot <name>.by <data>
+        The data is forwarded to the extend method of PlotDescription.
+        """
+        item = self.lst.get(name)
+        desc = item.value
+        desc.extend(data)
+        self.sync_item_and_plots(item)
+
+    def set_data(self, name, data):
+        """
+        Set <data> as the data of the (existing) plot <name>.
+        The data is assigned to the data attribute of PlotDescription.
+        """
+        item = self.lst.get(name)
+        desc = item.value
+        desc.data = data
+        self.sync_item_and_plots(item)
 
 
     # Signal callbacks
 
-    def on_make_new_plot(self, *args, **kwargs):
-        self.make_subwin(MDISubPlot, *args, **kwargs)
+    def on_make_new_subwin(self, name, desc):
+        DescType = type(desc)
+        MDISubType = DESC_TYPE_TO_MDI_SUB_TYPE[DescType]
+        self.make_subwin(MDISubType, name, desc)
 
     def on_dclick_list_item(self, item):
         self.plot_single_item(item)
@@ -114,6 +182,7 @@ class MainWindow(QMainWindow):
         else:
             self.plot_multiple_items(selected)
 
+
     def on_mark_selected_as_seen(self):
         self.lst.set_alarm_for_selected(False)
 
@@ -121,6 +190,19 @@ class MainWindow(QMainWindow):
         self.lst.set_alarm_for_selected(True)
 
 
+    def on_sort_by_insertion_order(self):
+        self.lst.enable_sort_by_insertion_order()
+
+    def on_sort_by_name(self):
+        self.lst.enable_sort_by_text()
+
+    def on_sort_by_timestamp(self):
+        self.lst.enable_sort_by_timestamp()
+
+    def on_sorting_disabled(self):
+        self.lst.disable_sorting()
+
+
     def on_file_open(self):
         fns = open_h5_files_dialog(self)
         if not fns:
@@ -128,8 +210,10 @@ class MainWindow(QMainWindow):
 
         for fn in fns:
             data = read_dict(fn)
-            for k, v in data.items():
-                self.add_new_desc_to_list(k, v)
+            for name, cfg in data.items():
+                tn = cfg.pop("type")
+                DescType = DESC_TYPES[tn]
+                self.add_new_desc_to_list(DescType, name, cfg)
 
 
     def on_file_save(self):
@@ -147,26 +231,42 @@ class MainWindow(QMainWindow):
 
     # Plumbing
 
-    def add_new_desc_to_list(self, name, cfg):
-        desc = PlotDescription(name, **cfg)
+    def add_new_desc_to_list(self, DescType, name, cfg):
+        desc = DescType(name, **cfg)
         self.lst.set(name, desc)
         return desc
 
+    def sync_item_and_plots(self, item):
+        name, desc = item.key, item.value
+        alarm = True
+        for sub in self.mdi.subWindowList():
+            if name in sub.plots:
+                plot = sub.plots[name]
+                plot.setData(*desc.data)
+                alarm = False
+        item.timestamps.modification.update()
+        item.set_alarm(alarm)
+
     def plot_single_item(self, item):
+        item.timestamps.access.update()
         item.set_alarm(False)
         name, desc = item.key, item.value
-        self.activate_or_make_subwin(MDISubPlot, name, desc)
+        DescType = type(desc)
+        MDISubType = DESC_TYPE_TO_MDI_SUB_TYPE[DescType]
+        self.activate_or_make_subwin(MDISubType, name, desc)
 
     def plot_multiple_items(self, items):
         for i in items:
+            i.timestamps.access.update()
             i.set_alarm(False)
+        items = (i for i in items if isinstance(i.value, PlotDescription)) #TODO: for now, only overlay plots
         descs = {i.key: i.value for i in items}
         names = descs.keys()
         name = " | ".join(names)
         self.activate_or_make_subwin(MDISubMultiPlot, name, descs)
 
 
-    #TODO: the following two could be methods to MDIArea?
+    #TODO: the following two could be methods of MDIArea?
 
     def activate_or_make_subwin(self, MDISubType, name, *args, **kwargs):
         sub = self.mdi.findSubWindow(name)

grum/mdi/__init__.py

@@ -1,5 +1,6 @@
 
 from .mdiarea import MDIArea, MDIWindowMode
 from .mdisubplot import MDISubPlot, MDISubMultiPlot
+from .mdisubimg import MDISubImage
 
 

grum/mdi/mdiarea.py

@@ -20,7 +20,7 @@ class MDIWindowMode(str, enum.Enum):
 
 class MDIArea(QMdiArea):
 
-    def __init__(self, bar, window_mode=MDIWindowMode.MULTI, *args, **kwargs):
+    def __init__(self, bar, *args, window_mode=MDIWindowMode.MULTI, **kwargs):
         super().__init__(*args, **kwargs)
         self.logo = assets.logo()
         self.setTabsClosable(True)
@@ -67,6 +67,7 @@ class MDIArea(QMdiArea):
         self.menu.checkboxes["Multiple windows"].setChecked(True)
         self.enable_subwindow_view()
         for sub in self.subWindowList():
+            sub.restore()
             sub.frame_on()
 
     def enable_single_window_mode(self):
@@ -75,7 +76,7 @@ class MDIArea(QMdiArea):
         self.closeInactiveSubWindows()
         active = self.activeSubWindow()
         if active:
-            active.showMaximized()
+            active.maximize()
             active.frame_off()
 
     def enable_tabbed_mode(self):
@@ -104,7 +105,7 @@ class MDIArea(QMdiArea):
     def add_single(self, sub):
         self.closeAllSubWindows()
         self.addSubWindow(sub)
-        sub.showMaximized()
+        sub.maximize()
         sub.frame_off()
 
 

grum/mdi/mdisubimg.py

@@ -0,0 +1,38 @@
+import pyqtgraph as pg
+from .mdisubwin import MDISubWindow
+from ..theme import pg_plot_style
+
+
+class MDISubImage(MDISubWindow):
+
+    def __init__(self, name, desc, *args, **kwargs):
+        super().__init__(name, *args, **kwargs)
+        self.pw = pw = pg.ImageView(view=pg.PlotItem()) # for axis ticks and labels, view needs to be a PlotItem
+        self.setWidget(pw)
+
+        # connect to plot mouse-over event
+        pw.scene.sigMouseMoved.connect(self.on_hover)
+
+        style = pg_plot_style()
+
+        plot = desc.make_plot(self.pw, style)
+        self.plots = {name: plot}
+
+        self.image = desc.data
+
+
+    def on_hover(self, event):
+        coord = self.pw.imageItem.mapFromScene(event)
+        x = coord.x()
+        y = coord.y()
+        x = int(x)
+        y = int(y)
+        try:
+            z = self.image[x, y]
+        except IndexError:
+            return
+        z = round(z, 3)
+        self.setToolTip(f"x = {x}\ny = {y}\nz = {z}")
+
+
+

grum/mdi/mdisubplot.py

@@ -3,30 +3,48 @@ from .mdisubwin import MDISubWindow
 from ..theme import pg_plot_style, pg_plot_style_cycler, pg_legend_style
 
 
-class MDISubPlot(MDISubWindow):
+class MDISubPlotBase(MDISubWindow):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.pw = pw = pg.PlotWidget()
+        self.setWidget(pw)
+
+        # connect to plot mouse-over event
+        pw.scene().sigMouseMoved.connect(self.on_hover)
+
+
+    def on_hover(self, event):
+        coord = self.pw.plotItem.vb.mapSceneToView(event)
+        x = coord.x()
+        y = coord.y()
+        x = round(x, 3)
+        y = round(y, 3)
+        self.setToolTip(f"x = {x}\ny = {y}")
+
+
+
+class MDISubPlot(MDISubPlotBase):
 
     def __init__(self, name, desc, *args, **kwargs):
         super().__init__(name, *args, **kwargs)
-        pw = pg.PlotWidget()
-        self.setWidget(pw)
 
         style = pg_plot_style()
 
-        plot = desc.make_plot(pw, style)
+        plot = desc.make_plot(self.pw, style)
         self.plots = {name: plot}
 
 
 
-class MDISubMultiPlot(MDISubWindow):
+class MDISubMultiPlot(MDISubPlotBase):
 
     def __init__(self, name, descs, *args, **kwargs):
         super().__init__(name, *args, **kwargs)
-        pw = pg.PlotWidget()
-        self.setWidget(pw)
 
         ls = pg_legend_style()
         psc = pg_plot_style_cycler()
 
+        pw = self.pw
         pw.addLegend(**ls)
         self.plots = {name: desc.make_plot(pw, style) for (name, desc), style in zip(descs.items(), psc)}
 

grum/mdi/mdisubwin.py

@@ -4,22 +4,42 @@ from PyQt5.QtWidgets import QMdiSubWindow
 from .. import assets
 
 
+SUB_WIN_WIDTH  = 640
+SUB_WIN_HEIGHT = 480
+
+
 class MDISubWindow(QMdiSubWindow):
 
     def __init__(self, title, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.setWindowTitle(title)
         self.setWindowIcon(assets.char())
+        self.resize(SUB_WIN_WIDTH, SUB_WIN_HEIGHT)
 
         # without this, the SubWindow is not removed from the subWindowList
         self.setAttribute(Qt.WA_DeleteOnClose)
 
+        self._previous_state = None
+
+
+    def maximize(self):
+        self._previous_state = state = self.windowState()
+        self.setWindowState(state | Qt.WindowMaximized)
+
+    def restore(self):
+        if self._previous_state:
+            self.setWindowState(self._previous_state)
+
 
     def frame_on(self):
-        self.setWindowFlag(Qt.FramelessWindowHint, False)
+        self.hide()
+        self.setWindowFlags(Qt.SubWindow)
+        self.show()
 
     def frame_off(self):
-        self.setWindowFlag(Qt.FramelessWindowHint, True)
+        self.hide()
+        self.setWindowFlags(Qt.CustomizeWindowHint | Qt.WindowTitleHint)
+        self.show()
 
 
 

grum/menus/menubase.py

@@ -1,5 +1,5 @@
-from PyQt5.QtGui import QKeySequence
-from PyQt5.QtWidgets import QAction, QActionGroup
+from PyQt5.QtGui import QKeySequence, QIntValidator
+from PyQt5.QtWidgets import QAction, QActionGroup, QWidgetAction, QLineEdit
 
 
 class MenuBase:
@@ -31,6 +31,48 @@ class MenuBase:
         self.checkboxes[name] = action
         return action
 
+
+    def addEntrybox(self, name, placeholder=None, state=False, triggered=None):
+        cb = self.addCheckbox(name, state=state)
+
+        edit = QLineEdit(self.qmenu)
+        edit.setValidator(QIntValidator()) #TODO: make optional
+        edit.setEnabled(state)
+        if placeholder:
+            edit.setPlaceholderText(placeholder)
+        edit.setContentsMargins(8, 5, 8, 5) # mimic margins of other actions TODO: this probably depends on the theme
+
+        @cb.toggled.connect
+        def propagate_state_and_keep_menu_open_and_focus_edit(checked):
+            edit.setEnabled(checked)
+            if checked:
+                self.qmenu.show()
+                self.qmenu.setActiveAction(cb)
+                edit.setFocus()
+
+        @edit.returnPressed.connect
+        def close_menu():
+            self.qmenu.close()
+
+        if triggered:
+            @cb.triggered.connect
+            def confirm_disabled(checked):
+                if not checked:
+                    triggered(None)
+
+        if triggered:
+            @edit.returnPressed.connect
+            def confirm_value():
+                value = edit.text()
+                value = int(value)
+                triggered(value)
+
+        action = QWidgetAction(self.qmenu)
+        action.setDefaultWidget(edit)
+        self.qmenu.addAction(action)
+        return action
+
+
     def addSeparator(self):
         self.qmenu.addSeparator()
 

grum/rpc/rpcclient.py

@@ -16,4 +16,10 @@ class RPCClient(xrc.ServerProxy):
         return head + help
 
 
+    def __dir__(self):
+        d1 = super().__dir__()
+        d2 = self.utils.info().keys()
+        return [*d1, *d2]
+
+
 

grum/rpc/rpcserver.py

@@ -4,7 +4,7 @@ from inspect import getdoc, signature
 
 class RPCServer(xrs.DocXMLRPCServer):
 
-    def __init__(self, host, port, doc_title_suffix="", *args, **kwargs):
+    def __init__(self, host, port, *args, doc_title_suffix="", **kwargs):
         addr = (host, port)
         kwargs.setdefault("allow_none", True)
         super().__init__(addr, *args, **kwargs)

grum/shortcut.py

@@ -4,9 +4,9 @@ from PyQt5.QtWidgets import QShortcut
 
 def shortcut(parent, key_sequence, triggered, **kwargs):
     key_sequence = QKeySequence(key_sequence)
-    shortcut = QShortcut(key_sequence, parent, **kwargs)
-    shortcut.activated.connect(triggered)
-    return shortcut
+    sc = QShortcut(key_sequence, parent, **kwargs)
+    sc.activated.connect(triggered)
+    return sc
 
 
 

grum/theme.py

@@ -27,7 +27,7 @@ DOT_PEN = GREY5
 DOT_BRUSH = HIGHLIGHT
 DOT_SIZE = 8
 
-LINE_COLORS = [
+LINE_COLORS = (
     C.BLUE,
     C.BASE_GREEN,
     C.RED,
@@ -38,7 +38,7 @@ LINE_COLORS = [
     C.COOL3,
     C.BROWN1,
     C.BASE_ORANGE,
-]
+)
 
 
 

grum/webview.py

@@ -2,7 +2,7 @@ from PyQt5.QtCore import QUrl
 
 try:
     from PyQt5.QtWebKitWidgets import QWebView
-except ImportError:
+except (ImportError, ModuleNotFoundError):
     from PyQt5.QtWebEngineWidgets import QWebEngineView as QWebView
 
 

setup.cfg

@@ -4,9 +4,9 @@ version = 0.0.1
 description = GUI for Remote Unified Monitoring
 long_description = file: README.md
 long_description_content_type = text/markdown
-url = https://gitlab.psi.ch/augustin_s/grum
+url = https://gitea.psi.ch/SwissFEL/grum
 project_urls =
-    Bug Tracker = https://gitlab.psi.ch/augustin_s/grum/issues 
+    Bug Tracker = https://gitea.psi.ch/SwissFEL/grum/issues
 classifiers =
     Programming Language :: Python :: 3
     License :: OSI Approved :: MIT License
@@ -16,7 +16,7 @@ classifiers =
 package_dir =
     = .
 packages = find:
-python_requires = >=3.8
+python_requires = >=3.6
 
 [options.packages.find]
 where = .

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 if __name__ == "__main__":
     setup(
-        install_requires=["pyqt5", "pyqtgraph", "h5py"],
+        install_requires=["pyqt5", "pyqtgraph", "h5py", "PyQtWebEngine"],
         entry_points={"console_scripts": ["grum=grum:main"]},
     )
 

tests/run.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+cd $(dirname $0)
+cd ..
+
+export QT_QPA_PLATFORM=offscreen
+
+coverage run --source=./grum/ -m pytest ./tests/
+echo
+coverage report
+
+

tests/test_mainwin.py

@@ -14,7 +14,7 @@ from grum.mainwin import MainWindow
 from grum.mdi import MDIArea, MDISubMultiPlot, MDISubPlot
 from grum.menus import BarMenu
 from grum.menus.rclickmenu import RClickMenu
-from grum.plotdesc import PlotDescription
+from grum.descs import Description, PlotDescription
 from grum.rpc import RPCServerThread
 
 
@@ -47,7 +47,7 @@ class TestMainWin:
 
         for key in mw.lst.lst.items:
             assert isinstance(mw.lst.lst.get(key), DictListItem)
-            assert isinstance(mw.lst.lst.get(key).value, PlotDescription)
+            assert isinstance(mw.lst.lst.get(key).value, Description)
 
         assert isinstance(mw.lst.menu, RClickMenu)
         assert isinstance(mw.menu_settings, BarMenu)
@@ -65,7 +65,7 @@ class TestMainWin:
         xlabel = "xlabel"
         ylabel = "ylabel"
         cfg = {"title": title, "xlabel": xlabel, "ylabel": ylabel}
-        spy_sig_make_new_plot = QSignalSpy(mw.sig_make_new_plot)
+        spy_sig_make_new_subwin = QSignalSpy(mw.sig_make_new_subwin)
 
         mw.new_plot(name, cfg=cfg)
 
@@ -76,28 +76,28 @@ class TestMainWin:
         assert mw.lst.lst.get(name).value.ylabel == ylabel
 
         assert mw.menu_settings.checkboxes["Open new plots"].isChecked()
-        assert len(spy_sig_make_new_plot) == 1  # assert called once
-        assert spy_sig_make_new_plot[0][0] == name  # assert called with name
-        assert isinstance(spy_sig_make_new_plot[0][1], PlotDescription)
+        assert len(spy_sig_make_new_subwin) == 1  # assert called once
+        assert spy_sig_make_new_subwin[0][0] == name  # assert called with name
+        assert isinstance(spy_sig_make_new_subwin[0][1], PlotDescription)
 
         mw.menu_settings.checkboxes["Open new plots"].setChecked(False)
         assert mw.menu_settings.checkboxes["Open new plots"].isChecked() == False
-        spy_sig_make_new_plot = QSignalSpy(mw.sig_make_new_plot)
+        spy_sig_make_new_subwin = QSignalSpy(mw.sig_make_new_subwin)
 
         mw.new_plot("new_name", cfg)
 
-        assert len(spy_sig_make_new_plot) == 0  # assert not called
+        assert len(spy_sig_make_new_subwin) == 0  # assert not called
 
         mw.menu_settings.checkboxes["Open new plots"].setChecked(True)
         assert mw.menu_settings.checkboxes["Open new plots"].isChecked() == True
-        spy_sig_make_new_plot = QSignalSpy(mw.sig_make_new_plot)
+        spy_sig_make_new_subwin = QSignalSpy(mw.sig_make_new_subwin)
         new_name_item = mw.lst.lst.get("new_name")
         sub = MDISubPlot("new_name", new_name_item.value)
         mw.mdi.add(sub)
 
         mw.new_plot("new_name", cfg)
 
-        assert len(spy_sig_make_new_plot) == 0  # assert not called
+        assert len(spy_sig_make_new_subwin) == 0  # assert not called
 
 
     def test_append_data(self):
@@ -122,17 +122,19 @@ class TestMainWin:
         assert sine_item.set_alarm.call_args[0][0] == False
 
 
-    def test_on_make_new_plot(self):
+    def test_on_make_new_subwin(self):
         mw = self.mw
 
         mw.make_subwin = mock.MagicMock()
 
-        args = (1, 2, "name")
-        kwargs = {"title": "plot_title"}
+        name = "test"
+        cfg = {"title": "title"}
 
-        mw.on_make_new_plot(args, kwargs)
+        desc = PlotDescription(name, *cfg)
 
-        mw.make_subwin.assert_called_once_with(MDISubPlot, args, kwargs)
+        mw.on_make_new_subwin(name, desc)
+
+        mw.make_subwin.assert_called_once_with(MDISubPlot, name, desc)
 
 
     def test_on_dclick_list_item(self):

tests/test_mdiarea.py

@@ -143,14 +143,14 @@ class TestMDIArea:
         mdi.closeAllSubWindows = mock.MagicMock()
         sine_item = self.mw.lst.lst.get("sine")
         sub = MDISubPlot("sine", sine_item.value)
-        sub.showMaximized = mock.MagicMock()
+        sub.maximize = mock.MagicMock()
         sub.frame_off = mock.MagicMock()
 
         mdi.add_single(sub)
 
         mdi.closeAllSubWindows.assert_called_once()
         mdi.addSubWindow.assert_called_once_with(sub)
-        sub.showMaximized.assert_called_once()
+        sub.maximize.assert_called_once()
         sub.frame_off.assert_called_once()
 
 

tests/test_plotdesc.py

@@ -6,7 +6,7 @@ import pyqtgraph as pg
 from grum import theme
 from grum.mainwin import MainWindow
 from grum.mdi.mdisubplot import MDISubPlot
-from grum.plotdesc import PlotDescription
+from grum.descs import PlotDescription
 from grum.theme import pg_plot_style
 
 
@@ -78,6 +78,7 @@ def test_to_dict():
         "xs": [1, 2],
         "ylabel": "plot_ylabel",
         "ys": [3, 4],
+        "type": "plot"
     }