From 8371149a438952a5f57f379408ca7b884d9a015b Mon Sep 17 00:00:00 2001 From: jupfi Date: Wed, 16 Aug 2023 13:51:03 +0200 Subject: [PATCH] Changed to central asset organization. --- .../base_spectrometer_view.py | 4 +- src/nqrduck_spectrometer/pulseparameters.py | 36 +++++++----------- .../resources/icons/QuestionMark_16x16.png | Bin 240 -> 0 bytes .../resources/pulseparameter/GateOff.png | Bin 418 -> 0 bytes .../resources/pulseparameter/GateOn.png | Bin 453 -> 0 bytes .../resources/pulseparameter/RXOff.png | Bin 236 -> 0 bytes .../resources/pulseparameter/RXOn.png | Bin 354 -> 0 bytes .../resources/pulseparameter/TXCustom.png | Bin 346 -> 0 bytes .../resources/pulseparameter/TXGauss.png | Bin 356 -> 0 bytes .../resources/pulseparameter/TXOff.png | Bin 236 -> 0 bytes .../resources/pulseparameter/TXRect.png | Bin 277 -> 0 bytes .../resources/pulseparameter/TXSinc.png | Bin 387 -> 0 bytes 12 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 src/nqrduck_spectrometer/resources/icons/QuestionMark_16x16.png delete mode 100644 src/nqrduck_spectrometer/resources/pulseparameter/GateOff.png delete mode 100644 src/nqrduck_spectrometer/resources/pulseparameter/GateOn.png delete mode 100644 src/nqrduck_spectrometer/resources/pulseparameter/RXOff.png delete mode 100644 src/nqrduck_spectrometer/resources/pulseparameter/RXOn.png delete mode 100644 src/nqrduck_spectrometer/resources/pulseparameter/TXCustom.png delete mode 100644 src/nqrduck_spectrometer/resources/pulseparameter/TXGauss.png delete mode 100644 src/nqrduck_spectrometer/resources/pulseparameter/TXOff.png delete mode 100644 src/nqrduck_spectrometer/resources/pulseparameter/TXRect.png delete mode 100644 src/nqrduck_spectrometer/resources/pulseparameter/TXSinc.png 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 13158ae96bcee214a33513ff77b6183a2335d93c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t2|vCLn2y} z6C_?XOk~;me`SW4jKRdkowFJw!vCiyBqZ#J+snOP>1>#J(3zHIM_DEfyZQBhnBtm+ zba^EtBs};#56Uy8`o(HA#r{4O@Z-g&C2dC*@G(j_od5r#ilg<)13pGEr7I6UF^0{b z%*AHIazb}YRP6lDteYRSV>!67i2`vX%^Egv(p98=13Ca$v$&5Znwfd;eK lH1s&zYb*_3HC&8gV6chMHvXh$SO#=8gQu&X%Q~loCIC9rQvUz| diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/GateOff.png b/src/nqrduck_spectrometer/resources/pulseparameter/GateOff.png deleted file mode 100644 index d4622be3115c23a6d5156db810b8d6d2e8dfce0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%zV?13PLn`LH zy<#ZXz#zb~vHhT`+=m{a2_KKDajmH zU@_1_>wZ^mH{WoA8RD|zXKHRM-+0V8INSybpdIp4POz*jncVgm80ZY1u6{1-oD!M< DVmW%Q diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/GateOn.png b/src/nqrduck_spectrometer/resources/pulseparameter/GateOn.png deleted file mode 100644 index a5f067e2b5d8efe9c718df819dcdf7fb635ce0b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%z>pfi@Ln`LH zy}Ob3kb!_hAbTo5TQYlFB0F31q=4kEl86`kud815{AsoOwAnEWw#eyMnKw*hc*G*G z{k(qO_v>AjKPEnZ{Oe;5^AS!3KZe5i@`jr=X&>Uxy(=+um;+L$-eAE9kz?u*rnAuQ zde-e{?%!sESiH^f*v2Z3Ya1B{*i}g3u*3XxG*5W_hi&!1cwz8#^>bP0l+XkKhlY+V diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/RXOff.png b/src/nqrduck_spectrometer/resources/pulseparameter/RXOff.png deleted file mode 100644 index 40f6e0e8cf1332a9a4c3d6f27dc8223ee265e7e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|mU+53hE&XX zd+Q)?g8>hVBYU7gX`ss5R-Oq+wVfhaQC2!NN*M0eYqv6Gw6#tr=GkeSq-e+kBDJZ_-S@1UM-}j$!>WAJ* zCji~$dsA*hnQz|S{@*4MJuo-&=>FXH&tCrV_1DLm++F+1Vpo5i`OZ4QL*2jiy4J?;e_#C0U;3Mm zV>Y8|plF`&ci93-#?K~tWs_{@%Re<@(wKF&VegZffqq|K#4bL`3zy~=HIx{bj?Vhpkj zXN5~2CEu^>yMA4I(&9ag-7N8}CC^PSs!cI(V0B=35H@3us*V>nD9h$*GBK|D;V$O%%H) zXcVbxxJNr@SCrF_loP2}T|WF}xPDa_?39PqO^WF=B|x6w-7n5zd%I-=!wZItL+J-t m_e;%YnZdX@;2s0mi|m(IM^rGYI9UUOjlt8^&t;ucLK6UgqJu^N diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/TXOff.png b/src/nqrduck_spectrometer/resources/pulseparameter/TXOff.png deleted file mode 100644 index 2771699e013cc2cd4db926bfaa82b24324a171f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|mU+53hE&XX zdutXn8DN4&t;uc GLK6V!nM>sW diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/TXRect.png b/src/nqrduck_spectrometer/resources/pulseparameter/TXRect.png deleted file mode 100644 index 80444fdb0a5b0601e7dfda2b2238b3fe81a4f526..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|&U?BzhE&XX zdsC6`uz>*U#nP*n0a zie9@jbozJyhIKu^{;~eMy3?rt`RY|gjGPk~q8ug@fiK$~h$ud7b!VoI^NnU=G$5-f zwy(b-KDkzN*Q@H~e_3U2CxqXMcVNn3Jj>p0STQ*`V$&3$*BCrq{an^LB{Ts5hwNo) diff --git a/src/nqrduck_spectrometer/resources/pulseparameter/TXSinc.png b/src/nqrduck_spectrometer/resources/pulseparameter/TXSinc.png deleted file mode 100644 index 49adb3d6224907004a63c250c7659991d29fccd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zZ9QEaLn`LH zoqdq6SwX;M#>0?%#M zJ+Ja5w@SD8H-Pvc3E$0($M=PW|B(A4WnROiH=nua-R-}-zs765egA5wVhz(Kwt(#2 z=J#w4sXtiFR*}8NM0D%h>aUNtZr|#}Y4I&Izg;;vhWQ`sRR-scjGs4!&fS)EJNR*% zzr(l42Wwa@&Fh~=9+>U^gC!-uBf#9O>hW3S8m3wIxht~IY|~!4W&gD$K&78`4OfMM ztxsXlZE$0|z?4zqo%15Y+y%r0iKYF}D_ErOme&MxHSad=JFO7^&NA