Skip to content

Commit

Permalink
Update pom
Browse files Browse the repository at this point in the history
  • Loading branch information
tischi committed Nov 21, 2023
1 parent 83e6dd4 commit fe55575
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
3 changes: 1 addition & 2 deletions dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>org.embl.mobie</groupId>
<artifactId>mobie-io</artifactId>
<name>MoBIE IO</name>
<version>2.2.1</version>
<version>2.2.2-SNAPSHOT</version>
<description>Readers and writers for image data in MoBIE projects</description>
<url>https://github.com/mobie/mobie-io</url>
<issueManagement>
Expand Down Expand Up @@ -83,7 +83,6 @@
<scm>
<connection>scm:git:https://github.com/mobie/mobie-io</connection>
<developerConnection>scm:git:[email protected]:mobie/mobie-io</developerConnection>
<tag>mobie-io-2.2.1</tag>
<url>https://github.com/mobie/mobie-io</url>
</scm>
<organization>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>37.0.0</version>
<version>36.0.0</version>
</parent>

<groupId>org.embl.mobie</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/embl/mobie/io/ImageDataFormat.java
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public static ImageDataFormat fromPath(String path)
return ImageDataFormat.OmeZarr;
else if (lowerCase.endsWith( ".xml" ))
return ImageDataFormat.Bdv; // TODO: https://github.com/mobie/mobie-io/issues/131
else if (lowerCase.endsWith( ".ome.tif" ) || lowerCase.endsWith( ".ome.tiff" ))
else if (lowerCase.endsWith( ".ome.tif" ) || lowerCase.endsWith( ".ome.tiff" ) )
return ImageDataFormat.BioFormats;
else if (lowerCase.endsWith( ".tif" ) || lowerCase.endsWith( ".tiff" ))
return ImageDataFormat.Tiff;
Expand All @@ -212,7 +212,7 @@ else if (lowerCase.endsWith( ".h5" ))
else if (lowerCase.endsWith( ".toml" ))
return ImageDataFormat.Toml;
else
return ImageDataFormat.ImageJ;
return ImageDataFormat.BioFormats;
}

public boolean inMemory()
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/org/embl/mobie/io/SpimDataOpener.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,12 @@ public SpimDataOpener() {
case Tiff:
return open(IOHelper.openTiffAsImagePlus( imagePath ), sharedQueue);
case ImageJ:
return open(IJ.openImage(imagePath), sharedQueue);
ImagePlus imagePlus = IJ.openImage( imagePath );
if ( imagePlus == null )
{
throw new RuntimeException("Could not open " + imagePath );
}
return open( imagePlus, sharedQueue);
case BioFormats:
return openWithBioFormats(imagePath, sharedQueue);
case BdvN5:
Expand Down Expand Up @@ -301,9 +306,7 @@ private SpimData openBdvOmeZarrS3(String path, SharedQueue queue) {
public AbstractSpimData< ? > openWithBioFormats( String path, SharedQueue sharedQueue )
{
final AbstractSpimData< ? > spimData = openWithBioFormats( path );

setSharedQueue( sharedQueue, spimData );

return spimData;
}

Expand Down

0 comments on commit fe55575

Please sign in to comment.