Skip to content

Commit e31cb4d

Browse files
authored
Merge pull request #15 from qupath/img-builder
Add ImgBuilder and tests
2 parents 9987495 + 47e180c commit e31cb4d

21 files changed

+591
-538
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ A Java library to link QuPath with ImgLib2.
77
Here is a sample script that shows how to use the library from QuPath:
88

99
```groovy
10-
import qupath.ext.imglib2.ImgCreator
10+
import qupath.ext.imglib2.ImgBuilder
1111
import qupath.ext.imglib2.ImgLib2ImageServer
1212
import net.imglib2.type.numeric.ARGBType
1313
@@ -16,13 +16,13 @@ var server = getCurrentServer()
1616
1717
// Create Img<T> from level
1818
var level = 0
19-
var img = ImgCreator.builder(server).build().createForLevel(level)
19+
var img = ImgBuilder.createBuilder(server).build().createForLevel(level)
2020
println img
2121
2222
2323
// Create RandomAccessibleInterval<T> from downsample
2424
var downsample = 1
25-
var randomAccessible = ImgCreator.builder(server).build().createForDownsample(downsample)
25+
var randomAccessible = ImgBuilder.createBuilder(server).build().createForDownsample(downsample)
2626
println randomAccessible
2727
2828
@@ -37,17 +37,17 @@ var type = new ARGBType() // only valid if server represents a RGB image. Othe
3737
// net.imglib2.type.numeric.integer.IntType for INT32 images
3838
// net.imglib2.type.numeric.real.FloatType for FLOAT32 images
3939
// net.imglib2.type.numeric.real.DoubleType for FLOAT64 images
40-
var safeImg = ImgCreator.builder(server, type).build().createForLevel(level)
40+
var safeImg = ImgBuilder.createBuilder(server, type).build().createForLevel(level)
4141
println safeImg
4242
4343
4444
// Once you have an image (or random accessible), you can use regular ImgLib2 functions
4545
// For example, to read the pixel located at [x:1, y:2; c:0; z:0; t:0]:
4646
var randomAccess = randomAccessible.randomAccess()
4747
48-
var position = new long[ImgCreator.NUMBER_OF_AXES]
49-
position[ImgCreator.AXIS_X] = 1
50-
position[ImgCreator.AXIS_Y] = 2
48+
var position = new long[ImgBuilder.NUMBER_OF_AXES]
49+
position[ImgBuilder.AXIS_X] = 1
50+
position[ImgBuilder.AXIS_Y] = 2
5151
5252
var pixel = randomAccess.setPositionAndGet(position)
5353
println pixel

src/main/java/qupath/ext/imglib2/ImgBuilder.java

Lines changed: 458 additions & 0 deletions
Large diffs are not rendered by default.

src/main/java/qupath/ext/imglib2/ImgCreator.java

Lines changed: 0 additions & 406 deletions
This file was deleted.

src/main/java/qupath/ext/imglib2/ImgLib2ImageServer.java

Lines changed: 67 additions & 65 deletions
Large diffs are not rendered by default.

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/AccessTools.java renamed to src/main/java/qupath/ext/imglib2/accesses/AccessTools.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package qupath.ext.imglib2.bufferedimageaccesses;
1+
package qupath.ext.imglib2.accesses;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/ArgbBufferedImageAccess.java renamed to src/main/java/qupath/ext/imglib2/accesses/ArgbBufferedImageAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package qupath.ext.imglib2.bufferedimageaccesses;
1+
package qupath.ext.imglib2.accesses;
22

33
import net.imglib2.img.basictypeaccess.IntAccess;
44
import net.imglib2.img.basictypeaccess.volatiles.VolatileAccess;

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/ByteRasterAccess.java renamed to src/main/java/qupath/ext/imglib2/accesses/ByteRasterAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package qupath.ext.imglib2.bufferedimageaccesses;
1+
package qupath.ext.imglib2.accesses;
22

33
import net.imglib2.img.basictypeaccess.ByteAccess;
44
import net.imglib2.img.basictypeaccess.volatiles.VolatileAccess;

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/DoubleRasterAccess.java renamed to src/main/java/qupath/ext/imglib2/accesses/DoubleRasterAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package qupath.ext.imglib2.bufferedimageaccesses;
1+
package qupath.ext.imglib2.accesses;
22

33
import net.imglib2.img.basictypeaccess.DoubleAccess;
44
import net.imglib2.img.basictypeaccess.volatiles.VolatileAccess;

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/FloatRasterAccess.java renamed to src/main/java/qupath/ext/imglib2/accesses/FloatRasterAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package qupath.ext.imglib2.bufferedimageaccesses;
1+
package qupath.ext.imglib2.accesses;
22

33
import net.imglib2.img.basictypeaccess.FloatAccess;
44
import net.imglib2.img.basictypeaccess.volatiles.VolatileAccess;

src/main/java/qupath/ext/imglib2/bufferedimageaccesses/IntRasterAccess.java renamed to src/main/java/qupath/ext/imglib2/accesses/IntRasterAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package qupath.ext.imglib2.bufferedimageaccesses;
1+
package qupath.ext.imglib2.accesses;
22

33
import net.imglib2.img.basictypeaccess.IntAccess;
44
import net.imglib2.img.basictypeaccess.volatiles.VolatileAccess;

0 commit comments

Comments
 (0)