From 38706c93b12dc585466cee88f8d533573903a9ac Mon Sep 17 00:00:00 2001
From: John Bogovic <bogovicj@janelia.hhmi.org>
Date: Wed, 16 Oct 2024 15:23:07 -0400
Subject: [PATCH] fix: ConverterSetups ids

* fixes project serialization bug
---
 src/main/java/bigwarp/BigWarpInit.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/bigwarp/BigWarpInit.java b/src/main/java/bigwarp/BigWarpInit.java
index 187601e..92f61f7 100644
--- a/src/main/java/bigwarp/BigWarpInit.java
+++ b/src/main/java/bigwarp/BigWarpInit.java
@@ -735,7 +735,7 @@ public static < T extends NativeType<T> > SourceInfo loadN5SourceInfo( final Big
 		return loadN5SourceInfo( bwData, n5, n5Dataset, queue, sourceId, moving );
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({"unchecked", "rawtypes"})
 	public static < T extends NativeType<T>> SourceInfo loadN5SourceInfo( final BigWarpData<?> bwData, final N5Reader n5, final String n5Dataset, final SharedQueue queue, 
 			final int sourceId, final boolean moving )
 	{
@@ -751,6 +751,11 @@ public static < T extends NativeType<T>> SourceInfo loadN5SourceInfo( final BigW
 		{}
 
 		final SourceAndConverter<T> sac = (SourceAndConverter<T>)openN5VSourceAndConverter( bwData, n5, meta, queue);
+		if( bwData != null ) {
+			bwData.sources.add((SourceAndConverter)sac);
+			bwData.converterSetups.add( BigDataViewer.createConverterSetup(sac, sourceId));
+		}
+
 		final String uri = n5.getURI().toString() + "$" + n5Dataset;
 		final SourceInfo info = new SourceInfo(sourceId, moving, sac.getSpimSource().getName(), () -> uri );
 		info.setSourceAndConverter(sac);
@@ -871,10 +876,6 @@ public static <T extends NativeType<T> & NumericType<T>> SourceAndConverter<T> o
 					BdvOptions.options());
 
 			if (sources.size() > 0) {
-				if( bwData != null ) {
-					bwData.sources.add((SourceAndConverter)sources.get(0));
-					bwData.converterSetups.add(converterSetups.get(0));
-				}
 				return sources.get(0);
 			}
 		} catch (final IOException e) {}