From 6d833423251eb48b6074558e7e4a762d63530e8f Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Mon, 3 Aug 2026 21:52:55 +0200 Subject: [PATCH] fix: Second fix for napari repository tests closes #1438 --- package/PartSeg/common_gui/napari_image_view.py | 5 ++++- .../tests/test_PartSeg/test_channel_control.py | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/package/PartSeg/common_gui/napari_image_view.py b/package/PartSeg/common_gui/napari_image_view.py index b283245b2..69d31f43f 100644 --- a/package/PartSeg/common_gui/napari_image_view.py +++ b/package/PartSeg/common_gui/napari_image_view.py @@ -245,7 +245,10 @@ def toggle_points_visibility(self): def toggle_scale_bar(self): if _napari_le_7_0: self.viewer.scale_bar.unit = "nm" - self.viewer.scale_bar.visible = not self.viewer.scale_bar.visible + if _napari_gt_8_0: + self.viewer.canvas.overlays.scale_bar.visible = not self.viewer.canvas.overlays.scale_bar.visible + else: + self.viewer.scale_bar.visible = not self.viewer.scale_bar.visible def _dim_order_menu(self, point: QPoint): menu = QMenu() diff --git a/package/tests/test_PartSeg/test_channel_control.py b/package/tests/test_PartSeg/test_channel_control.py index c7b07e828..56ed10f59 100644 --- a/package/tests/test_PartSeg/test_channel_control.py +++ b/package/tests/test_PartSeg/test_channel_control.py @@ -1,10 +1,12 @@ # pylint: disable=no-self-use +from pathlib import Path from unittest.mock import MagicMock import numpy as np import pytest from napari.utils.colormaps import make_colorbar +from pytestqt.qtbot import QtBot from qtpy.QtCore import QPoint, Qt from qtpy.QtGui import QImage @@ -294,12 +296,21 @@ def check_parameters(name, index): @pytest.mark.windows_ci_skip @pytest.mark.parametrize("filter_value", NoiseFilterType.__members__.values()) - def test_image_view_integration_filter(self, qtbot, tmp_path, filter_value, ch_property, image_view): + def test_image_view_integration_filter( + self, + qtbot: QtBot, + tmp_path: Path, + filter_value: NoiseFilterType, + ch_property: ChannelProperty, + image_view: ImageView, + ): image_view.channel_control.set_active(1) - def check_parameters(name, index): + def check_parameters(name: str, index: int): return name == "test" and index == 1 + image_view.show() + if filter_value is NoiseFilterType.No: with ( qtbot.waitSignal(image_view.channel_control.coloring_update), @@ -315,6 +326,7 @@ def check_parameters(name, index): assert (filter_value != NoiseFilterType.No and np.any(image4 != 255)) or ( filter_value == NoiseFilterType.No and np.any(image4 == 255) ) + image_view.hide() @pytest.mark.windows_ci_skip def test_image_view_integration(self, qtbot, tmp_path, ch_property, image_view):