diff --git a/brainglobe_segmentation/layout/gui_elements.py b/brainglobe_segmentation/layout/gui_elements.py deleted file mode 100644 index 81369bc..0000000 --- a/brainglobe_segmentation/layout/gui_elements.py +++ /dev/null @@ -1,94 +0,0 @@ -from qtpy.QtWidgets import ( - QCheckBox, - QDoubleSpinBox, - QLabel, - QPushButton, - QSpinBox, -) - - -def add_button( - label, - layout, - connected_function, - *, - row: int = 0, - column: int = 0, - visibility=True, - minimum_width=0, - alignment="center", - tooltip=None, -): - button = QPushButton(label) - if alignment == "center": - pass - elif alignment == "left": - button.setStyleSheet("QPushButton { text-align: left; }") - elif alignment == "right": - button.setStyleSheet("QPushButton { text-align: right; }") - - button.setVisible(visibility) - button.setMinimumWidth(minimum_width) - - if tooltip: - button.setToolTip(tooltip) - layout.addWidget(button, row, column) - button.clicked.connect(connected_function) - return button - - -def add_checkbox( - layout, default, label, row: int = 0, column: int = 0, tooltip=None -): - box = QCheckBox() - box.setChecked(default) - if tooltip: - box.setToolTip(tooltip) - layout.addWidget(QLabel(label), row, column) - layout.addWidget(box, row, column + 1) - return box - - -def add_float_box( - layout, - default, - minimum, - maximum, - label, - step, - row: int = 0, - column: int = 0, - tooltip=None, -): - box = QDoubleSpinBox() - box.setMinimum(minimum) - box.setMaximum(maximum) - box.setValue(default) - box.setSingleStep(step) - if tooltip: - box.setToolTip(tooltip) - layout.addWidget(QLabel(label), row, column) - layout.addWidget(box, row, column + 1) - return box - - -def add_int_box( - layout, - default, - minimum, - maximum, - label, - row: int = 0, - column: int = 0, - tooltip=None, -): - box = QSpinBox() - box.setMinimum(minimum) - box.setMaximum(maximum) - # Not always set if not after min & max - box.setValue(default) - if tooltip: - box.setToolTip(tooltip) - layout.addWidget(QLabel(label), row, column) - layout.addWidget(box, row, column + 1) - return box diff --git a/brainglobe_segmentation/layout/utils.py b/brainglobe_segmentation/layout/utils.py deleted file mode 100644 index 69d24a0..0000000 --- a/brainglobe_segmentation/layout/utils.py +++ /dev/null @@ -1,29 +0,0 @@ -from qtpy.QtWidgets import QMessageBox - - -def display_warning(widget, title, message): - """ - Display a warning in a pop-up that can be accepted or dismissed - """ - message_reply = QMessageBox.question( - widget, - title, - message, - QMessageBox.Yes | QMessageBox.Cancel, - ) - if message_reply == QMessageBox.Yes: - return True - else: - return False - - -def display_info(widget, title, message): - """ - Display information in a pop-up that can only be accepted - """ - QMessageBox.information( - widget, - title, - message, - QMessageBox.Ok, - ) diff --git a/brainglobe_segmentation/segment.py b/brainglobe_segmentation/segment.py index 78107c1..b924518 100644 --- a/brainglobe_segmentation/segment.py +++ b/brainglobe_segmentation/segment.py @@ -3,6 +3,8 @@ import napari import numpy as np +from brainglobe_utils.qtpy.dialog import display_warning +from brainglobe_utils.qtpy.interaction import add_button from napari.qt.threading import thread_worker from qtpy import QtCore from qtpy.QtWidgets import QFileDialog, QGridLayout, QGroupBox, QLabel, QWidget @@ -19,8 +21,6 @@ WINDOW_HEIGHT, WINDOW_WIDTH, ) -from brainglobe_segmentation.layout.gui_elements import add_button -from brainglobe_segmentation.layout.utils import display_warning from brainglobe_segmentation.paths import Paths from brainglobe_segmentation.regions.IO import ( export_label_layers, diff --git a/brainglobe_segmentation/segmentation_panels/regions.py b/brainglobe_segmentation/segmentation_panels/regions.py index ede1f53..29762f5 100644 --- a/brainglobe_segmentation/segmentation_panels/regions.py +++ b/brainglobe_segmentation/segmentation_panels/regions.py @@ -1,3 +1,5 @@ +from brainglobe_utils.qtpy.dialog import display_info, display_warning +from brainglobe_utils.qtpy.interaction import add_button, add_checkbox from qtpy.QtWidgets import QGridLayout, QGroupBox from brainglobe_segmentation.layout.gui_constants import ( @@ -10,11 +12,6 @@ SEGM_METHODS_PANEL_ALIGN, SUMMARIZE_VOLUMES_DEFAULT, ) -from brainglobe_segmentation.layout.gui_elements import ( - add_button, - add_checkbox, -) -from brainglobe_segmentation.layout.utils import display_info, display_warning from brainglobe_segmentation.regions.analysis import region_analysis from brainglobe_segmentation.regions.layers import ( add_existing_region_segmentation, diff --git a/brainglobe_segmentation/segmentation_panels/tracks.py b/brainglobe_segmentation/segmentation_panels/tracks.py index 78af874..3b504ee 100644 --- a/brainglobe_segmentation/segmentation_panels/tracks.py +++ b/brainglobe_segmentation/segmentation_panels/tracks.py @@ -2,6 +2,13 @@ from glob import glob import numpy as np +from brainglobe_utils.qtpy.dialog import display_info, display_warning +from brainglobe_utils.qtpy.interaction import ( + add_button, + add_checkbox, + add_float_box, + add_int_box, +) from qtpy.QtWidgets import QGridLayout, QGroupBox from brainglobe_segmentation.image.utils import create_KDTree_from_image @@ -17,13 +24,6 @@ SUMMARISE_TRACK_DEFAULT, TRACK_FILE_EXT, ) -from brainglobe_segmentation.layout.gui_elements import ( - add_button, - add_checkbox, - add_float_box, - add_int_box, -) -from brainglobe_segmentation.layout.utils import display_info, display_warning from brainglobe_segmentation.tracks.analysis import track_analysis from brainglobe_segmentation.tracks.layers import ( add_existing_track_layers,