fix GammaInfoWidget to use qt font awesome (#425)

Author: Czaki

build_utils/minimal-req.txt

@@ -2,6 +2,7 @@
 PartSegCore_compiled_backend==0.13.11
 PartSegData==0.10.0
 PyOpenGL-accelerate==3.1.5
+QtAwesome==1.0.3
 QtPy==1.7.0
 SimpleITK==1.1.0
 appdirs==1.4.4

package/PartSeg/_roi_analysis/image_view.py

@@ -1,9 +1,8 @@
 from typing import Optional
 
-import qtawesome as qta
 from qtpy.QtCore import QObject, QSignalBlocker, Slot
 from qtpy.QtGui import QResizeEvent
-from qtpy.QtWidgets import QCheckBox, QComboBox, QDoubleSpinBox, QLabel, QPushButton
+from qtpy.QtWidgets import QCheckBox, QComboBox, QDoubleSpinBox, QLabel
 
 from PartSegCore.roi_info import ROIInfo
 from PartSegImage import Image
@@ -36,10 +35,8 @@ def __init__(self, settings: PartSettings, channel_property: ChannelProperty, na
         self.label2 = QLabel("Opacity:")
         self.roi_alternative_select = QComboBox()
         self.roi_alternative_select.currentTextChanged.connect(self.image_state.set_roi_presented)
-        self.search_btn = QPushButton(qta.icon("fa5s.search"), "")
         self.stretch = None
 
-        self.btn_layout.insertWidget(self.channel_control_index, self.search_btn)
         self.btn_layout.insertWidget(self.channel_control_index + 1, self.label1)
         self.btn_layout.insertWidget(self.channel_control_index + 2, self.only_border)
         self.btn_layout.insertWidget(self.channel_control_index + 3, self.label2)
@@ -88,7 +85,7 @@ def update_alternatives(self):
     def resizeEvent(self, event: QResizeEvent):
         if event.size().width() > 700 and not self._channel_control_top:
             w = self.btn_layout2.takeAt(0).widget()
-            channel_control_index = self.btn_layout.indexOf(self.search_btn) + 1
+            channel_control_index = self.btn_layout.indexOf(self.search_roi_btn) + 1
             self.btn_layout.takeAt(channel_control_index)
             # noinspection PyArgumentList
             self.btn_layout.insertWidget(channel_control_index, w)

package/PartSeg/common_backend/base_settings.py

@@ -1,8 +1,10 @@
 import json
 import os
 import os.path
+import re
 import sys
 import warnings
+from argparse import Namespace
 from datetime import datetime
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, List, NamedTuple, Optional, Tuple, Union
@@ -33,10 +35,12 @@
 
 else:  # pragma: no cover
 
-    def get_theme(name: str) -> dict:
+    def get_theme(name: str, as_dict=True) -> Union[dict, Namespace]:
         theme = napari.utils.theme.palettes[name]
         theme["canvas"] = "black"
-        return theme
+        if as_dict:
+            return theme
+        return Namespace(**{k: Color(v) if isinstance(v, str) and v.startswith("rgb") else v for k, v in theme.items()})
 
 
 try:
@@ -280,6 +284,16 @@ def __init__(self):
     def theme_name(self) -> str:
         return self.get_from_profile("theme", "light")
 
+    @property
+    def theme(self):
+        try:
+            return get_theme(self.theme_name, as_dict=False)
+        except TypeError:
+            theme = get_theme(self.theme_name)
+            return Namespace(
+                **{k: Color(v) if isinstance(v, str) and v.startswith("rgb") else v for k, v in theme.items()}
+            )
+
     @property
     def style_sheet(self):
         with warnings.catch_warnings():
@@ -727,3 +741,12 @@ class TimeAndStackException(Exception):
     Exception which inform that current image has both time
     and stack dat which is not supported
     """
+
+
+class Color:  # pragma: no cover
+    def __init__(self, text):
+        color_re = re.compile(r"rgb\((\d+), (\d+), (\d+)\)")
+        self.colors = tuple(map(int, color_re.match(text).groups()))
+
+    def as_rgb_tuple(self):
+        return self.colors

package/PartSeg/common_gui/channel_control.py

@@ -3,8 +3,8 @@
 
 import qtawesome as qta
 from napari.utils import Colormap
-from qtpy.QtCore import QEvent, QMargins, QModelIndex, QPoint, QRect, QRectF, QSize, Qt, Signal
-from qtpy.QtGui import QColor, QIcon, QMouseEvent, QPainter, QPainterPath, QPaintEvent, QPen, QPolygonF, QShowEvent
+from qtpy.QtCore import QEvent, QMargins, QModelIndex, QPoint, QRect, QSize, Qt, Signal
+from qtpy.QtGui import QColor, QIcon, QMouseEvent, QPainter, QPaintEvent, QPen, QPolygonF, QShowEvent
 from qtpy.QtWidgets import (
     QCheckBox,
     QComboBox,
@@ -601,6 +601,7 @@ def __init__(self, size=25, margin=1):
         self.margin = QMargins(margin, margin, margin, margin)
         self.setFixedWidth(size)
         self.setFixedHeight(size)
+        self.setToolTip("Fixed range")
 
     def paintEvent(self, a0: QPaintEvent) -> None:
         super().paintEvent(a0)
@@ -624,6 +625,7 @@ def __init__(self, size=25, margin=1):
         self.margin = QMargins(margin, margin, margin, margin)
         self.setFixedWidth(size)
         self.setFixedHeight(size)
+        self.setToolTip("Filtered")
 
     def paintEvent(self, a0: QPaintEvent) -> None:
         super().paintEvent(a0)
@@ -640,29 +642,18 @@ def paintEvent(self, a0: QPaintEvent) -> None:
 class GammaInfoWidget(QWidget):
     def __init__(self, size=25, margin=2):
         super().__init__()
-        self.margin = margin
+        self.margin = QMargins(margin, margin, margin, margin)
         self.setFixedWidth(size)
         self.setFixedHeight(size)
+        self.setToolTip("Gamma translated")
 
     def paintEvent(self, a0: QPaintEvent) -> None:
-
         super().paintEvent(a0)
         painter = QPainter(self)
         painter.save()
-        painter.setRenderHint(QPainter.Antialiasing)
-        rect = QRectF(self.margin, self.margin, self.width() - self.margin * 2, self.height() - 2 * self.margin)
-        painter.setBrush(Qt.white)
-        painter.setPen(Qt.white)
-        painter.drawRect(rect)
-        painter.restore()
-        painter.save()
-        painter.setRenderHint(QPainter.Antialiasing)
-        pen = QPen()
-        pen.setWidth(3)
-        painter.setPen(pen)
-        path = QPainterPath()
-        height, width = rect.height() + self.margin, rect.width() + self.margin
-        path.moveTo(self.margin, height)
-        path.cubicTo(height * 0.5, width * 0.9, height * 0.9, width * 0.5, height, self.margin)
-        painter.drawPath(path)
+        painter.setPen(QColor("white"))
+        painter.setBrush(QColor("white"))
+        painter.drawRect(self.rect() - self.margin)
+        icon: QIcon = qta.icon("mdi.chart-bell-curve-cumulative")
+        icon.paint(painter, self.rect())
         painter.restore()

package/PartSeg/common_gui/collapse_checkbox.py

@@ -48,13 +48,14 @@ def hide_element(self, a0: int):
 
     def paintEvent(self, event: QtGui.QPaintEvent):
         painter = QPainter(self)
+        color = painter.pen().color()
         painter.save()
         rect = self.rect()
         top = int(rect.height() - (self.text_size.height() / 2))
         painter.drawText(rect.height() + 5, top, self.info_text)
         if self.isChecked():
-            icon = qta.icon("fa5s.caret-right")
+            icon = qta.icon("fa5s.caret-right", color=color)
         else:
-            icon = qta.icon("fa5s.caret-down")
+            icon = qta.icon("fa5s.caret-down", color=color)
         icon.paint(painter, QRect(0, -self.height() / 4, self.height(), self.height()))
         painter.restore()

package/PartSeg/common_gui/lock_checkbox.py

@@ -1,11 +1,12 @@
 import qtawesome as qta
-from qtpy.QtGui import QIcon, QPainter, QPaintEvent
+from qtpy.QtGui import QPainter, QPaintEvent
 from qtpy.QtWidgets import QCheckBox
 
 
 class LockCheckBox(QCheckBox):
     def paintEvent(self, event: QPaintEvent):
         rect = event.rect()
         painter = QPainter(self)
-        lock: QIcon = qta.icon("fa5s.lock") if self.isChecked() else qta.icon("fa5s.lock-open")
+        color = painter.pen().color()
+        lock = qta.icon("fa5s.lock", color=color) if self.isChecked() else qta.icon("fa5s.lock-open", color=color)
         lock.paint(painter, rect)

package/PartSeg/common_gui/napari_image_view.py

@@ -14,14 +14,16 @@
 except ImportError:
     from napari._qt.widgets.qt_viewer_buttons import QtViewerPushButton
 
+import qtawesome as qta
 from napari.components import ViewerModel as Viewer
 from napari.layers import Layer, Points
 from napari.layers.image import Image as NapariImage
 from napari.layers.labels import Labels
 from napari.qt import QtStateButton, QtViewer
 from napari.qt.threading import thread_worker
 from qtpy.QtCore import QEvent, QObject, QPoint, Qt, Signal
-from qtpy.QtWidgets import QCheckBox, QHBoxLayout, QLabel, QMenu, QToolTip, QVBoxLayout, QWidget
+from qtpy.QtGui import QColor
+from qtpy.QtWidgets import QCheckBox, QHBoxLayout, QLabel, QMenu, QPushButton, QToolTip, QVBoxLayout, QWidget
 from vispy.color import Color, Colormap
 from vispy.scene import BaseCamera
 
@@ -190,6 +192,8 @@ def __init__(
         self.points_view_button = QtViewerPushButton(
             self.viewer, "new_points", "Show points", self.toggle_points_visibility
         )
+        self.search_roi_btn = SearchROIButton(self)
+        self.search_roi_btn.setHidden(True)
         self.roll_dim_button = QtViewerPushButton(self.viewer, "roll", "Roll dimension", self._rotate_dim)
         self.roll_dim_button.setContextMenuPolicy(Qt.CustomContextMenu)
         self.roll_dim_button.customContextMenuRequested.connect(self._dim_order_menu)
@@ -201,6 +205,7 @@ def __init__(
         self.btn_layout.addWidget(self.ndim_btn)
         self.btn_layout.addWidget(self.roll_dim_button)
         self.btn_layout.addWidget(self.points_view_button)
+        self.btn_layout.addWidget(self.search_roi_btn)
         self.btn_layout.addWidget(self.channel_control, 1)
         self.btn_layout.addWidget(self.mask_label)
         self.btn_layout.addWidget(self.mask_chk)
@@ -750,7 +755,8 @@ def close(self):
         self.dockConsole.deleteLater()
         self.dockLayerList.deleteLater()
         self.dockLayerControls.deleteLater()
-        self.activityDock.deleteLater()
+        if hasattr(self, "activityDock"):
+            self.activityDock.deleteLater()
         return super().close()
 
     def closeEvent(self, event):
@@ -768,6 +774,18 @@ class ImageParameters:
     layers: int = 0
 
 
+class SearchROIButton(QPushButton):
+    def __init__(self, image_view: ImageView):
+        super().__init__(qta.icon("fa5s.search"), "")
+        self.image_view = image_view
+        image_view.settings.theme_changed.connect(self._theme_changed)
+        self._theme_changed()
+
+    def _theme_changed(self):
+        color = self.image_view.settings.theme.text
+        self.setIcon(qta.icon("fa5s.search", color=QColor(*color.as_rgb_tuple())))
+
+
 def _prepare_layers(image: Image, param: ImageParameters, replace: bool) -> Tuple[ImageInfo, bool]:
     image_layers = []
     for i in range(image.channels):

requirements/requirements_pyinstaller.in

@@ -18,6 +18,7 @@ PartSegCore-compiled-backend
 PyInstaller!=4.4
 PyOpenGL-accelerate
 PyQt5
+QtAwesome
 QtPy
 requests
 scipy