diff --git a/aydin/gui/_qt/custom_widgets/denoise_tab_method.py b/aydin/gui/_qt/custom_widgets/denoise_tab_method.py index 7ffa5135..4fb15090 100644 --- a/aydin/gui/_qt/custom_widgets/denoise_tab_method.py +++ b/aydin/gui/_qt/custom_widgets/denoise_tab_method.py @@ -28,7 +28,7 @@ def __init__( self.description = description # Widget layout - self.layout = QHBoxLayout() + self.main_layout = QHBoxLayout() self.tab_method_layout = QVBoxLayout() self.tab_method_layout.setAlignment(Qt.AlignTop) @@ -107,11 +107,11 @@ def __init__( self.right_side_vlayout.addWidget(self.scroll) - self.layout.addLayout(self.tab_method_layout, 35) - self.layout.addWidget(QVerticalLineBreakWidget(self)) - self.layout.addLayout(self.right_side_vlayout, 50) + self.main_layout.addLayout(self.tab_method_layout, 35) + self.main_layout.addWidget(QVerticalLineBreakWidget(self)) + self.main_layout.addLayout(self.right_side_vlayout, 50) - self.setLayout(self.layout) + self.setLayout(self.main_layout) def lower_level_args(self): args = {} diff --git a/aydin/gui/_qt/custom_widgets/denoise_tab_pretrained_method.py b/aydin/gui/_qt/custom_widgets/denoise_tab_pretrained_method.py index 96b06793..955e7142 100644 --- a/aydin/gui/_qt/custom_widgets/denoise_tab_pretrained_method.py +++ b/aydin/gui/_qt/custom_widgets/denoise_tab_pretrained_method.py @@ -23,7 +23,7 @@ def __init__(self, parent, loaded_it): self.description = f"This is a pretrained model, namely uses the image translator: {loaded_it.__class__.__name__}, will not train anything new but will quickly infer on the images of your choice." # Widget layout - self.layout = QHBoxLayout() + self.main_layout = QHBoxLayout() self.tab_method_layout = QVBoxLayout() self.tab_method_layout.setAlignment(Qt.AlignTop) @@ -63,8 +63,8 @@ def __init__(self, parent, loaded_it): self.right_side_vlayout.addLayout(self.save_json_and_model_layout) - self.layout.addLayout(self.tab_method_layout, 35) - self.layout.addWidget(QVerticalLineBreakWidget(self)) - self.layout.addLayout(self.right_side_vlayout, 50) + self.main_layout.addLayout(self.tab_method_layout, 35) + self.main_layout.addWidget(QVerticalLineBreakWidget(self)) + self.main_layout.addLayout(self.right_side_vlayout, 50) - self.setLayout(self.layout) + self.setLayout(self.main_layout) diff --git a/aydin/gui/_qt/custom_widgets/horizontal_line_break_widget.py b/aydin/gui/_qt/custom_widgets/horizontal_line_break_widget.py index 8af9a046..906fea81 100644 --- a/aydin/gui/_qt/custom_widgets/horizontal_line_break_widget.py +++ b/aydin/gui/_qt/custom_widgets/horizontal_line_break_widget.py @@ -7,11 +7,11 @@ def __init__(self, parent): super(QHorizontalLineBreakWidget, self).__init__(parent) self.parent = parent - self.layout = QHBoxLayout() + self.main_layout = QHBoxLayout() self.horizontal_line_break = QFrame( frameShape=QFrame.HLine, frameShadow=QFrame.Sunken ) - self.layout.addWidget(self.horizontal_line_break) - self.layout.setAlignment(Qt.AlignTop) - self.setLayout(self.layout) + self.main_layout.addWidget(self.horizontal_line_break) + self.main_layout.setAlignment(Qt.AlignTop) + self.setLayout(self.main_layout) diff --git a/aydin/gui/_qt/custom_widgets/program_flow_diagram.py b/aydin/gui/_qt/custom_widgets/program_flow_diagram.py index 3e9b4dcf..01572d5c 100644 --- a/aydin/gui/_qt/custom_widgets/program_flow_diagram.py +++ b/aydin/gui/_qt/custom_widgets/program_flow_diagram.py @@ -19,11 +19,8 @@ def __init__(self, parent): self.parent = parent self.highlightable_buttons = [] - self.layout = QHBoxLayout() - - # self.main_group_box = QGroupBox("Program Flow") - self.layout = QHBoxLayout() - self.layout.setSpacing(5) + self.main_layout = QHBoxLayout() + self.main_layout.setSpacing(5) self.load_data_group_box = QGroupBox("Load data") self.load_data_group_box_layout = QHBoxLayout() @@ -60,9 +57,9 @@ def __init__(self, parent): self.load_data_group_box_layout.addWidget(self.load_sample_image_button) self.load_data_group_box.setLayout(self.load_data_group_box_layout) - self.layout.addWidget(self.load_data_group_box) + self.main_layout.addWidget(self.load_data_group_box) - self.layout.addWidget(self.forward_button()) + self.main_layout.addWidget(self.forward_button()) # choose image options self.choose_image_options_group_box = QGroupBox("Choose image options") @@ -94,9 +91,9 @@ def __init__(self, parent): self.choose_image_options_group_box_layout ) - self.layout.addWidget(self.choose_image_options_group_box) + self.main_layout.addWidget(self.choose_image_options_group_box) - self.layout.addWidget(self.forward_button()) + self.main_layout.addWidget(self.forward_button()) self.processing_group_box = QGroupBox("Process") self.processing_group_box_layout = QHBoxLayout() @@ -121,11 +118,11 @@ def __init__(self, parent): self.processing_group_box.setLayout(self.processing_group_box_layout) - self.layout.addWidget(self.processing_group_box) + self.main_layout.addWidget(self.processing_group_box) - self.layout.setAlignment(Qt.AlignHCenter) + self.main_layout.setAlignment(Qt.AlignHCenter) - self.setLayout(self.layout) + self.setLayout(self.main_layout) def highlight_button(self, current_tab_name): self.reset_buttons() diff --git a/aydin/gui/_qt/custom_widgets/system_summary.py b/aydin/gui/_qt/custom_widgets/system_summary.py index bb69e5e5..eb985c4b 100644 --- a/aydin/gui/_qt/custom_widgets/system_summary.py +++ b/aydin/gui/_qt/custom_widgets/system_summary.py @@ -12,8 +12,8 @@ class SystemSummaryWidget(QWidget): def __init__(self, parent): QWidget.__init__(self, parent) - self.layout = QHBoxLayout() - self.layout.setAlignment(Qt.AlignCenter) + self.main_layout = QHBoxLayout() + self.main_layout.setAlignment(Qt.AlignCenter) # CPU summary self.cpu_group_box = QGroupBox("CPU Summary") @@ -175,8 +175,8 @@ def __init__(self, parent): else: self.gpu_memory_free_label.setStyleSheet("QLabel {color: green;}") - self.layout.addWidget(self.cpu_group_box) - self.layout.addWidget(self.memory_group_box) - self.layout.addWidget(self.gpu_group_box) + self.main_layout.addWidget(self.cpu_group_box) + self.main_layout.addWidget(self.memory_group_box) + self.main_layout.addWidget(self.gpu_group_box) - self.setLayout(self.layout) + self.setLayout(self.main_layout) diff --git a/aydin/gui/_qt/custom_widgets/vertical_line_break_widget.py b/aydin/gui/_qt/custom_widgets/vertical_line_break_widget.py index a59ec168..d9a13bcc 100644 --- a/aydin/gui/_qt/custom_widgets/vertical_line_break_widget.py +++ b/aydin/gui/_qt/custom_widgets/vertical_line_break_widget.py @@ -7,11 +7,11 @@ def __init__(self, parent): super(QVerticalLineBreakWidget, self).__init__(parent) self.parent = parent - self.layout = QHBoxLayout() + self.main_layout = QHBoxLayout() self.vertical_line_break = QFrame( frameShape=QFrame.VLine, frameShadow=QFrame.Sunken ) - self.layout.addWidget(self.vertical_line_break) - self.layout.setAlignment(Qt.AlignLeft) - self.setLayout(self.layout) + self.main_layout.addWidget(self.vertical_line_break) + self.main_layout.setAlignment(Qt.AlignLeft) + self.setLayout(self.main_layout) diff --git a/aydin/gui/_qt/transforms_tab_item.py b/aydin/gui/_qt/transforms_tab_item.py index 74ca8f8e..9a22277e 100644 --- a/aydin/gui/_qt/transforms_tab_item.py +++ b/aydin/gui/_qt/transforms_tab_item.py @@ -39,7 +39,7 @@ def __init__( self.transform_class = transform_class self.line_edits = [] - self.layout = QHBoxLayout() + self.main_layout = QHBoxLayout() explanation_text_string = self.transform_class.__doc__ explanation_text_string = break_text(explanation_text_string) @@ -48,10 +48,10 @@ def __init__( self.explanation_text.setTextFormat(Qt.RichText) self.explanation_text.setOpenExternalLinks(True) self.explanation_text.setAlignment(Qt.AlignTop) - self.layout.addWidget(self.explanation_text, 45) + self.main_layout.addWidget(self.explanation_text, 45) # Vertical Line Break - self.layout.addWidget(QVerticalLineBreakWidget(self)) + self.main_layout.addWidget(QVerticalLineBreakWidget(self)) self.transform_details_layout = QVBoxLayout() self.transform_details_layout.setAlignment(Qt.AlignTop) @@ -105,9 +105,9 @@ def __init__( self.scroll.setMinimumHeight(200) self.transform_details_layout.addWidget(self.scroll) - self.layout.addLayout(self.transform_details_layout, 45) - self.layout.setAlignment(Qt.AlignTop) - self.setLayout(self.layout) + self.main_layout.addLayout(self.transform_details_layout, 45) + self.main_layout.setAlignment(Qt.AlignTop) + self.setLayout(self.main_layout) def preprocess_chechbox_on_state_changed(self): self.postprocess_checkbox.setEnabled(self.preprocess_checkbox.isChecked()) diff --git a/aydin/gui/main_page.py b/aydin/gui/main_page.py index ed276a0b..977ccb94 100644 --- a/aydin/gui/main_page.py +++ b/aydin/gui/main_page.py @@ -73,8 +73,8 @@ def __init__(self, parent, threadpool, status_bar): self.activity_dock = QDockWidget("Activity", self) # MainPage layout - self.widget_layout = QVBoxLayout() - self.widget_layout.setAlignment(Qt.AlignTop) + self.main_layout = QVBoxLayout() + self.main_layout.setAlignment(Qt.AlignTop) # navbar self.navbar_layout = QHBoxLayout() @@ -171,7 +171,7 @@ def __init__(self, parent, threadpool, status_bar): self.navbar_layout.addLayout(self.navbar_layout_right) self.navbar_layout.setAlignment(Qt.AlignTop) - self.widget_layout.addLayout(self.navbar_layout) + self.main_layout.addLayout(self.navbar_layout) # TabWidget self.tabwidget = QTabWidget(self) @@ -179,13 +179,13 @@ def __init__(self, parent, threadpool, status_bar): for key, value in self.tabs.items(): self.tabwidget.addTab(value, key) - self.widget_layout.addWidget(self.tabwidget) + self.main_layout.addWidget(self.tabwidget) self.overlay = Overlay(self) self.overlay.hide() # Set layout for the main page widget - self.setLayout(self.widget_layout) + self.setLayout(self.main_layout) self.tabs["Dimensions"].dimensions = None self.tabs["Training Crop"].images = [] diff --git a/aydin/gui/tabs/qt/base_cropping.py b/aydin/gui/tabs/qt/base_cropping.py index e7d20858..7cda4904 100644 --- a/aydin/gui/tabs/qt/base_cropping.py +++ b/aydin/gui/tabs/qt/base_cropping.py @@ -238,11 +238,11 @@ def initialize_viewer(self): self.crop_layer.colormap = "cyan" for slider_widget in self.viewer_qt.dims.slider_widgets: - slider_widget.layout().itemAt(0).widget().setMinimumWidth(75) - slider_widget.layout().itemAt(1).widget().setMaximumWidth(75) - slider_widget.layout().itemAt(1).widget().setText("Play") - slider_widget.layout().itemAt(3).widget().setMinimumWidth(75) - slider_widget.layout().itemAt(5).widget().setMinimumWidth(75) + slider_widget.main_layout().itemAt(0).widget().setMinimumWidth(75) + slider_widget.main_layout().itemAt(1).widget().setMaximumWidth(75) + slider_widget.main_layout().itemAt(1).widget().setText("Play") + slider_widget.main_layout().itemAt(3).widget().setMinimumWidth(75) + slider_widget.main_layout().itemAt(5).widget().setMinimumWidth(75) self.update_summary()