Skip to content
Merged
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
20 changes: 10 additions & 10 deletions package/PartSeg/common_gui/napari_image_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
from vispy.scene import BaseCamera


_napari_ge_5 = parse_version(napari.__version__) >= parse_version("0.5.0a1")
_napari_le_7_0 = parse_version(napari.__version__) <= parse_version("0.7.0")
_napari_gt_8_0 = parse_version(napari.__version__) > parse_version("0.8.0")

# if run with numpy<2 on macOS arm64 architecture compiled from pypi wheels
# then it will crash with bus error if numpy is used in different thread
Expand Down Expand Up @@ -232,7 +232,11 @@ def _connect_to_settings(self):
self.settings.connect_to_profile("scale_bar_ticks", self._update_scale_bar_ticks)

def _update_scale_bar_ticks(self):
self.viewer.scale_bar.ticks = self.settings.get_from_profile("scale_bar_ticks", True)
ticks = self.settings.get_from_profile("scale_bar_ticks", True)
if _napari_gt_8_0:
self.viewer.canvas.overlays.scale_bar.ticks = ticks
else:
self.viewer.scale_bar.ticks = ticks

def toggle_points_visibility(self):
if self.points_layer is not None:
Expand Down Expand Up @@ -950,15 +954,11 @@ def closeEvent(self, event):
super().closeEvent(event)

def _render(self):
if _napari_ge_5:
return self.canvas._scene_canvas.render()
return self.canvas.render()

if _napari_ge_5:
return self.canvas._scene_canvas.render()

@property
def view(self):
return self.canvas.view
@property
def view(self):
return self.canvas.view


class SearchComponentModal(QtPopup):
Expand Down
Loading