Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
094eed7
attempt to fix the scale values for OME-ZARR; the fix was to scale tr…
cgoina Oct 28, 2025
4cc633d
preserve user entered voxel units as well
cgoina Oct 29, 2025
bd5c971
Merge branch 'master' into fix-downsampled-resolutions
cgoina Oct 30, 2025
15053f1
Compute resolution at S0 using calibration values, downsampling and a…
cgoina Oct 30, 2025
6c10ce0
removed debug print statements
cgoina Oct 31, 2025
b36a9d5
Merge branch 'master' into fix-downsampled-resolutions
cgoina Oct 31, 2025
4a43795
fix SmartSPIM to skip tiles with skip=0 in metadata.json
indecisiveuser Nov 5, 2025
e0b2e0a
Merge pull request #89 from indecisiveuser/SmartSPIM_skip_tiles
StephanPreibisch Nov 5, 2025
c5f0221
fixing small history select bug when selecting multiple setups
indecisiveuser Nov 5, 2025
e82f432
Merge branch 'master' into fix-downsampled-resolutions
cgoina Nov 5, 2025
58d0e65
CI: update secret env var declarations
ctrueden Nov 6, 2025
7d94cd5
Fix missing pair bug in detectSubsets merge operation
StephanPreibisch Dec 3, 2025
0d2ec2c
Merge branch 'master' into fix-downsampled-resolutions
cgoina Dec 12, 2025
ad50236
Merge pull request #90 from indecisiveuser/multple_history_select
StephanPreibisch Jan 9, 2026
5cb0122
Merge branch 'master' into fix-downsampled-resolutions
cgoina Jan 13, 2026
538df33
fixed a NPE
cgoina Jan 13, 2026
53be075
use dataset paths from the metadata if available
cgoina Jan 13, 2026
2cb1c38
DisplayRawImagesPopup now supports displaying downsampled images
StephanPreibisch Jan 6, 2026
684c156
fix DisplayRawImagesPopup for multiple images
StephanPreibisch Jan 6, 2026
786fb65
use mpicbg-1.6.6
StephanPreibisch Feb 19, 2026
d02c8d6
Bump to next development cycle
StephanPreibisch Feb 19, 2026
1f4fb0e
Merge branch 'master' into fix-downsampled-resolutions
cgoina Mar 17, 2026
d633657
comment for the viewIdToOmeMetadata cache
cgoina Mar 17, 2026
83be3af
comment about setting resolutionS0
cgoina Mar 17, 2026
e2938c0
addressing comments from the review
cgoina Mar 19, 2026
c0b79b1
Merge pull request #87 from JaneliaSciComp/fix-downsampled-resolutions
StephanPreibisch Mar 21, 2026
1521aca
finished translation handling when importing OME-ZARR's
StephanPreibisch Mar 21, 2026
16e0b6b
update licenses
StephanPreibisch Mar 21, 2026
574183e
Bump to next development cycle
StephanPreibisch Mar 21, 2026
d6971a1
added support for ZeissQuickStartCZIReader
cgoina Apr 9, 2026
f3edc69
Merge branch 'quick-czireader' into zarrv3-quick-czireader
cgoina Apr 11, 2026
19c3d9e
Merge branch 'zarrv3' into zarrv3-quick-czireader
cgoina Apr 13, 2026
297b363
reconciled with zarrv3
cgoina Apr 13, 2026
7f3b4e2
fixed blocksize
cgoina Apr 16, 2026
5e49f49
update n5 universe
cgoina Apr 17, 2026
6912740
replaced copyright to the one from zarrv3 branch
cgoina Apr 19, 2026
0569e61
reverse axes
cgoina Apr 19, 2026
cf7d8cc
changed axisadapter to not save channel unit; use saveNonEmptyBlock f…
cgoina Apr 21, 2026
01caf59
Changed saveBlock with saveNonEmptyBlock
cgoina Apr 29, 2026
3e408dc
updated claude from zarrv3
cgoina Apr 29, 2026
6480dec
update pom
cgoina Apr 29, 2026
685eb3d
Merge branch 'zarrv3' into zarrv3-quick-czireader
cgoina Apr 29, 2026
434d24b
with-deps profile
cgoina May 2, 2026
842b33d
if set use shardsize as compute size
cgoina May 2, 2026
ddd5d46
methods to create OME v04 and OME v05
cgoina May 3, 2026
dcb2202
use crc codec
cgoina May 5, 2026
8ef5b89
Merge branch 'zarrv3' into zarrv3-quick-czireader
cgoina May 6, 2026
f25cec1
Merge branch 'zarrv3' into zarrv3-quick-czireader
cgoina May 11, 2026
6ee061a
merge from zarrv3
cgoina Jun 2, 2026
c47c239
fixes for reading ome metadata 0.5 or 0.4
cgoina Jun 2, 2026
a7d2dc7
updated bigdataviewer-core and removed the caching for viewIdMetadata
cgoina Jun 15, 2026
61b794a
merged from zarrv3
cgoina Jun 15, 2026
9bac0f3
more merges from zarrv3
cgoina Jun 15, 2026
9f83884
more merges
cgoina Jun 15, 2026
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@
# IntelliJ #
.idea/
SPIM_Registration.iml

