Update bigdataviewer-image-loaders.version

Author: tischi

pom.xml

@@ -107,7 +107,7 @@
         <releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
 
         <org.jetbrains.annotations.version>16.0.2</org.jetbrains.annotations.version>
-        <bigdataviewer-image-loaders.version>0.10.0</bigdataviewer-image-loaders.version>
+        <bigdataviewer-image-loaders.version>0.20.2</bigdataviewer-image-loaders.version>
         <trove.version>1.0.2</trove.version>
         <everit-json-schema.version>1.14.0</everit-json-schema.version>
         <toml4j.version>0.7.2</toml4j.version>

src/main/java/org/embl/mobie/io/imagedata/BioFormatsImageData.java

@@ -53,49 +53,48 @@ public BioFormatsImageData( String uri, SharedQueue sharedQueue )
                             .setSerie( i )
                             .useBFMemo( false );
 
-                    // Throws NPE, https://github.com/mobie/mobie-viewer-fiji/issues/1247
-                    // if ( usePixelUnits )
-                    //    settings.unit( "pixel" );
+                    // https://github.com/mobie/mobie-viewer-fiji/issues/1247
+                    if ( usePixelUnits )
+                        settings.unit( "pixel" );
 
                     settingsList.add( settings );
                 }
 
                 AbstractSpimData< ? > spimData = OpenersToSpimData.getSpimData( settingsList );
 
-                // Since the above throws a NPE, we resort to
-                if ( usePixelUnits )
-                    setAllVoxelUnitsToPixel( spimData );
-
                 return spimData;
             }
         } );
         this.uri = uri;
         this.sharedQueue = sharedQueue;
     }
 
-    private static void setAllVoxelUnitsToPixel(AbstractSpimData<?> spimData) {
-
-        spimData.getSequenceDescription().getViewSetupsOrdered().forEach(setup -> {
-            final Method setVoxelSize;
+    // NB: this is not used anymore because doing it in OpenersToSpimData works now.
+    // But I will keep it here because it might be useful in the future.
+    private static void setAllVoxelUnitsToPixel(AbstractSpimData<?> spimData)
+    {
+        spimData.getSequenceDescription().getViewSetupsOrdered().forEach(setup ->
+        {
             try
             {
-                setVoxelSize = BasicViewSetup.class.getDeclaredMethod("setVoxelSize", VoxelDimensions.class);
+                final Method setVoxelSize;
+                setVoxelSize = BasicViewSetup.class.getDeclaredMethod( "setVoxelSize", VoxelDimensions.class );
+                setVoxelSize.setAccessible( true );
+
+                try {
+                    final double[] dims = new double[ setup.getVoxelSize().numDimensions() ];
+                    Arrays.fill( dims,1.0 );
+                    setVoxelSize.invoke( setup, new FinalVoxelDimensions( "pixel", dims ) );
+                }
+                catch ( Exception e )
+                {
+                    throw new RuntimeException( "Failed to set voxel size for setup " + setup.getId(), e );
+                }
             }
             catch ( NoSuchMethodException ex )
             {
                 throw new RuntimeException( ex );
             }
-            setVoxelSize.setAccessible(true);
-
-            try {
-                final double[] dims = new double[setup.getVoxelSize().numDimensions()];
-                Arrays.fill(dims,1.0);
-                setVoxelSize.invoke(setup, new FinalVoxelDimensions("pixel", dims));
-            }
-            catch ( Exception e )
-            {
-                throw new RuntimeException("Failed to set voxel size for setup " + setup.getId(), e);
-            }
-        });
+        } );
     }
 }

src/test/java/org/embl/mobie/io/imagedata/BioFormatsImageDataTest.java

@@ -6,8 +6,7 @@
 import org.embl.mobie.io.ImageDataOpener;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 class BioFormatsImageDataTest
 {
@@ -20,7 +19,7 @@ public void openPNG()
                 ImageDataFormat.fromPath( "src/test/resources/images/boats.png" ),
                 new SharedQueue( 1 ) );
         VoxelDimensions voxelDimensions = imageData.getSourcePair( 0 ).getB().getVoxelDimensions();
-        assertEquals( "pixel", voxelDimensions.unit() );
+        assertTrue( voxelDimensions.unit().equals( "pixel" ) || voxelDimensions.unit().equals( "px" ) );
     }
 
     @Test