Skip to content

Commit

Permalink
Use get_app_model instead of get_app for napari>=0.5.4 (#103)
Browse files Browse the repository at this point in the history
Co-authored-by: Juan Nunez-Iglesias <[email protected]>
Co-authored-by: Grzegorz Bokota <[email protected]>
  • Loading branch information
3 people authored Nov 7, 2024
1 parent 9627d14 commit cd96bf0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
5 changes: 2 additions & 3 deletions midi_app_controller/actions/_tests/test_napari_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from napari.layers import Image
from napari.layers.labels import Labels
from napari.layers.labels._labels_constants import Mode
from napari.viewer import Viewer

from ..napari_actions import (
activate_labels_mode,
Expand Down Expand Up @@ -121,8 +120,8 @@ def test_selected_label():
assert other_layer.selected_label == 5


def test_zoom_and_dimensions():
viewer = Viewer()
def test_zoom_and_dimensions(make_napari_viewer):
viewer = make_napari_viewer()
zoom = viewer.camera.zoom

zoom_out(viewer)
Expand Down
11 changes: 8 additions & 3 deletions midi_app_controller/state/state_manager.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
from importlib.metadata import version
from pathlib import Path
from typing import NamedTuple, Optional

import rtmidi
from app_model import Application
from app_model.registries import MenusRegistry
from app_model.types import CommandRule, MenuItem
from packaging.version import parse as parse_version

# TODO: This will be made public in some future napari version
from napari._app_model import get_app
if parse_version(version("napari")) >= parse_version("0.5.4"):
from napari._app_model import get_app_model
else:
from napari._app_model import get_app as get_app_model

from midi_app_controller.actions.actions_handler import ActionsHandler
from midi_app_controller.actions.bound_controller import BoundController
Expand Down Expand Up @@ -364,7 +369,7 @@ def get_state_manager() -> StateManager:
"""Returns the `StateManager` singleton."""
global _STATE_MANAGER
if _STATE_MANAGER is None:
register_custom_napari_actions(get_app())
_STATE_MANAGER = StateManager(get_app())
register_custom_napari_actions(get_app_model())
_STATE_MANAGER = StateManager(get_app_model())
_STATE_MANAGER.load_state()
return _STATE_MANAGER

0 comments on commit cd96bf0

Please sign in to comment.