Skip to content

Commit

Permalink
cleanup and requested changes made
Browse files Browse the repository at this point in the history
  • Loading branch information
MikeSullivan7 committed Feb 20, 2025
1 parent 5583220 commit 6c6f22b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
2 changes: 2 additions & 0 deletions mantidimaging/core/data/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,4 +222,6 @@ def _get_stack_data_type(stack_id: uuid.UUID, dataset: Dataset) -> str:
return "Dark Before"
if dataset.dark_after is not None and stack_id == dataset.dark_after.id:
return "Dark After"
if dataset.proj180deg is not None and stack_id == dataset.proj180deg.id:
return "180"
raise RuntimeError(f"No stack with ID {stack_id} found in dataset {dataset.id}")
11 changes: 6 additions & 5 deletions mantidimaging/gui/windows/main/view.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ class MainWindowView(BaseMainWindowView):
nexus_save_dialog: NexusSaveDialog | None = None
add_to_dataset_dialog: AddImagesToDatasetDialog | None = None
move_stack_dialog: MoveStackDialog | None = None
stack_properties_dialog: StackPropertiesDialog | None = None

default_theme_enabled: int = 1

Expand Down Expand Up @@ -659,11 +658,11 @@ def _open_tree_menu(self, position: QPoint) -> None:
or self.dataset_tree_widget.itemAt(position).id in self.presenter.all_dataset_ids):
add_action = self.menuTreeView.addAction("Add / Replace Stack")
add_action.triggered.connect(self._add_images_to_existing_dataset)
properties_action = self.menuTreeView.addAction("Stack Properties")
properties_action.triggered.connect(self._stack_properties)
delete_action = self.menuTreeView.addAction("Delete")
delete_action.triggered.connect(self._delete_container)
if self.dataset_tree_widget.itemAt(position).id in self.presenter.all_stack_ids:
properties_action = self.menuTreeView.addAction("Stack Properties")
properties_action.triggered.connect(self._stack_properties)
move_action = self.menuTreeView.addAction("Move Stack")
move_action.triggered.connect(self._move_stack)

Expand All @@ -687,7 +686,7 @@ def _move_stack(self) -> None:
stack_id = self.dataset_tree_widget.selectedItems()[0].id
self.presenter.notify(PresNotification.SHOW_MOVE_STACK_DIALOG, stack_id=stack_id)

def _stack_properties(self):
def _stack_properties(self) -> None:
stack_id = self.dataset_tree_widget.selectedItems()[0].id
self.presenter.notify(PresNotification.SHOW_PROPERTIES_DIALOG, stack_id=stack_id)

Expand Down Expand Up @@ -767,5 +766,7 @@ def show_move_stack_dialog(self, origin_dataset_id: uuid.UUID, stack_id: uuid.UU
self.move_stack_dialog.show()

def show_stack_properties_dialog(self, stack_id: uuid.UUID, origin_dataset: Dataset, stack_data_type: str) -> None:
stack_properties_dialog = StackPropertiesDialog(self, stack_id, origin_dataset, stack_data_type)
stack = self.presenter.model.get_images_by_uuid(stack_id)
assert stack is not None
stack_properties_dialog = StackPropertiesDialog(self, stack, origin_dataset, stack_data_type)
stack_properties_dialog.show()
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def set_stack_data(self) -> None:
self.view.stack_shape = self.view.stack.data.shape
self.view.stack_size_MB = self.get_stack_size_MB()

def set_stack_directory(self):
def set_stack_directory(self) -> None:
if self.view.stack.filenames is not None:
self.view.directory = Path(self.view.stack.filenames[0]).parent

Expand Down
13 changes: 7 additions & 6 deletions mantidimaging/gui/windows/stack_properties_dialog/view.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,31 @@
# SPDX - License - Identifier: GPL-3.0-or-later
from __future__ import annotations

import uuid
from typing import TYPE_CHECKING

from PyQt5.QtWidgets import QLabel, QGridLayout

from mantidimaging.core.data import ImageStack
from mantidimaging.core.data.dataset import Dataset

from mantidimaging.gui.mvp_base import BaseDialogView
from mantidimaging.gui.windows.move_stack_dialog.presenter import Notification
from mantidimaging.gui.windows.stack_properties_dialog.presenter import StackPropertiesPresenter

if TYPE_CHECKING:
from mantidimaging.core.data import ImageStack
from mantidimaging.core.data.dataset import Dataset


class StackPropertiesDialog(BaseDialogView):

stack: ImageStack

def __init__(self, parent, stack_id: uuid.UUID, origin_dataset: Dataset, origin_data_type: str):
def __init__(self, parent, stack: ImageStack, origin_dataset: Dataset, origin_data_type: str):
super().__init__(parent)
self.parent_view = parent
self.origin_dataset = origin_dataset

self.presenter = StackPropertiesPresenter(self)

self.stack = self.parent_view.presenter.model.get_images_by_uuid(stack_id)
self.stack = stack

self.presenter.set_stack_data()
self.presenter.set_stack_directory()
Expand Down

0 comments on commit 6c6f22b

Please sign in to comment.