Merge pull request #66 from clEsperanto/dev3

Dev3

Author: haesleinhuepf

napari_pyclesperanto_assistant/__init__.py

@@ -2,5 +2,5 @@
 from ._convert_to_numpy import *
 from ._napari_cle_functions import *
 
-__version__ = "0.21.2"
+__version__ = "0.22.0"
 __common_alias__ = "ncle"

napari_pyclesperanto_assistant/_advanced_statistics.py

@@ -5,7 +5,7 @@
 from napari_tools_menu import register_function
 import numpy as np
 
-@register_function(menu="Measurement > Statistics of labeled pixels including neighborhood statistics (deprecated, clEsperanto)")
+@register_function(menu="Measurement tables > Statistics of labeled pixels including neighborhood statistics (deprecated, clEsperanto)")
 def advanced_statistics(
         intensity_image: napari.types.ImageData,
         label_image: napari.types.LabelsData,
@@ -122,4 +122,4 @@ def region_props_with_neighborhood_data(
 from napari_skimage_regionprops._all_frames import analyze_all_frames
 
 regionprops_table_all_frames = analyze_all_frames(advanced_statistics)
-register_function(regionprops_table_all_frames, menu="Measurement > Statistics of labeled pixels including neighborhood statistics of all frames (clEsperanto)")
+register_function(regionprops_table_all_frames, menu="Measurement tables > Statistics of labeled pixels including neighborhood statistics of all frames (clEsperanto)")

napari_pyclesperanto_assistant/_napari_cle_functions.py

@@ -214,14 +214,14 @@ def binary_xor(labels1:"napari.types.LabelsData", labels2:"napari.types.LabelsDa
     return cle.binary_xor(labels1, labels2)
 
 
-@register_function(menu="Measurement > Extension ratio map (clesperanto)")
+@register_function(menu="Measurement maps > Extension ratio map (clesperanto)")
 @time_slicer
 @_package_ncle
 def extension_ratio_map(labels:"napari.types.LabelsData") -> "napari.types.ImageData":
     return cle.extension_ratio_map(labels)
 
 
-@register_function(menu="Measurement > Pixel count map (clesperanto)")
+@register_function(menu="Measurement maps > Pixel count map (clesperanto)")
 @time_slicer
 @_package_ncle
 def pixel_count_map(labels:"napari.types.LabelsData") -> "napari.types.ImageData":

napari_pyclesperanto_assistant/_neighborhood_statistics.py

@@ -3,7 +3,7 @@
 import pyclesperanto_prototype as cle
 from napari_tools_menu import register_function
 
-@register_function(menu="Measurement > Neighborhood statistics of measurements (clEsperanto)")
+@register_function(menu="Measurement tables > Neighborhood statistics of measurements (clEsperanto)")
 def neighborhood_statistics(labels_layer: napari.layers.Labels,
                             touching_neighbors:bool = True,
                             neighbors_of_touching_neighbors:bool = True,

napari_pyclesperanto_assistant/_statistics_of_labeled_pixels.py

@@ -4,7 +4,7 @@
 from napari_skimage_regionprops._all_frames import analyze_all_frames
 from napari_tools_menu import register_function
 
-@register_function(menu="Measurement > Label statistics (clEsperanto)")
+@register_function(menu="Measurement tables > Label statistics (clEsperanto)")
 def label_statistics(intensity_image: "napari.types.ImageData",
                      label_image: "napari.types.LabelsData",
                      intensity:bool = True,
@@ -65,14 +65,14 @@ def label_statistics(intensity_image: "napari.types.ImageData",
         warnings.warn("Image and labels must be set.")
 
 regionprops_table_all_frames = analyze_all_frames(label_statistics)
-register_function(regionprops_table_all_frames, menu="Measurement > Label statistics of all frames (clEsperanto)")
+register_function(regionprops_table_all_frames, menu="Measurement tables > Label statistics of all frames (clEsperanto)")
 
 def copy_keys(source, target, keys):
     for k in keys:
         target[k] = source[k]
 
 
-@register_function(menu="Measurement > Statistics of labeled pixels (deprecated, clEsperanto)")
+@register_function(menu="Measurement tables > Statistics of labeled pixels (deprecated, clEsperanto)")
 def statistics_of_labeled_pixels(image: "napari.types.ImageData", labels: "napari.types.LabelsData", measure_background=False, napari_viewer : "napari.Viewer"=None) -> "pandas.DataFrame":
     """
     Adds a table widget to a given napari viewer with quantitative analysis results derived from an image-labelimage pair.
@@ -117,7 +117,7 @@ def statistics_of_labeled_pixels(image: "napari.types.ImageData", labels: "napar
     from morphometrics._gui._qt.measurement_widgets import QtMeasurementWidget
     register_dock_widget(
         QtMeasurementWidget,
-        "Measurement > Region properties (morphometrics)"
+        "Measurement tables > Region properties (morphometrics)"
     )
 except:
     pass

requirements.txt

@@ -3,7 +3,7 @@ pyopencl
 toolz
 scikit-image
 napari >=0.4.15
-pyclesperanto-prototype >=0.21.1
+pyclesperanto-prototype >=0.22.0
 magicgui
 numpy!=1.19.4
 pyperclip

setup.py

@@ -31,7 +31,7 @@ def read(fname):
 #use_scm = {"write_to": "napari_pyclesperanto_assistant/_version.py"}
 setup(
     name="napari_pyclesperanto_assistant",
-    version="0.21.2",
+    version="0.22.0",
     author="Robert Haase, Talley Lambert",
     author_email="robert.haase@tu-dresden.de",
     description="GPU-accelerated image processing in napari using OpenCL",

tox.ini

@@ -22,7 +22,6 @@ platform =
 passenv = 
     CI
     GITHUB_ACTIONS
-    DISPLAY XAUTHORITY
     NUMPY_EXPERIMENTAL_ARRAY_FUNCTION
     PYVISTA_OFF_SCREEN
 deps =