mirror of
https://github.com/bec-project/bec_widgets.git
synced 2026-11-22 01:04:30 +01:00
fix(image): frame renders no longer trigger the colorbar autorange disable
This commit is contained in:
1 parent
06523df66b
commit
9e5b6d02b9
2 files changed
+42
-1
No files matched your search
@@ -515,7 +515,17 @@ class ImageBase(PlotBase):
|
||||
self._color_bar.setImageItem(main_image)
|
||||
self.config.color_bar = "full"
|
||||
self._apply_colormap_to_colorbar(self.config.color_map)
|
||||
self._color_bar.sigLevelsChanged.connect(disable_autorange)
|
||||
region = self._color_bar.region
|
||||
|
||||
def disable_autorange_on_drag():
|
||||
# sigLevelsChanged also fires on every rendered frame:
|
||||
# HistogramLUTItem.imageChanged snaps the region to the
|
||||
# current image levels on each setImage. Only a mouse drag
|
||||
# of the region (or one of its edge lines) is user intent.
|
||||
if region.moving or any(line.moving for line in region.lines):
|
||||
disable_autorange()
|
||||
|
||||
self._color_bar.sigLevelsChanged.connect(disable_autorange_on_drag)
|
||||
|
||||
# Custom colorbar context menu (replaces pyqtgraph's default menus).
|
||||
self._color_bar.sigColorMapChangeRequested.connect(self._set_colormap_from_menu)
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
from unittest import mock
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import numpy as np
|
||||
@@ -232,6 +233,36 @@ def test_full_colorbar_uses_bec_histogram_lut_item(qtbot, mocked_client):
|
||||
assert color_bar.vb.getMenu(None) is color_bar._bec_menu
|
||||
|
||||
|
||||
def test_full_colorbar_frames_do_not_disable_autorange(qtbot, mocked_client):
|
||||
"""Rendering frames must not count as a user level change: pyqtgraph's
|
||||
HistogramLUTItem snaps its region to the image levels on every setImage,
|
||||
which used to fire the drag-disable hook on each update."""
|
||||
view = create_widget(qtbot, Image, client=mocked_client)
|
||||
view.enable_full_colorbar = True
|
||||
view.autorange = True
|
||||
rng = np.random.default_rng(7)
|
||||
with mock.patch.object(view, "_set_autorange", wraps=view._set_autorange) as spy:
|
||||
for frame in range(3):
|
||||
view.main_image.set_data(rng.random((20, 20)) * (frame + 1))
|
||||
disable_calls = [call for call in spy.call_args_list if call.args and call.args[0] is False]
|
||||
assert not disable_calls
|
||||
assert view.autorange is True
|
||||
|
||||
|
||||
def test_full_colorbar_region_drag_disables_autorange(qtbot, mocked_client):
|
||||
"""An actual mouse drag of the histogram region must still switch
|
||||
autorange off."""
|
||||
view = create_widget(qtbot, Image, client=mocked_client)
|
||||
view.enable_full_colorbar = True
|
||||
view.autorange = True
|
||||
view.main_image.set_data(np.ones((20, 20)))
|
||||
region = view._color_bar.region
|
||||
region.moving = True # simulate an active mouse drag
|
||||
region.setRegion((0.1, 0.7))
|
||||
region.moving = False
|
||||
assert view.autorange is False
|
||||
|
||||
|
||||
def test_colorbar_menu_set_levels_updates_vrange(qtbot, mocked_client):
|
||||
bec_image_view = create_widget(qtbot, Image, client=mocked_client)
|
||||
bec_image_view.enable_full_colorbar = True
|
||||
|
||||
Reference in new issue
Block a user