Skip to content

Commit 5859e65

Browse files
committed
Implements intellij suggestions
Adds get signature in reader method (hence the minor version bump)
1 parent eaea2f2 commit 5859e65

4 files changed

Lines changed: 17 additions & 10 deletions

File tree

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>40.0.0</version>
8+
<version>43.0.0</version>
99
<relativePath />
1010
</parent>
1111

1212
<groupId>ch.epfl.biop</groupId>
1313
<artifactId>quick-start-czi-reader</artifactId>
14-
<version>0.2.7-SNAPSHOT</version>
14+
<version>0.3.0-SNAPSHOT</version>
1515

1616
<name>Quick Start CZI Reader</name>
1717
<description>A Bio-Formats CZI Reader that starts fast and with low memory footprint</description>
@@ -105,7 +105,7 @@
105105
<maven.compiler.target>19</maven.compiler.target>
106106
<maven.compiler.testSource>19</maven.compiler.testSource>
107107
<maven.compiler.testTarget>19</maven.compiler.testTarget>-->
108-
<bf.version>8.0.1</bf.version>
108+
<bf.version>8.3.0</bf.version>
109109
</properties>
110110

111111
<repositories>

src/main/java/ch/epfl/biop/formats/in/ZeissQuickStartCZIReader.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,10 @@ public ZeissQuickStartCZIReader() {
358358
suffixNecessary = false;
359359
}
360360

361+
public Map<String, Integer> getDimensions(int coreIndex) {
362+
return this.coreIndexToSignature.get(coreIndex).getDimensions();
363+
}
364+
361365
/** Duplicates 'that' reader for parallel reading.
362366
* Creating another reader using this constructor allows to keep a very low memory footprint
363367
* because all immutable objects are re-used by reference.
@@ -934,6 +938,7 @@ private synchronized RandomAccessInputStream getStream(int filePart) throws IOEx
934938
ris.order(isLittleEndian());
935939
return ris;
936940
}
941+
937942
@Override
938943
public int getOptimalTileWidth() {
939944
if (maxBlockSizeX>0) {
@@ -1802,6 +1807,7 @@ private static int dimensionPriority(String dimension) {
18021807
*/
18031808
static class CoreSignature implements Comparable<CoreSignature> {
18041809
final String signature;
1810+
18051811
final int hashCode;
18061812

18071813
final int filePart;
@@ -2165,8 +2171,6 @@ public synchronized void clear() {
21652171
}
21662172
}
21672173

2168-
2169-
21702174
/**
21712175
* This Zeiss Reader class was initially huge and contained many fields. One issue
21722176
* is that these fields were only necessary during the reader initialisation (method initFile)

src/main/java/ch/epfl/biop/formats/in/libczi/LibCZI.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* <p>
3030
* Timestamps reading inspired by <a href="https://gist.github.com/mutterer/5fbddc293d6c969a9d02778f1551b73f">Jerome's macro</a>
3131
* <p>
32-
* See @see <a href="https://zeiss.github.io/">CZI reference documentation</a>
32+
* See @see <a href="https://zeiss.github.io/libczi">CZI reference documentation</a>
3333
* <p>
3434
* Used in {@link ZeissQuickStartCZIReader}
3535
*
@@ -544,9 +544,9 @@ public static class SubBlockDirectoryEntry {
544544
public String toString() {
545545
if (entryDV!=null) {
546546
StringBuilder sb = new StringBuilder();
547-
sb.append("pixelType "+this.getPixelType()+" compression = "+getCompression()+"\n");
547+
sb.append("pixelType ").append(this.getPixelType()).append(" compression = ").append(getCompression()).append("\n");
548548
for (SubBlockSegment.SubBlockSegmentData.SubBlockDirectoryEntryDV.DimensionEntry entry: getDimensionEntries()) {
549-
sb.append(entry+"\n");
549+
sb.append(entry).append("\n");
550550
}
551551
return sb.toString();
552552
} else return "entryDE not supported";

src/test/java/ch/epfl/biop/formats/in/OpenFile.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ public class OpenFile {
1212
public static void main(String... args) throws Exception {
1313
// TODO: fix dataset
1414
//ij.Prefs.set("bioformats.enabled.ZeissCZI", false);
15-
//ij.Prefs.set("bioformats.enabled.ZeissQuickStartCZI", true);
15+
/*ij.Prefs.set("bioformats.enabled.ZeissQuickStartCZI", true);
1616
ImageJ fiji = new ImageJ();
17-
fiji.ui().showUI();
17+
fiji.ui().showUI();*/
18+
ZeissQuickStartCZIReader r = new ZeissQuickStartCZIReader();
19+
r.setId("C:\\Users\\Nicolas\\Downloads\\MouseBrain_41Slices_1Tile_1Channel_2Illuminations_2Angles.czi");
20+
r.setId("C:\\Users\\Nicolas\\Downloads\\MouseBrain_41Slices_2x2Tiles_3Channels_2Illuminations_1Angle.czi");
1821
}
1922
}

0 commit comments

Comments
 (0)