.claude
54 changes: 52 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>net.preibisch</groupId>
<artifactId>multiview-reconstruction</artifactId>
<version>9.0.0-SNAPSHOT</version>
<version>9.0.1-SNAPSHOT</version>

<name>Multiview Reconstruction</name>
<description>Software for the reconstruction of multi-view microscopic acquisitions
Expand Down Expand Up @@ -98,6 +98,10 @@ like Selective Plane Illumination Microscopy (SPIM) Data.</description>

<license.licenseName>gpl_v2</license.licenseName>
<license.copyrightOwners>Multiview Reconstruction developers.</license.copyrightOwners>
<scijava.jvm.version>17</scijava.jvm.version>
<scijava.javadoc.url.java>https://javadoc.scijava.org/Java11/</scijava.javadoc.url.java>
<scijava.javadoc.url.javafx>https://javadoc.scijava.org/JavaFX11/</scijava.javadoc.url.javafx>
<legacyMode>true</legacyMode> <!-- NB: Make javadoc less strict about Java module system. -->

<!-- NB: Deploy releases to the SciJava Maven repository. -->
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
Expand All @@ -119,6 +123,8 @@ like Selective Plane Illumination Microscopy (SPIM) Data.</description>
<imglib2-cache.version>1.0.0-beta-20</imglib2-cache.version>
<imglib2-realtransform.version>4.0.5</imglib2-realtransform.version>
<imglib2-algorithm.version>0.18.3</imglib2-algorithm.version>
<bigdataviewer-core.version>10.6.11</bigdataviewer-core.version>
<javafx.version>19.0.2.1</javafx.version>
<multiview-simulation.version>0.3.1</multiview-simulation.version>

<mpicbg.version>1.6.6</mpicbg.version>
Expand Down Expand Up @@ -318,6 +324,11 @@ like Selective Plane Illumination Microscopy (SPIM) Data.</description>
<artifactId>ijp-kheops</artifactId>
<version>${ijp-kheops.version}</version>
</dependency>
<dependency>
<groupId>ch.epfl.biop</groupId>
<artifactId>quick-start-czi-reader</artifactId>
<version>0.3.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand Down Expand Up @@ -361,6 +372,23 @@ like Selective Plane Illumination Microscopy (SPIM) Data.</description>
<artifactId>slf4j-api</artifactId>
</dependency>

<!-- JavaFX dependencies -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
<classifier>${scijava.natives.classifier.javafx}</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<classifier>${scijava.natives.classifier.javafx}</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<classifier>${scijava.natives.classifier.javafx}</classifier>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -405,7 +433,7 @@ like Selective Plane Illumination Microscopy (SPIM) Data.</description>
</build>

<profiles>
<profile>
<profile>
<id>fatjar</id>
<build>
<plugins>
Expand Down Expand Up @@ -455,6 +483,28 @@ like Selective Plane Illumination Microscopy (SPIM) Data.</description>
</plugins>
</build>
</profile>
<profile>
<id>with-deps</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals><goal>copy-dependencies</goal></goals>
<configuration>
<outputDirectory>${project.build.directory}/deps</outputDirectory>
<includeScope>runtime</includeScope>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public static boolean populateImageSize( final SmartSPIMMetaData metadata, final
IOFunctions.println( "file names are not equal. Stopping." );
return false;
}

}

return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

import mpicbg.spim.data.sequence.VoxelDimensions;
import org.bigdataviewer.n5.N5CloudImageLoader;
import org.janelia.saalfeldlab.n5.Compression;
import org.janelia.saalfeldlab.n5.DataType;
Expand Down Expand Up @@ -192,13 +193,15 @@ else if ( n5Params.format == StorageFormat.HDF5 )
}
else
{
VoxelDimensions vx = data.getSequenceDescription().getViewDescription( viewId ).getViewSetup().getVoxelSize();
// 5d OME-ZARR with dimension=1 in c and t
mrInfo = N5ApiTools.setupBdvDatasetsOMEZARR_ResaveRaw(
n5Writer,
viewId,
dataTypes.get( viewId.getViewSetupId() ),
dimensions.get( viewId.getViewSetupId() ),
//data.getSequenceDescription().getViewDescription( viewId ).getViewSetup().getVoxelSize().dimensionsAsDoubleArray(),
vx.dimensionsAsDoubleArray(), // resolutionS0
vx.unit(),
compression,
blockSize,
downsamplings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.stream.Collectors;

import javax.swing.JMenu;
import javax.swing.JMenuItem;
Expand Down
Loading