Skip to content

Commit 9e63255

Browse files
committed
fixes to LV Model test
1 parent 6848569 commit 9e63255

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

mantidimaging/gui/windows/live_viewer/model.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ def get_delayed_arrays(self, image_list: list[Image_Data]) -> list[dask.array.Ar
5757
return [dask.delayed(fits.open)(image_data.image_path)[0].data for image_data in image_list]
5858
else:
5959
return None
60+
else:
61+
return None
6062

6163
def get_delayed_image(self, index: int) -> dask.array.Array | None:
6264
return self.delayed_stack[index] if self.delayed_stack is not None else None
@@ -72,13 +74,15 @@ def get_computed_image(self, index: int):
7274
if index < 0:
7375
return None
7476
try:
75-
self.get_delayed_image(index).compute()
77+
image_to_compute = self.get_delayed_image(index)
78+
if image_to_compute:
79+
computed_image = image_to_compute.compute()
7680
except dask_image.imread.pims.api.UnknownFormatError:
7781
self.remove_image_data_by_index(index)
7882
self.get_computed_image(index - 1)
7983
except AttributeError:
8084
return None
81-
return self.get_delayed_image(index).compute()
85+
return computed_image
8286

8387
def get_selected_computed_image(self):
8488
try:
@@ -407,7 +411,9 @@ def _handle_directory_change(self) -> None:
407411
images = self.sort_images_by_modified_time(images)
408412
if len(images) == 0:
409413
self.image_stack.delete_all_data()
410-
self.image_stack.add_images_to_delayed_stack(images)
414+
415+
if self.create_delayed_array:
416+
self.image_stack.add_images_to_delayed_stack(images)
411417

412418
self.update_recent_watcher(images[-1:])
413419
self.image_changed.emit(images, self.image_stack)

mantidimaging/gui/windows/live_viewer/test/model_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ def _get_fake_data(self, ext: str):
183183
def test_WHEN_not_create_delayed_array_THEN_no_delayed_array_created(self):
184184
image_data_list, _, _ = self._get_fake_data('.tif')
185185
self.delayed_image_stack = DaskImageDataStack(image_data_list, create_delayed_array=False)
186-
self.assertIsNone(self.delayed_image_stack.get_delayed_arrays())
187186
self.assertIsNone(self.delayed_image_stack.delayed_stack)
188187
self.assertEqual(self.delayed_image_stack.image_list, image_data_list)
189188

0 commit comments

Comments
 (0)