Merge pull request #44 from haesleinhuepf/move_menus

Move menus
haesleinhuepf · Jan 15, 2023 · 62880d2 · 62880d2
2 parents 05d7901 + c390ff7
commit 62880d2
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/napari_skimage_regionprops/__init__.py b/napari_skimage_regionprops/__init__.py
@@ -8,7 +8,7 @@
 try:
     from ._version import version as __version__
 except ImportError:
-    __version__ = "0.6.0"
+    __version__ = "0.6.1"
 
 
 @napari_hook_implementation

diff --git a/napari_skimage_regionprops/_measure_points.py b/napari_skimage_regionprops/_measure_points.py
@@ -1,7 +1,7 @@
 import numpy as np
 from napari_tools_menu import register_function
 
-@register_function(menu = "Measurement > Measure intensity at point coordinates (nsr)")
+@register_function(menu = "Measurement tables > Measure intensity at point coordinates (nsr)")
 def measure_points(points: "napari.types.PointsData", intensity_image: "napari.types.ImageData",
                    viewer: "napari.Viewer" = None):
     """

diff --git a/napari_skimage_regionprops/_parametric_images.py b/napari_skimage_regionprops/_parametric_images.py
@@ -2,6 +2,7 @@
 from napari_tools_menu import register_function
 import numpy
 
+@register_function(menu="Measurement maps > Measurements on labels (nsr)")
 @register_function(menu="Visualization > Measurements on labels (nsr)")
 def visualize_measurement_on_labels(labels_layer:"napari.layers.Labels", column:str = "label", viewer:"napari.Viewer" = None) -> "napari.types.ImageData":
     """

diff --git a/napari_skimage_regionprops/_regionprops.py b/napari_skimage_regionprops/_regionprops.py
@@ -16,7 +16,7 @@ def regionprops(image_layer : napari.layers.Layer, labels_layer: napari.layers.L
 
     regionprops_table(image_data, labels_layer.data, size, intensity, perimeter, shape, position, moments, napari_viewer)
 
-@register_function(menu="Measurement > Regionprops (scikit-image, nsr)")
+@register_function(menu="Measurement tables > Regionprops (scikit-image, nsr)")
 def regionprops_table(image : napari.types.ImageData, labels: napari.types.LabelsData, size : bool = True, intensity : bool = True, perimeter : bool = False, shape : bool = False, position : bool = False, moments : bool = False, napari_viewer : Viewer = None) -> "pandas.DataFrame":
     """
     Adds a table widget to a given napari viewer with quantitative analysis results derived from an image-label pair.
@@ -183,7 +183,7 @@ def ellipsoid_axis_lengths(table):
     return tuple([math.sqrt(20.0 * e) for e in eigvals])
 
 regionprops_table_all_frames = analyze_all_frames(regionprops_table)
-register_function(regionprops_table_all_frames, menu="Measurement > Regionprops of all frames (nsr)")
+register_function(regionprops_table_all_frames, menu="Measurement tables > Regionprops of all frames (nsr)")
 
 
 
@@ -212,7 +212,7 @@ def regionprops_for_morphometrics(intensity_image : "napari.types.ImageData", la
     from morphometrics._gui._qt.measurement_widgets import QtMeasurementWidget
     register_dock_widget(
         QtMeasurementWidget,
-        "Measurement > Region properties (morphometrics)"
+        "Measurement tables > Region properties (morphometrics)"
     )
 except:
     pass

diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@ def read(fname):
     packages=find_packages(),
     python_requires='>=3.8',
     install_requires=requirements,
-    version='0.6.0',
+    version='0.6.1',
     #use_scm_version=use_scm,
     setup_requires=['setuptools_scm'],
     classifiers=[

diff --git a/tox.ini b/tox.ini
@@ -22,7 +22,6 @@ platform =
 passenv = 
     CI
     GITHUB_ACTIONS
-    DISPLAY XAUTHORITY
     NUMPY_EXPERIMENTAL_ARRAY_FUNCTION
     PYVISTA_OFF_SCREEN
 deps =