Skip to content

Commit 2a1f436

Browse files
ctruedenctrueden
committed
WIP: add engine.convert ops for ImageJ image types
JPMS woes...
1 parent 018d03e commit 2a1f436

3 files changed

Lines changed: 87 additions & 4 deletions

File tree

‎scijava-legacy/pom.xml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@
116116
<artifactId>scijava-ops-api</artifactId>
117117
<version>${project.version}</version>
118118
</dependency>
119+
<dependency>
120+
<groupId>org.scijava</groupId>
121+
<artifactId>scijava-ops-spi</artifactId>
122+
<version>${project.version}</version>
123+
</dependency>
119124
<dependency>
120125
<groupId>org.scijava</groupId>
121126
<artifactId>scijava-priority</artifactId>
@@ -138,7 +143,7 @@
138143
<artifactId>imglib2</artifactId>
139144
</dependency>
140145

141-
<!-- Legacy SciJava/ImageJ2 dependencies -->
146+
<!-- Legacy dependencies (SciJava, ImageJ2, ImageJ) -->
142147
<dependency>
143148
<groupId>org.scijava</groupId>
144149
<artifactId>scijava-common</artifactId>
@@ -147,6 +152,14 @@
147152
<groupId>net.imagej</groupId>
148153
<artifactId>imagej-common</artifactId>
149154
</dependency>
155+
<dependency>
156+
<groupId>net.imagej</groupId>
157+
<artifactId>ij</artifactId>
158+
</dependency>
159+
<dependency>
160+
<groupId>net.imglib2</groupId>
161+
<artifactId>imglib2-ij</artifactId>
162+
</dependency>
150163

151164
<!-- Test scope dependencies -->
152165
<dependency>

‎scijava-legacy/src/main/java/module-info.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,19 @@
2929

3030
open module org.scijava.legacy {
3131

32+
requires ij;
3233
requires net.imagej;
33-
requires org.scijava;
34-
requires org.scijava.types;
35-
requires org.scijava.priority;
34+
requires net.imglib2;
35+
requires net.imglib2.img; // net.imglib2:imglib2-ij
36+
requires org.scijava; // org.scijava:scijava-common
3637
requires org.scijava.ops.api;
38+
requires org.scijava.ops.spi;
39+
requires org.scijava.priority;
3740
requires org.scijava.progress;
41+
requires org.scijava.types;
42+
43+
uses org.scijava.ops.spi.OpCollection;
3844

45+
provides org.scijava.ops.spi.OpCollection with org.scijava.legacy.imagej.ImageJConverters;
3946
provides org.scijava.types.extract.TypeExtractor with org.scijava.legacy.types.DatasetTypeExtractor;
4047
}

‎scijava-legacy/src/main/java/org/scijava/legacy/imagej/ImageJConverters.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/*-
2+
* #%L
3+
* Interoperability with legacy SciJava libraries.
4+
* %%
5+
* Copyright (C) 2023 - 2024 SciJava developers.
6+
* %%
7+
* Redistribution and use in source and binary forms, with or without
8+
* modification, are permitted provided that the following conditions are met:
9+
*
10+
* 1. Redistributions of source code must retain the above copyright notice,
11+
* this list of conditions and the following disclaimer.
12+
* 2. Redistributions in binary form must reproduce the above copyright notice,
13+
* this list of conditions and the following disclaimer in the documentation
14+
* and/or other materials provided with the distribution.
15+
*
16+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
20+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26+
* POSSIBILITY OF SUCH DAMAGE.
27+
* #L%
28+
*/
29+
package org.scijava.legacy.imagej;
30+
31+
import ij.ImagePlus;
32+
import net.imagej.Dataset;
33+
import net.imglib2.RandomAccessibleInterval;
34+
import net.imglib2.img.Img;
35+
import net.imglib2.img.display.imagej.ImageJFunctions;
36+
import net.imglib2.type.NativeType;
37+
import net.imglib2.type.numeric.NumericType;
38+
import org.scijava.ops.spi.OpCollection;
39+
import org.scijava.ops.spi.OpField;
40+
import org.scijava.ops.spi.OpHints;
41+
42+
import java.util.function.Function;
43+
44+
/**
45+
* A set of {@code engine.convert} Ops for ImageJ-related data types.
46+
*
47+
* @author Curtis Rueden
48+
*/
49+
public class ImageJConverters< T extends NumericType< T > & NativeType< T >> implements OpCollection {
50+
51+
@OpHints(hints = { "conversion.FORBIDDEN" })
52+
@OpField(names = "engine.convert")
53+
public final Function<ImagePlus, Img<T>> impToImg = ImageJFunctions::wrap;
54+
55+
@OpHints(hints = { "conversion.FORBIDDEN" })
56+
@OpField(names = "engine.convert")
57+
public final Function<RandomAccessibleInterval<T>, ImagePlus> raiToImp = rai -> ImageJFunctions.wrap(rai, "Image");
58+
59+
@OpHints(hints = { "conversion.FORBIDDEN" })
60+
@OpField(names = "engine.convert")
61+
public final Function<Dataset, ImagePlus> datasetToImp = dataset -> ImageJFunctions.wrap((RandomAccessibleInterval) dataset, dataset.getName());
62+
63+
}

0 commit comments

Comments
 (0)