Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#2273: Display the modified image timestamp within the live viewer to allow for easier determination of what scan is being displayed within the live viewer.
34 changes: 23 additions & 11 deletions mantidimaging/eyes_tests/live_viewer_window_test.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
# Copyright (C) 2024 ISIS Rutherford Appleton Laboratory UKRI
# SPDX - License - Identifier: GPL-3.0-or-later
from __future__ import annotations

from __future__ import annotations
from typing import TYPE_CHECKING
from unittest import mock

import numpy as np

import os
from mantidimaging.core.operations.loader import load_filter_packages
from mantidimaging.gui.windows.live_viewer.model import Image_Data
from mantidimaging.test_helpers.unit_test_helper import FakeFSTestCase
from pathlib import Path

from mantidimaging.eyes_tests.base_eyes import BaseEyesTest

if TYPE_CHECKING:
import time # noqa: F401


class LiveViewerWindowTest(FakeFSTestCase, BaseEyesTest):

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.initial_time = 4000.0

@classmethod
def setUpClass(cls) -> None:
super().setUpClass()
Expand All @@ -30,26 +36,30 @@ def setUp(self) -> None:
def _generate_image(self):
image = np.zeros((10, 10))
image[5, :] = np.arange(10)
os.utime(self.live_directory, (10, self.initial_time))
self.initial_time += 1000
return image

def _make_simple_dir(self, directory: Path):
file_list = [directory / f"abc_{i:06d}.tif" for i in range(5)]
if not directory.exists():
self.fs.create_dir(directory)

increment = 0
for file in file_list:
self.fs.create_file(file)
os.utime(file, (10, self.initial_time + increment))
increment += 1000

return file_list

@mock.patch('mantidimaging.gui.windows.live_viewer.model.ImageWatcher')
def test_live_view_opens_without_data(self, _mock_image_watcher):
@mock.patch("time.time", return_value=4000.0)
def test_live_view_opens_without_data(self, _mock_time, _mock_image_watcher):
self.imaging.show_live_viewer(self.live_directory)
self.check_target(widget=self.imaging.live_viewer)

@mock.patch('mantidimaging.gui.windows.live_viewer.presenter.LiveViewerWindowPresenter.load_image')
@mock.patch('mantidimaging.gui.windows.live_viewer.model.ImageWatcher')
def test_live_view_opens_with_data(self, _mock_image_watcher, mock_load_image):
@mock.patch("time.time", return_value=4000.0)
def test_live_view_opens_with_data(self, _mock_time, _mock_image_watcher, mock_load_image):
file_list = self._make_simple_dir(self.live_directory)
image_list = [Image_Data(path) for path in file_list]
mock_load_image.return_value = self._generate_image()
Expand All @@ -59,7 +69,8 @@ def test_live_view_opens_with_data(self, _mock_image_watcher, mock_load_image):

@mock.patch('mantidimaging.gui.windows.live_viewer.presenter.LiveViewerWindowPresenter.load_image')
@mock.patch('mantidimaging.gui.windows.live_viewer.model.ImageWatcher')
def test_live_view_opens_with_bad_data(self, _mock_image_watcher, mock_load_image):
@mock.patch("time.time", return_value=4000.0)
def test_live_view_opens_with_bad_data(self, _mock_time, _mock_image_watcher, mock_load_image):
file_list = self._make_simple_dir(self.live_directory)
image_list = [Image_Data(path) for path in file_list]
mock_load_image.side_effect = ValueError
Expand All @@ -69,7 +80,8 @@ def test_live_view_opens_with_bad_data(self, _mock_image_watcher, mock_load_imag

@mock.patch('mantidimaging.gui.windows.live_viewer.presenter.LiveViewerWindowPresenter.load_image')
@mock.patch('mantidimaging.gui.windows.live_viewer.model.ImageWatcher')
def test_rotate_operation_rotates_image(self, _mock_image_watcher, mock_load_image):
@mock.patch("time.time", return_value=4000.0)
def test_rotate_operation_rotates_image(self, _mock_time, _mock_image_watcher, mock_load_image):
file_list = self._make_simple_dir(self.live_directory)
image_list = [Image_Data(path) for path in file_list]
mock_load_image.return_value = self._generate_image()
Expand Down
5 changes: 5 additions & 0 deletions mantidimaging/gui/windows/live_viewer/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ def image_modified_time(self) -> float:
"""Return the image modified time"""
return self._stat.st_mtime

@property
def image_modified_time_stamp(self) -> str:
"""Return the image modified time as a string"""
return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(self.image_modified_time))


class SubDirectory:

Expand Down
3 changes: 2 additions & 1 deletion mantidimaging/gui/windows/live_viewer/presenter.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ def select_image(self, index: int) -> None:
if not self.model.images:
return
self.selected_image = self.model.images[index]
self.view.label_active_filename.setText(self.selected_image.image_name)
image_timestamp = self.selected_image.image_modified_time_stamp
self.view.label_active_filename.setText(f"{self.selected_image.image_name} - {image_timestamp}")

self.display_image(self.selected_image.image_path)

Expand Down