diff --git a/src/nqrduck_spectrometer/base_spectrometer_view.py b/src/nqrduck_spectrometer/base_spectrometer_view.py index 74e3321..80470bf 100644 --- a/src/nqrduck_spectrometer/base_spectrometer_view.py +++ b/src/nqrduck_spectrometer/base_spectrometer_view.py @@ -4,6 +4,7 @@ from PyQt6.QtWidgets import QWidget, QLabel, QLineEdit, QHBoxLayout, QSizePolicy from PyQt6.QtGui import QIcon from PyQt6.QtCore import Qt, pyqtSlot from nqrduck.module.module_view import ModuleView +from nqrduck.assets.icons import Logos logger = logging.getLogger(__name__) @@ -60,8 +61,7 @@ class BaseSpectrometerView(ModuleView): if setting.description is not None: logger.debug("Adding tooltip to setting: %s", setting.name) self_path = Path(__file__).parent - tooltip_icon_path = self_path / "resources/icons" / "QuestionMark_16x16.png" - icon = QIcon(str(tooltip_icon_path)) + icon = Logos.QuestionMark_16x16() icon_label = QLabel() icon_label.setPixmap(icon.pixmap(icon.availableSizes()[0])) icon_label.setFixedSize(icon.availableSizes()[0]) diff --git a/src/nqrduck_spectrometer/pulseparameters.py b/src/nqrduck_spectrometer/pulseparameters.py index a9a6fb1..f1c9e52 100644 --- a/src/nqrduck_spectrometer/pulseparameters.py +++ b/src/nqrduck_spectrometer/pulseparameters.py @@ -6,6 +6,7 @@ from pathlib import Path from PyQt6.QtGui import QPixmap from nqrduck.contrib.mplwidget import MplWidget from nqrduck.helpers.signalprocessing import SignalProcessing as sp +from nqrduck.assets.icons import PulseParamters from .base_spectrometer_model import BaseSpectrometerModel logger = logging.getLogger(__name__) @@ -174,9 +175,7 @@ class Function: Returns: QPixmap -- The default pixmap for every function""" - self_path = Path(__file__).parent - image_path = self_path / "resources/pulseparameter/TXCustom.png" - pixmap = QPixmap(str(image_path)) + pixmap = PulseParamters.TXCustom() return pixmap @@ -213,9 +212,7 @@ class RectFunction(Function): super().__init__(expr) def get_pixmap(self): - self_path = Path(__file__).parent - image_path = self_path / "resources/pulseparameter/TXRect.png" - pixmap = QPixmap(str(image_path)) + pixmap = PulseParamters.TXRect() return pixmap @@ -230,9 +227,7 @@ class SincFunction(Function): self.end_x = np.pi def get_pixmap(self): - self_path = Path(__file__).parent - image_path = self_path / "resources/pulseparameter/TXSinc.png" - pixmap = QPixmap(str(image_path)) + pixmap = PulseParamters.TXSinc() return pixmap @@ -248,9 +243,7 @@ class GaussianFunction(Function): self.end_x = np.pi def get_pixmap(self): - self_path = Path(__file__).parent - image_path = self_path / "resources/pulseparameter/TXGauss.png" - pixmap = QPixmap(str(image_path)) + pixmap = PulseParamters.TXGauss() return pixmap @@ -357,12 +350,11 @@ class TXPulse(BaseSpectrometerModel.PulseParameter): ) def get_pixmap(self): - self_path = Path(__file__).parent + if self.get_option_by_name(self.RELATIVE_AMPLITUDE).value > 0: return self.get_option_by_name(self.TX_PULSE_SHAPE).get_pixmap() else: - image_path = self_path / "resources/pulseparameter/TXOff.png" - pixmap = QPixmap(str(image_path)) + pixmap = PulseParamters.TXOff() return pixmap @@ -373,12 +365,11 @@ class RXReadout(BaseSpectrometerModel.PulseParameter): self.add_option(BooleanOption(self.RX, False)) def get_pixmap(self): - self_path = Path(__file__).parent + if self.get_option_by_name(self.RX).value == False: - image_path = self_path / "resources/pulseparameter/RXOff.png" + pixmap = PulseParamters.RXOff() else: - image_path = self_path / "resources/pulseparameter/RXOn.png" - pixmap = QPixmap(str(image_path)) + pixmap = PulseParamters.RXOn() return pixmap @@ -389,10 +380,9 @@ class Gate(BaseSpectrometerModel.PulseParameter): self.add_option(BooleanOption(self.GATE_STATE, False)) def get_pixmap(self): - self_path = Path(__file__).parent + if self.get_option_by_name(self.GATE_STATE).value == False: - image_path = self_path / "resources/pulseparameter/GateOff.png" + pixmap = PulseParamters.GateOff() else: - image_path = self_path / "resources/pulseparameter/GateOn.png" - pixmap = QPixmap(str(image_path)) + pixmap = PulseParamters.GateOn() return pixmap diff --git a/src/nqrduck_spectrometer/resources/icons/QuestionMark_16x16.png b/src/nqrduck_spectrometer/resources/icons/QuestionMark_16x16.png deleted file mode 100644 index 13158ae..0000000 Binary files a/src/nqrduck_spectrometer/resources/icons/QuestionMark_16x16.png and /dev/null differ diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/GateOff.png b/src/nqrduck_spectrometer/resources/pulseparameter/GateOff.png deleted file mode 100644 index d4622be..0000000 Binary files a/src/nqrduck_spectrometer/resources/pulseparameter/GateOff.png and /dev/null differ diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/GateOn.png b/src/nqrduck_spectrometer/resources/pulseparameter/GateOn.png deleted file mode 100644 index a5f067e..0000000 Binary files a/src/nqrduck_spectrometer/resources/pulseparameter/GateOn.png and /dev/null differ diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/RXOff.png b/src/nqrduck_spectrometer/resources/pulseparameter/RXOff.png deleted file mode 100644 index 40f6e0e..0000000 Binary files a/src/nqrduck_spectrometer/resources/pulseparameter/RXOff.png and /dev/null differ diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/RXOn.png b/src/nqrduck_spectrometer/resources/pulseparameter/RXOn.png deleted file mode 100644 index bdaaf00..0000000 Binary files a/src/nqrduck_spectrometer/resources/pulseparameter/RXOn.png and /dev/null differ diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/TXCustom.png b/src/nqrduck_spectrometer/resources/pulseparameter/TXCustom.png deleted file mode 100644 index 09d822f..0000000 Binary files a/src/nqrduck_spectrometer/resources/pulseparameter/TXCustom.png and /dev/null differ diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/TXGauss.png b/src/nqrduck_spectrometer/resources/pulseparameter/TXGauss.png deleted file mode 100644 index 8660ae7..0000000 Binary files a/src/nqrduck_spectrometer/resources/pulseparameter/TXGauss.png and /dev/null differ diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/TXOff.png b/src/nqrduck_spectrometer/resources/pulseparameter/TXOff.png deleted file mode 100644 index 2771699..0000000 Binary files a/src/nqrduck_spectrometer/resources/pulseparameter/TXOff.png and /dev/null differ diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/TXRect.png b/src/nqrduck_spectrometer/resources/pulseparameter/TXRect.png deleted file mode 100644 index 80444fd..0000000 Binary files a/src/nqrduck_spectrometer/resources/pulseparameter/TXRect.png and /dev/null differ diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/TXSinc.png b/src/nqrduck_spectrometer/resources/pulseparameter/TXSinc.png deleted file mode 100644 index 49adb3d..0000000 Binary files a/src/nqrduck_spectrometer/resources/pulseparameter/TXSinc.png and /dev/null differ