From d33f85ff333e26c85a558a2068f91b9927d06f9b Mon Sep 17 00:00:00 2001 From: conradry Date: Mon, 21 Mar 2022 11:44:48 -0400 Subject: [PATCH] correct napari version and hooks --- empanada_napari/_merge_split_widget.py | 6 ++++++ empanada_napari/_register_model.py | 2 ++ empanada_napari/_slice_inference.py | 2 ++ empanada_napari/_volume_inference.py | 4 +++- requirements.txt | 1 + setup.cfg | 2 +- 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/empanada_napari/_merge_split_widget.py b/empanada_napari/_merge_split_widget.py index 44c84e5..0d80c82 100644 --- a/empanada_napari/_merge_split_widget.py +++ b/empanada_napari/_merge_split_widget.py @@ -1,3 +1,4 @@ +from napari_plugin_engine import napari_hook_implementation from qtpy.QtWidgets import QWidget, QHBoxLayout, QPushButton from magicgui import magic_factory, magicgui from empanada.array_utils import merge_boxes, crop_and_binarize @@ -341,17 +342,22 @@ def widget( return widget +@napari_hook_implementation(specname='napari_experimental_provide_dock_widget') def split_by_dist(): return split_widget_distance, {'name': 'Split by Distance'} +@napari_hook_implementation(specname='napari_experimental_provide_dock_widget') def jump_to_label_widget(): return jump_to_label, {'name': 'Jump to Label'} +@napari_hook_implementation(specname='napari_experimental_provide_dock_widget') def merge_labels_widget(): return merge_labels, {'name': 'Merge Labels'} +@napari_hook_implementation(specname='napari_experimental_provide_dock_widget') def split_labels_widget(): return split_function, {'name': 'Split Labels'} +@napari_hook_implementation(specname='napari_experimental_provide_dock_widget') def delete_labels_widget(): return delete_labels, {'name': 'Delete Labels'} diff --git a/empanada_napari/_register_model.py b/empanada_napari/_register_model.py index 5a72567..2a6288c 100644 --- a/empanada_napari/_register_model.py +++ b/empanada_napari/_register_model.py @@ -1,6 +1,7 @@ import napari from napari import Viewer from napari.layers import Image, Shapes +from napari_plugin_engine import napari_hook_implementation from magicgui import magicgui from qtpy.QtWidgets import QWidget, QVBoxLayout, QLabel, QPlainTextEdit @@ -113,5 +114,6 @@ def _process_files(*args): return widget +@napari_hook_implementation(specname='napari_experimental_provide_dock_widget') def register_model_dock_widget(): return register_model_widget, {'name': 'Register new model'} diff --git a/empanada_napari/_slice_inference.py b/empanada_napari/_slice_inference.py index 2955e08..6c92a11 100644 --- a/empanada_napari/_slice_inference.py +++ b/empanada_napari/_slice_inference.py @@ -2,6 +2,7 @@ import yaml import os from typing import Any +from napari_plugin_engine import napari_hook_implementation import numpy as np from qtpy.QtWidgets import QWidget, QVBoxLayout, QLabel, QPlainTextEdit @@ -199,5 +200,6 @@ def _show_test_result(*args): return widget +@napari_hook_implementation(specname='napari_experimental_provide_dock_widget') def slice_dock_widget(): return test_widget, {'name': '2D Inference (Parameter Testing)'} diff --git a/empanada_napari/_volume_inference.py b/empanada_napari/_volume_inference.py index afb666e..a7e4882 100644 --- a/empanada_napari/_volume_inference.py +++ b/empanada_napari/_volume_inference.py @@ -1,6 +1,7 @@ import sys import os from typing import Any +from napari_plugin_engine import napari_hook_implementation import time import numpy as np @@ -256,6 +257,7 @@ def start_consensus_worker(trackers_dict): worker.start() return widget - + +@napari_hook_implementation(specname='napari_experimental_provide_dock_widget') def volume_dock_widget(): return volume_inference_widget, {'name': '3D Inference'} diff --git a/requirements.txt b/requirements.txt index c375943..23e6381 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +napari[all]>=0.4.13 scikit-image>=0.18 empanada-dl>=0.1.2 napari-plugin-engine>=0.1.4 diff --git a/setup.cfg b/setup.cfg index 5bbe86b..42a2b56 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,7 +32,7 @@ setup_requires = setuptools_scm include_package_data = True # add your package requirements here install_requires = - napari[all]>=0.4.15 + napari[all]>=0.4.13 napari-plugin-engine>=0.1.4 scikit-image>=0.18 empanada-dl>=0.1.2