Skip to content

Commit 37a20e7

Browse files
committed
fix: colormap for QPI data only updating for one image view in QuickView
1 parent 1ad1a4a commit 37a20e7

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
2.21.1
22
- fix: maximize image size in QuickView
3+
- fix: colormap for QPI data only updating for one image view in QuickView
34
- ref: QuickView code needed tidying up
45
2.21.0
56
- feat: implement showing dataset basins in the analysis view (#182)

shapeout2/gui/quick_view/qv_main.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,21 +173,24 @@ def __init__(self, *args, **kwargs):
173173
"view_event": self.imageView_image,
174174
"view_poly": self.imageView_image_poly,
175175
"cmap": None,
176-
"cmap_changed": False,
176+
"cmap_changed": {"view_event": False,
177+
"view_poly": False},
177178
"kwargs": dict(autoLevels=False, levels=self.levels_image),
178179
},
179180
"qpi_pha": {
180181
"view_event": self.imageView_image_pha,
181182
"view_poly": self.imageView_image_poly_pha,
182183
"cmap": self.cmap_pha,
183-
"cmap_changed": False,
184+
"cmap_changed": {"view_event": False,
185+
"view_poly": False},
184186
"kwargs": dict(autoLevels=False, levels=self.levels_qpi_pha),
185187
},
186188
"qpi_amp": {
187189
"view_event": self.imageView_image_amp,
188190
"view_poly": self.imageView_image_poly_amp,
189191
"cmap": None,
190-
"cmap_changed": False,
192+
"cmap_changed": {"view_event": False,
193+
"view_poly": False},
191194
"kwargs": dict(autoLevels=False, levels=self.levels_qpi_amp),
192195
},
193196
}
@@ -421,7 +424,8 @@ def _prepare_event_image_qpi_pha(self, ds, event, state):
421424
if self.img_info["qpi_pha"]["cmap"] != new_cmap:
422425
self.img_info["qpi_pha"]["cmap"] = new_cmap
423426
# performance
424-
self.img_info["qpi_pha"]["cmap_changed"] = True
427+
self.img_info["qpi_pha"]["cmap_changed"]["view_poly"] = True
428+
self.img_info["qpi_pha"]["cmap_changed"]["view_event"] = True
425429

426430
cell_img = self._insert_contour_and_zoom(
427431
cell_img,
@@ -484,8 +488,8 @@ def show_image(self, feat, view, cell_img):
484488

485489
if (self.img_info[feat]["cmap"] is not None
486490
# performance
487-
and self.img_info[feat]["cmap_changed"]):
488-
self.img_info[feat]["cmap_changed"] = False
491+
and self.img_info[feat]["cmap_changed"][view]):
492+
self.img_info[feat]["cmap_changed"][view] = False
489493
self.img_info[feat][view].setColorMap(self.img_info[feat]["cmap"])
490494
self.img_info[feat][view].show()
491495

0 commit comments

Comments
 (0)