Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addition of getType() API #12

Merged
merged 4 commits into from
Aug 29, 2024
Merged

Addition of getType() API #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efc10f4
POM: Bump parent to pom-scijava-38.0.1
tpietzsch Apr 5, 2024
40c94ff
POM: Bump dependency versions
tpietzsch Aug 28, 2024
548ed74
Adapt API changes introduced by imglib/imglib2-roi#71
tpietzsch Apr 5, 2024
6c1acf8
Add missing getType() implementations
tpietzsch Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>34.1.0</version>
<version>38.0.1</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -91,16 +91,12 @@
<fastRandomForest.version>r49</fastRandomForest.version>
<imagescience.version>3.0.0</imagescience.version>

<bigdataviewer-core.version>10.4.6</bigdataviewer-core.version>
<imagej-deprecated.version>0.2.0</imagej-deprecated.version>
<imagej-ops.version>2.0.0</imagej-ops.version>
<imglib2.version>6.1.0</imglib2.version>
<imglib2-algorithm.version>0.13.2</imglib2-algorithm.version>
<imglib2-algorithm-gpl.version>0.3.1</imglib2-algorithm-gpl.version>
<imglib2-cache.version>1.0.0-beta-17</imglib2-cache.version>
<imglib2-realtransform.version>4.0.1</imglib2-realtransform.version>
<imglib2-roi.version>0.14.0</imglib2-roi.version>
<scifio.version>0.45.0</scifio.version>
<imglib2.version>7.1.0</imglib2.version>
<imglib2-realtransform.version>4.0.3</imglib2-realtransform.version>
<imglib2-roi.version>0.15.0</imglib2-roi.version>
<imglib2-cache.version>1.0.0-beta-18</imglib2-cache.version>
<imglib2-algorithm.version>0.15.3</imglib2-algorithm.version>
<bigdataviewer-core.version>10.6.0</bigdataviewer-core.version>
</properties>

<repositories>
Expand Down Expand Up @@ -283,11 +279,6 @@
<artifactId>imagej</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>sc.fiji</groupId>
<artifactId>bigdataviewer-vistools</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/preview/net/imglib2/algorithm/neighborhood/NeighborhoodRandomAccessible.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,10 @@ public RandomAccess<Neighborhood<T>> randomAccess() {
public RandomAccess<Neighborhood<T>> randomAccess(final Interval interval) {
return new NeighborhoodRandomAccess<T>(source, factory, interval);
}

@Override
public Neighborhood< T > getType()
{
return randomAccess().getType();
}
}
2 changes: 1 addition & 1 deletion src/main/java/sc/fiji/labkit/pixel_classification/classification/Trainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public <L> void trainLabeledFeatures(
if (label == null)
continue;
LabelRegion<L> region = regions.getLabelRegion(label);
Cursor<Void> cursor = region.cursor();
Cursor<Void> cursor = region.inside().cursor();
while (cursor.hasNext()) {
cursor.next();
ra.setPosition(cursor);
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/sc/fiji/labkit/pixel_classification/utils/views/SimpleRAI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,10 @@ public RandomAccess<T> randomAccess(Interval interval) {
public int numDimensions() {
return blueprint.numDimensions();
}

@Override
public T getType()
{
return blueprint.getType();
}
}
Loading