Skip to content

Commit 58f675d

Browse files
committed
regenerated ops and docs
1 parent c6f5ece commit 58f675d

File tree

3 files changed

+122
-4
lines changed

3 files changed

+122
-4
lines changed

src/main/java/net/haesleinhuepf/clijx/jython/CLIJ2AutoComplete.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public static ArrayList<BasicCompletion> getCompletions(final ScriptingAutoCompl
384384
description = "<b>generateTouchMatrix</b><br><br>Takes a labelmap with n labels and generates a (n+1)*(n+1) matrix where all pixels are set to 0 exept those where labels are touching. <br><br>Only half of the matrix is filled (with x < y). For example, if labels 3 and 4 are touching then the pixel (3,4) in the matrix will be set to 1.<br>The touch matrix is a representation of a region adjacency graph<br><br><br>Parameters:<br>ClearCLBuffer label_map, ClearCLBuffer touch_matrix_destination";
385385
list.add(new BasicCompletion(provider, headline, null, description));
386386
headline = "clij2.getAutomaticThreshold(ClearCLBuffer arg1, String arg2)";
387-
description = "<b>getAutomaticThreshold</b><br><br>The automatic thresholder utilizes the threshold methods from ImageJ on a histogram determined on <br>the GPU to determine a threshold value as similar as possible to ImageJ 'Apply Threshold' method. <br><br>Enter one <br>of these methods in the method text field:<br>[Default, Huang, Intermodes, IsoData, IJ_IsoData, Li, MaxEntropy, Mean, MinError, Minimum, Moments, Otsu, Percentile, RenyiEntropy, Shanbhag, Triangle, Yen]<br><br>Parameters:<br>ClearCLBuffer arg1, String arg2";
387+
description = "<b>getAutomaticThreshold</b><br><br>Determines a threshold according to a given method and saves it to the threshold_value variable.<br><br>The automatic thresholder utilizes the threshold methods from ImageJ on a histogram determined on <br>the GPU to determine a threshold value as similar as possible to ImageJ 'Apply Threshold' method. <br><br>Enter one <br>of these methods in the method text field:<br>[Default, Huang, Intermodes, IsoData, IJ_IsoData, Li, MaxEntropy, Mean, MinError, Minimum, Moments, Otsu, Percentile, RenyiEntropy, Shanbhag, Triangle, Yen]<br><br>Parameters:<br>ClearCLBuffer arg1, String arg2";
388388
list.add(new BasicCompletion(provider, headline, null, description));
389389
headline = "clij2.getBoundingBox(ClearCLBuffer arg1)";
390390
description = "<b>getBoundingBox</b><br><br>Determines the bounding box of all non-zero pixels in a binary image. <br><br>If called from macro, the positions will be stored in the variables 'boundingBoxX', 'boundingBoxY', 'boundingBoxZ', 'boundingBoxWidth', 'boundingBoxHeight' and 'boundingBoxDepth'.In case of 2D images Z and depth will be zero.<br><br>Parameters:<br>ClearCLBuffer arg1";

src/main/java/net/haesleinhuepf/clijx/jython/CLIJxAutoComplete.java

+20-2
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ public static ArrayList<BasicCompletion> getCompletions(final ScriptingAutoCompl
558558
description = "<b>generateTouchMatrix</b><br><br>Takes a labelmap with n labels and generates a (n+1)*(n+1) matrix where all pixels are set to 0 exept those where labels are touching. <br><br>Only half of the matrix is filled (with x < y). For example, if labels 3 and 4 are touching then the pixel (3,4) in the matrix will be set to 1.<br>The touch matrix is a representation of a region adjacency graph<br><br><br>Parameters:<br>ClearCLBuffer label_map, ClearCLBuffer touch_matrix_destination";
559559
list.add(new BasicCompletion(provider, headline, null, description));
560560
headline = "clijx.getAutomaticThreshold(ClearCLBuffer arg1, String arg2)";
561-
description = "<b>getAutomaticThreshold</b><br><br>The automatic thresholder utilizes the threshold methods from ImageJ on a histogram determined on <br>the GPU to determine a threshold value as similar as possible to ImageJ 'Apply Threshold' method. <br><br>Enter one <br>of these methods in the method text field:<br>[Default, Huang, Intermodes, IsoData, IJ_IsoData, Li, MaxEntropy, Mean, MinError, Minimum, Moments, Otsu, Percentile, RenyiEntropy, Shanbhag, Triangle, Yen]<br><br>Parameters:<br>ClearCLBuffer arg1, String arg2";
561+
description = "<b>getAutomaticThreshold</b><br><br>Determines a threshold according to a given method and saves it to the threshold_value variable.<br><br>The automatic thresholder utilizes the threshold methods from ImageJ on a histogram determined on <br>the GPU to determine a threshold value as similar as possible to ImageJ 'Apply Threshold' method. <br><br>Enter one <br>of these methods in the method text field:<br>[Default, Huang, Intermodes, IsoData, IJ_IsoData, Li, MaxEntropy, Mean, MinError, Minimum, Moments, Otsu, Percentile, RenyiEntropy, Shanbhag, Triangle, Yen]<br><br>Parameters:<br>ClearCLBuffer arg1, String arg2";
562562
list.add(new BasicCompletion(provider, headline, null, description));
563563
headline = "clijx.getBoundingBox(ClearCLBuffer arg1)";
564564
description = "<b>getBoundingBox</b><br><br>Determines the bounding box of all non-zero pixels in a binary image. <br><br>If called from macro, the positions will be stored in the variables 'boundingBoxX', 'boundingBoxY', 'boundingBoxZ', 'boundingBoxWidth', 'boundingBoxHeight' and 'boundingBoxDepth'.In case of 2D images Z and depth will be zero.<br><br>Parameters:<br>ClearCLBuffer arg1";
@@ -620,6 +620,18 @@ public static ArrayList<BasicCompletion> getCompletions(final ScriptingAutoCompl
620620
headline = "clijx.greyLevelAtttributeFiltering(ClearCLBuffer source, ClearCLBuffer destination, Integer number_of_bins, Integer minimum_pixel_count)";
621621
description = "<b>greyLevelAtttributeFiltering</b><br><br>Inspired by Grayscale attribute filtering from MorpholibJ library by David Legland & Ignacio Arganda-Carreras.<br><br>This plugin will remove components in a grayscale image based on user-specified area (for 2D: pixels) or volume (3D: voxels).<br>For each gray level specified in the number of bins, binary images will be generated, followed by exclusion of objects (labels)<br>below a minimum pixel count.<br>All the binary images for each gray level are combined to form the final image. The output is a grayscale image, where bright objects<br>below pixel count are removed.<br>It is recommended that low values be used for number of bins, especially for large 3D images, or it may take long time.<br><br>Parameters:<br>ClearCLBuffer source, ClearCLBuffer destination, Integer number_of_bins, Integer minimum_pixel_count";
622622
list.add(new BasicCompletion(provider, headline, null, description));
623+
headline = "clijx.greyscaleClosingBox(ClearCLBuffer source, ClearCLBuffer destination, Integer radius_x, Integer radius_y, Integer radius_z)";
624+
description = "<b>greyscaleClosingBox</b><br><br>Apply a greyscale morphological closing to the input image.<br><br>It applies a maximum filter first and the result is processed by a minimum filter with given radii.<br>Low intensity regions smaller than radius will disappear.<br><br>Parameters:<br>ClearCLBuffer source, ClearCLBuffer destination, Integer radius_x, Integer radius_y, Integer radius_z";
625+
list.add(new BasicCompletion(provider, headline, null, description));
626+
headline = "clijx.greyscaleClosingSphere(ClearCLBuffer source, ClearCLBuffer destination, Integer radius_x, Integer radius_y, Integer radius_z)";
627+
description = "<b>greyscaleClosingSphere</b><br><br>Apply a greyscale morphological closing to the input image.<br><br>It applies a maximum filter first and the result is processed by a minimum filter with given radii.<br>Low intensity regions smaller than radius will disappear.<br><br>Parameters:<br>ClearCLBuffer source, ClearCLBuffer destination, Integer radius_x, Integer radius_y, Integer radius_z";
628+
list.add(new BasicCompletion(provider, headline, null, description));
629+
headline = "clijx.greyscaleOpeningBox(ClearCLBuffer source, ClearCLBuffer destination, Integer radius_x, Integer radius_y, Integer radius_z)";
630+
description = "<b>greyscaleOpeningBox</b><br><br>Apply a greyscale morphological opening to the input image.<br><br>It applies a minimum filter first and the result is processed by a maximum filter with given radii.<br>High intensity regions smaller than radius will disappear.<br><br>Parameters:<br>ClearCLBuffer source, ClearCLBuffer destination, Integer radius_x, Integer radius_y, Integer radius_z";
631+
list.add(new BasicCompletion(provider, headline, null, description));
632+
headline = "clijx.greyscaleOpeningSphere(ClearCLBuffer source, ClearCLBuffer destination, Integer radius_x, Integer radius_y, Integer radius_z)";
633+
description = "<b>greyscaleOpeningSphere</b><br><br>Apply a greyscale morphological opening to the input image.<br><br>It applies a minimum filter first and the result is processed by a maximum filter with given radii.<br>High intensity regions smaller than radius will disappear.<br><br>Parameters:<br>ClearCLBuffer source, ClearCLBuffer destination, Integer radius_x, Integer radius_y, Integer radius_z";
634+
list.add(new BasicCompletion(provider, headline, null, description));
623635
headline = "clijx.histogram(ClearCLBuffer source, ClearCLBuffer destination, Integer number_of_bins, Float minimum_intensity, Float maximum_intensity, Boolean determine_min_max)";
624636
description = "<b>histogram</b><br><br>Determines the histogram of a given image.<br><br>The histogram image is of dimensions number_of_bins/1/1; a 3D image with height=1 and depth=1. <br>Histogram bins contain the number of pixels with intensity in this corresponding bin. <br>The histogram bins are uniformly distributed between given minimum and maximum grey value intensity. <br>If the flag determine_min_max is set, minimum and maximum intensity will be determined. <br>When calling this operation many times, it is recommended to determine minimum and maximum intensity <br>once at the beginning and handing over these values.<br><br>Parameters:<br>ClearCLBuffer source, ClearCLBuffer destination, Integer number_of_bins, Float minimum_intensity, Float maximum_intensity, Boolean determine_min_max";
625637
list.add(new BasicCompletion(provider, headline, null, description));
@@ -1241,6 +1253,9 @@ public static ArrayList<BasicCompletion> getCompletions(final ScriptingAutoCompl
12411253
headline = "clijx.print(ClearCLImageInterface input)";
12421254
description = "<b>print</b><br><br>Visualises an image on standard out (console).<br><br>Parameters:<br>ClearCLImageInterface input";
12431255
list.add(new BasicCompletion(provider, headline, null, description));
1256+
headline = "clijx.proximalNeighborCountMap(ClearCLBuffer input, ClearCLBuffer destination, Float min_distance, Float max_distance)";
1257+
description = "<b>proximalNeighborCountMap</b><br><br>Takes a label map, determines which labels are within a given distance range and replaces every label with the number of neighboring labels.<br><br><br><br>Parameters:<br>ClearCLBuffer input, ClearCLBuffer destination, Float min_distance, Float max_distance";
1258+
list.add(new BasicCompletion(provider, headline, null, description));
12441259
headline = "clijx.pull(null)";
12451260
description = "<b>pull</b><br><br>Copies an image specified by its name from GPU memory back to ImageJ and shows it.<br><br>Parameters:<br>null";
12461261
list.add(new BasicCompletion(provider, headline, null, description));
@@ -1634,6 +1649,9 @@ public static ArrayList<BasicCompletion> getCompletions(final ScriptingAutoCompl
16341649
headline = "clijx.stopWatch(String text)";
16351650
description = "<b>stopWatch</b><br><br>Measures time and outputs delay to last call.<br><br>Parameters:<br>String text";
16361651
list.add(new BasicCompletion(provider, headline, null, description));
1652+
headline = "clijx.subStack(ClearCLImageInterface arg1, ClearCLImageInterface arg2, int arg3, int arg4)";
1653+
description = "<b>subStack</b><br><br>Crops multiple Z-slices of a 3D stack into a new 3D stack.<br><br><br><br>Parameters:<br>ClearCLImageInterface arg1, ClearCLImageInterface arg2, int arg3, int arg4";
1654+
list.add(new BasicCompletion(provider, headline, null, description));
16371655
headline = "clijx.subtract(ClearCLImageInterface subtrahend, ClearCLImageInterface minuend, ClearCLImageInterface destination)";
16381656
description = "<b>subtract</b><br><br>Subtracts one image X from another image Y pixel wise.<br><br><pre>f(x, y) = x - y</pre><br><br>Parameters:<br>ClearCLImageInterface subtrahend, ClearCLImageInterface minuend, ClearCLImageInterface destination";
16391657
list.add(new BasicCompletion(provider, headline, null, description));
@@ -1856,4 +1874,4 @@ public static ArrayList<BasicCompletion> getCompletions(final ScriptingAutoCompl
18561874
return list;
18571875
}
18581876
}
1859-
// 615 methods generated.
1877+
// 621 methods generated.

src/main/java/net/haesleinhuepf/clijx/utilities/CLIJxOps.java

+101-1
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,12 @@
207207
import net.haesleinhuepf.clijx.plugins.LocalThresholdNiblack;
208208
import net.haesleinhuepf.clijx.plugins.LocalThresholdSauvola;
209209
import net.haesleinhuepf.clijx.plugins.ColorDeconvolution;
210+
import net.haesleinhuepf.clijx.plugins.GreyscaleOpeningBox;
211+
import net.haesleinhuepf.clijx.plugins.GreyscaleOpeningSphere;
212+
import net.haesleinhuepf.clijx.plugins.GreyscaleClosingBox;
213+
import net.haesleinhuepf.clijx.plugins.GreyscaleClosingSphere;
214+
import net.haesleinhuepf.clijx.plugins.ProximalNeighborCountMap;
215+
import net.haesleinhuepf.clijx.plugins.SubStack;
210216
// this is generated code. See src/test/java/net/haesleinhuepf/clijx/codegenerator for details
211217
public abstract interface CLIJxOps {
212218
CLIJ getCLIJ();
@@ -3868,5 +3874,99 @@ default boolean colorDeconvolution(ClearCLBuffer source, ClearCLBuffer color_vec
38683874
return result;
38693875
}
38703876

3877+
3878+
// net.haesleinhuepf.clijx.plugins.GreyscaleOpeningBox
3879+
//----------------------------------------------------
3880+
/**
3881+
* Apply a greyscale morphological opening to the input image.
3882+
*
3883+
* It applies a minimum filter first and the result is processed by a maximum filter with given radii.
3884+
* High intensity regions smaller than radius will disappear.
3885+
*/
3886+
default boolean greyscaleOpeningBox(ClearCLBuffer arg1, ClearCLBuffer arg2, double arg3, double arg4, double arg5) {
3887+
if (doTimeTracing()) {recordMethodStart("GreyscaleOpeningBox");}
3888+
boolean result = GreyscaleOpeningBox.greyscaleOpeningBox(getCLIJ2(), arg1, arg2, new Double (arg3).intValue(), new Double (arg4).intValue(), new Double (arg5).intValue());
3889+
if (doTimeTracing()) {recordMethodEnd("GreyscaleOpeningBox");}
3890+
return result;
3891+
}
3892+
3893+
3894+
// net.haesleinhuepf.clijx.plugins.GreyscaleOpeningSphere
3895+
//----------------------------------------------------
3896+
/**
3897+
* Apply a greyscale morphological opening to the input image.
3898+
*
3899+
* It applies a minimum filter first and the result is processed by a maximum filter with given radii.
3900+
* High intensity regions smaller than radius will disappear.
3901+
*/
3902+
default boolean greyscaleOpeningSphere(ClearCLBuffer arg1, ClearCLBuffer arg2, double arg3, double arg4, double arg5) {
3903+
if (doTimeTracing()) {recordMethodStart("GreyscaleOpeningSphere");}
3904+
boolean result = GreyscaleOpeningSphere.greyscaleOpeningSphere(getCLIJ2(), arg1, arg2, new Double (arg3).intValue(), new Double (arg4).intValue(), new Double (arg5).intValue());
3905+
if (doTimeTracing()) {recordMethodEnd("GreyscaleOpeningSphere");}
3906+
return result;
3907+
}
3908+
3909+
3910+
// net.haesleinhuepf.clijx.plugins.GreyscaleClosingBox
3911+
//----------------------------------------------------
3912+
/**
3913+
* Apply a greyscale morphological closing to the input image.
3914+
*
3915+
* It applies a maximum filter first and the result is processed by a minimum filter with given radii.
3916+
* Low intensity regions smaller than radius will disappear.
3917+
*/
3918+
default boolean greyscaleClosingBox(ClearCLBuffer arg1, ClearCLBuffer arg2, double arg3, double arg4, double arg5) {
3919+
if (doTimeTracing()) {recordMethodStart("GreyscaleClosingBox");}
3920+
boolean result = GreyscaleClosingBox.greyscaleClosingBox(getCLIJ2(), arg1, arg2, new Double (arg3).intValue(), new Double (arg4).intValue(), new Double (arg5).intValue());
3921+
if (doTimeTracing()) {recordMethodEnd("GreyscaleClosingBox");}
3922+
return result;
3923+
}
3924+
3925+
3926+
// net.haesleinhuepf.clijx.plugins.GreyscaleClosingSphere
3927+
//----------------------------------------------------
3928+
/**
3929+
* Apply a greyscale morphological closing to the input image.
3930+
*
3931+
* It applies a maximum filter first and the result is processed by a minimum filter with given radii.
3932+
* Low intensity regions smaller than radius will disappear.
3933+
*/
3934+
default boolean greyscaleClosingSphere(ClearCLBuffer arg1, ClearCLBuffer arg2, double arg3, double arg4, double arg5) {
3935+
if (doTimeTracing()) {recordMethodStart("GreyscaleClosingSphere");}
3936+
boolean result = GreyscaleClosingSphere.greyscaleClosingSphere(getCLIJ2(), arg1, arg2, new Double (arg3).intValue(), new Double (arg4).intValue(), new Double (arg5).intValue());
3937+
if (doTimeTracing()) {recordMethodEnd("GreyscaleClosingSphere");}
3938+
return result;
3939+
}
3940+
3941+
3942+
// net.haesleinhuepf.clijx.plugins.ProximalNeighborCountMap
3943+
//----------------------------------------------------
3944+
/**
3945+
* Takes a label map, determines which labels are within a given distance range and replaces every label with the number of neighboring labels.
3946+
*
3947+
*
3948+
*/
3949+
default boolean proximalNeighborCountMap(ClearCLBuffer arg1, ClearCLBuffer arg2, double arg3, double arg4) {
3950+
if (doTimeTracing()) {recordMethodStart("ProximalNeighborCountMap");}
3951+
boolean result = ProximalNeighborCountMap.proximalNeighborCountMap(getCLIJ2(), arg1, arg2, new Double (arg3).floatValue(), new Double (arg4).floatValue());
3952+
if (doTimeTracing()) {recordMethodEnd("ProximalNeighborCountMap");}
3953+
return result;
3954+
}
3955+
3956+
3957+
// net.haesleinhuepf.clijx.plugins.SubStack
3958+
//----------------------------------------------------
3959+
/**
3960+
* Crops multiple Z-slices of a 3D stack into a new 3D stack.
3961+
*
3962+
*
3963+
*/
3964+
default boolean subStack(ClearCLImageInterface arg1, ClearCLImageInterface arg2, int arg3, int arg4) {
3965+
if (doTimeTracing()) {recordMethodStart("SubStack");}
3966+
boolean result = SubStack.subStack(getCLIJ2(), arg1, arg2, arg3, arg4);
3967+
if (doTimeTracing()) {recordMethodEnd("SubStack");}
3968+
return result;
3969+
}
3970+
38713971
}
3872-
// 225 methods generated.
3972+
// 231 methods generated.

0 commit comments

Comments
 (0)