From 511d36c1745f89b2dfa2eef3961a179328e80fab Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Tue, 21 Jan 2025 20:01:26 +0800 Subject: [PATCH 1/2] . --- .../20241218_022831/bottom_illu/info.npy | Bin 0 -> 592 bytes .../20241218_022831/top_illu/info.npy | Bin 0 -> 592 bytes src/lsfm_fusion_napari/_dialog.py | 7 +++ src/lsfm_fusion_napari/_widget.py | 50 ++++++++++-------- src/lsfm_fusion_napari/napari.yaml | 4 +- 5 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 intermediates/20241218_022831/bottom_illu/info.npy create mode 100644 intermediates/20241218_022831/top_illu/info.npy diff --git a/intermediates/20241218_022831/bottom_illu/info.npy b/intermediates/20241218_022831/bottom_illu/info.npy new file mode 100644 index 0000000000000000000000000000000000000000..ac5859fd6744781ca0529f1c159c7cb295fd0f76 GIT binary patch literal 592 zcmbu3OH1QW7=};UdW)ACuQT4GqbAkb83q?3ib6opVwD2}aUta-jik^feNRrrqJo== z<7N>25pMiN^HXM{CsqYfSAL5Rz6;OuUKfAu?CmS$h@9wUH*~nZqUoo*dQQ_111>o8 zO93yt$$FDjLs#xYkJVi{8`+$8rhTl`^R(kfwR$7(1l-NnqN=Dc&RIh(an}j_Q1HkR zDoFE7^~=pGlmhvUl&RQAUm!!#Vic6@<5O8Q>aL1bD@6#|T}IpGp9{28bQp!SrO4eW z)MBx?eJAUo71jkh?aKpnouS*XTI7rHj)E$B-U$~vtjf5GPhL|}S;FT;(o50zBw0oO zO9>Geu+7Ysq+>9~5XBd(RSq?FoVdPvPqgSKh7;Nd#i*otuQ_A3nNr#@9%F)HvPr4< z2}P5XQ8TqhFco8(;@iVSDCQ{iw-ttr8vec6KsLra#e&r)qb3{~ Z7dZ*i&CI{s{~K70k*D|`F@Ya;{vP%ux6=Rs literal 0 HcmV?d00001 diff --git a/intermediates/20241218_022831/top_illu/info.npy b/intermediates/20241218_022831/top_illu/info.npy new file mode 100644 index 0000000000000000000000000000000000000000..62b4ce3848a010d81c12911c12e59b33d765f23c GIT binary patch literal 592 zcmbu3OG_J37>3Uz(del4){8Z^j@OyAX)47<6~Vwjp$$ekAdCwMXC@OSkj&&gb4D7f z(2bL3(@p7b=*C~vf8bx}rk+VmL2Ot379V^Up6C5mIX*Z#QOFtjq}SZg;rgzopC9T4 zO|J)BaOPJ7UUQT6JJt+cxeq75lS`yb#YVb|48@31R`Rz`HPLCiDn_joA>{Bavb`@|j8Tjm z<+P>9-8s}srSjpotbQx+3ryI(Q%qi9%CJV{i}22ZCLa7FT-%DXt9rpYrz}RqBnS&&=x6jlIGp#EZJu2dK}MU zJf~P5P#S(h(Ih2jrgjKcVysfE^^XVdkE+7M`X5Do8yksYlS2Qy!jMtJuRlu2$9O^U g(#p!H2}j07L4tHM^YiLg39n)lDPBiRV9PGv0D&sFy#N3J literal 0 HcmV?d00001 diff --git a/src/lsfm_fusion_napari/_dialog.py b/src/lsfm_fusion_napari/_dialog.py index 98f0400..79e65ba 100644 --- a/src/lsfm_fusion_napari/_dialog.py +++ b/src/lsfm_fusion_napari/_dialog.py @@ -9,6 +9,12 @@ ) import napari +from PyQt5 import QtGui + +font = QtGui.QFont() +font.setFamily("Microsoft YaHei UI") +font.setPointSize(20) + class GuidedDialog(QWidget): def __init__(self, parent=None): @@ -35,6 +41,7 @@ def __init__(self, parent=None): parent.logger.debug("GuidedDialog initialized") def init_ui(self): + self.setFont(font) self.setLayout(QGridLayout()) try: self.setStyleSheet(napari.qt.get_stylesheet(theme="dark")) diff --git a/src/lsfm_fusion_napari/_widget.py b/src/lsfm_fusion_napari/_widget.py index da4b025..5d39234 100644 --- a/src/lsfm_fusion_napari/_widget.py +++ b/src/lsfm_fusion_napari/_widget.py @@ -27,6 +27,12 @@ from ._dialog import GuidedDialog from ._writer import save_dialog, write_tiff +from PyQt5 import QtGui + +font = QtGui.QFont() +font.setFamily("Microsoft YaHei UI") +font.setPointSize(20) + class RegistrationSetting(QGroupBox): # (15.11.2024) Function 1 @@ -35,9 +41,7 @@ def __init__(self, parent=None): self.setTitle("Registration settings") self.setVisible(False) self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Maximum) - self.setStyleSheet( - "QGroupBox {background-color: blue; " "border-radius: 10px}" - ) + self.setStyleSheet("QGroupBox { " "border-radius: 10px}") self.viewer = parent.viewer self.parent = parent self.name = "" # layer.name @@ -92,9 +96,7 @@ def __init__(self, parent=None): self.setTitle("General settings") self.setVisible(False) self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Maximum) - self.setStyleSheet( - "QGroupBox {background-color: blue; " "border-radius: 10px}" - ) + self.setStyleSheet("QGroupBox {" "border-radius: 10px}") self.viewer = parent.viewer self.parent = parent self.name = "" # layer.name @@ -139,7 +141,7 @@ def __init__(self, parent=None): sld_resample_ratio.valueChanged.connect(self.resample_ratio) vbox.addWidget(sld_resample_ratio, 4, 1, 1, 2) - self.label_n_epochs = QLabel("Iteration of smoothing: 50") + self.label_n_epochs = QLabel("Maximum iteration: 50") vbox.addWidget(self.label_n_epochs, 5, 0, 1, 2) sld_n_epochs = QSlider(Qt.Horizontal) sld_n_epochs.setRange(10, 300) @@ -152,18 +154,16 @@ def __init__(self, parent=None): self.label_kernel_size_z = QLabel("z: 5") vbox.addWidget(self.label_kernel_size_z, 6, 1, 1, 1) sld_kernel_size_z = QSlider(Qt.Horizontal) - sld_kernel_size_z.setRange(1, 49) - sld_kernel_size_z.setPageStep(2) - sld_kernel_size_z.setValue(5) + sld_kernel_size_z.setRange(0, 24) + sld_kernel_size_z.setValue(2) self.lineedit_window_size_z = 5 sld_kernel_size_z.valueChanged.connect(self.kernel_size_z) vbox.addWidget(sld_kernel_size_z, 6, 2, 1, 1) self.label_kernel_size_xy = QLabel("xy: 59") vbox.addWidget(self.label_kernel_size_xy, 7, 1, 1, 1) sld_kernel_size_xy = QSlider(Qt.Horizontal) - sld_kernel_size_xy.setRange(9, 199) - sld_kernel_size_xy.setPageStep(2) - sld_kernel_size_xy.setValue(59) + sld_kernel_size_xy.setRange(0, 95) + sld_kernel_size_xy.setValue(25) self.lineedit_window_size_xy = 59 sld_kernel_size_xy.valueChanged.connect(self.kernel_size_xy) vbox.addWidget(sld_kernel_size_xy, 7, 2, 1, 1) @@ -173,7 +173,6 @@ def __init__(self, parent=None): vbox.addWidget(self.label_porder_z, 8, 1, 1, 1) sld_porder_z = QSlider(Qt.Horizontal) sld_porder_z.setRange(1, 5) - sld_porder_z.setPageStep(1) sld_porder_z.setValue(2) self.lineedit_porder_z = 2 sld_porder_z.valueChanged.connect(self.porder_z) @@ -182,7 +181,6 @@ def __init__(self, parent=None): vbox.addWidget(self.label_porder_xy, 9, 1, 1, 1) sld_porder_xy = QSlider(Qt.Horizontal) sld_porder_xy.setRange(1, 5) - sld_porder_xy.setPageStep(1) sld_porder_xy.setValue(2) self.lineedit_porder_xy = 2 sld_porder_xy.valueChanged.connect(self.porder_xy) @@ -201,12 +199,16 @@ def porder_z(self, value: int): self.label_porder_z.setText("z: {}".format(value)) def kernel_size_xy(self, value: int): - self.lineedit_window_size_xy = value - self.label_kernel_size_xy.setText("xy: {}".format(value)) + self.lineedit_window_size_xy = value * 2 + 9 + self.label_kernel_size_xy.setText( + "xy: {}".format(self.lineedit_window_size_xy) + ) def kernel_size_z(self, value: int): - self.lineedit_window_size_z = value - self.label_kernel_size_z.setText("z: {}".format(value)) + self.lineedit_window_size_z = value * 2 + 1 + self.label_kernel_size_z.setText( + "z: {}".format(self.lineedit_window_size_z) + ) def resample_ratio(self, value: int): self.lineedit_resample_ratio = value @@ -325,7 +327,7 @@ def _initialize_ui(self): # for ease of access # QLabels - title = QLabel("

LSFM Fusion

") + title = QLabel("

Leonardo-Fuse

") title.setAlignment(Qt.AlignCenter) title.setMaximumHeight(100) self.method = QLabel("") @@ -347,7 +349,7 @@ def _initialize_ui(self): self.label_selected_direction3 = QLabel() self.label_selected_direction4 = QLabel() label_req_registration = QLabel("Require registration:") - label_cam_pos = QLabel("Camera position (for fuse_illu):") + label_cam_pos = QLabel("Camera position (for fuse along ill.):") self.label_lateral_resolution = QLabel("Lateral resolution:") self.label_lateral_resolution.setVisible(False) self.label_axial_resolution = QLabel("Axial resolution:") @@ -476,6 +478,7 @@ def _initialize_ui(self): widget = QWidget() layout.setAlignment(Qt.AlignTop) + widget.setFont(font) widget.setLayout(layout) scroll_area = QScrollArea() @@ -678,7 +681,10 @@ def _process_on_click(self): model = FUSE_det(**params["det_init_params"]) output_image = model.train_from_params(params) - self.viewer.add_image(output_image) # set name of layer + self.viewer.add_image( + output_image, + name="fused image", + ) # set name of layer def _get_parameters(self): self.logger.debug("Compiling parameters") diff --git a/src/lsfm_fusion_napari/napari.yaml b/src/lsfm_fusion_napari/napari.yaml index 9ca7299..83fb99c 100644 --- a/src/lsfm_fusion_napari/napari.yaml +++ b/src/lsfm_fusion_napari/napari.yaml @@ -1,5 +1,5 @@ name: lsfm_fusion_napari -display_name: Leonardo-fusion +display_name: Leonardo-Fuse # see https://napari.org/stable/plugins/manifest.html for valid categories categories: ["Visualization", "Image Processing"] contributions: @@ -16,4 +16,4 @@ contributions: filename_extensions: ['.tiff'] widgets: - command: lsfm_fusion_napari.make_qwidget - display_name: Fusion Widget + display_name: LSFM Fusion Widget From c276a150e30eee618b5be1bc3f17aea52694903b Mon Sep 17 00:00:00 2001 From: Jianxu Chen Date: Tue, 21 Jan 2025 16:21:02 +0100 Subject: [PATCH 2/2] update napari yaml and font --- src/lsfm_fusion_napari/_widget.py | 1 - src/lsfm_fusion_napari/napari.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lsfm_fusion_napari/_widget.py b/src/lsfm_fusion_napari/_widget.py index 5d39234..9d06653 100644 --- a/src/lsfm_fusion_napari/_widget.py +++ b/src/lsfm_fusion_napari/_widget.py @@ -30,7 +30,6 @@ from PyQt5 import QtGui font = QtGui.QFont() -font.setFamily("Microsoft YaHei UI") font.setPointSize(20) diff --git a/src/lsfm_fusion_napari/napari.yaml b/src/lsfm_fusion_napari/napari.yaml index 83fb99c..22283a8 100644 --- a/src/lsfm_fusion_napari/napari.yaml +++ b/src/lsfm_fusion_napari/napari.yaml @@ -1,4 +1,5 @@ name: lsfm_fusion_napari +visibility: public display_name: Leonardo-Fuse # see https://napari.org/stable/plugins/manifest.html for valid categories categories: ["Visualization", "Image Processing"]