diff --git a/pom.xml b/pom.xml
index b6d856b0..1aca254b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.scijava
pom-scijava
- 37.0.0
+ 38.0.1
@@ -125,24 +125,6 @@
0.10.2
- 4.0.2
-
- 3.1.1
- 2.1.0
- 1.2.0
- 4.0.1
- 1.3.1
- 1.0.2
- ${n5-zstandard.version}
-
- 9.1.2
- 10.4.13
- 1.0.0-beta-34
-
- 0.41
- 0.41
-
- 3.0.4
@@ -151,6 +133,7 @@
sc.fiji
bigdataviewer-core
+ ${bigdataviewer-core.version}
@@ -197,18 +180,6 @@
${bigwarp_fiji.version}
-
- org.ejml
- ejml-core
- ${ejml-core.version}
-
-
-
- org.ejml
- ejml-ddense
- ${ejml-ddense.version}
-
-
junit
diff --git a/src/test/resources/bdvplaygroundstate.json b/src/test/resources/bdvplaygroundstate.json
index 5ffc8015..c1e5e842 100644
--- a/src/test/resources/bdvplaygroundstate.json
+++ b/src/test/resources/bdvplaygroundstate.json
@@ -516,7 +516,7 @@
]
}
},
- "wrapped_source_id": 26
+ "wrapped_source_id": 23
},
"string_metadata": {}
},
@@ -532,12 +532,12 @@
"affinetransform_fixed": {
"type": "AffineTransform3D",
"affinetransform3d": [
- 0.6572454814574047,
- -0.08891326296113902,
+ 0.4934699038397149,
+ -0.43627346109731185,
0.0,
0.0,
- 0.09087326321914962,
- 0.671733773421179,
+ 0.37597435400734647,
+ 0.4252654467029816,
0.0,
0.0,
0.0,
@@ -546,7 +546,7 @@
0.0
]
},
- "wrapped_source_id": 38
+ "wrapped_source_id": 37
},
"string_metadata": {}
},
@@ -562,12 +562,12 @@
"affinetransform_fixed": {
"type": "AffineTransform3D",
"affinetransform3d": [
- 0.4628521345566832,
- -0.2966675521328264,
+ 0.6410018149239727,
+ -0.18009554914567996,
0.0,
0.0,
- 0.2923677958182328,
- 0.45614377911310516,
+ 0.1394369922415217,
+ 0.49628858413405874,
0.0,
200.0,
0.0,
@@ -576,7 +576,7 @@
0.0
]
},
- "wrapped_source_id": 38
+ "wrapped_source_id": 37
},
"string_metadata": {}
},
@@ -592,12 +592,12 @@
"affinetransform_fixed": {
"type": "AffineTransform3D",
"affinetransform3d": [
- 0.5524777405081435,
- -0.322463046706307,
+ 0.6720813807105771,
+ -0.0238936497070828,
0.0,
200.0,
- 0.3540082949864662,
- 0.6065243907262191,
+ 0.021902326930651743,
+ 0.6160693868364272,
0.0,
0.0,
0.0,
@@ -606,7 +606,7 @@
0.0
]
},
- "wrapped_source_id": 38
+ "wrapped_source_id": 37
},
"string_metadata": {}
},
@@ -622,12 +622,12 @@
"affinetransform_fixed": {
"type": "AffineTransform3D",
"affinetransform3d": [
- 0.49868524403796227,
- -0.1105528659431934,
+ 0.6451428480942317,
+ -0.18561671816260913,
0.0,
200.0,
- 0.14369057046244033,
- 0.6481638136259267,
+ 0.19538296205509573,
+ 0.6790871094859349,
0.0,
200.0,
0.0,
@@ -636,7 +636,7 @@
0.0
]
},
- "wrapped_source_id": 38
+ "wrapped_source_id": 37
},
"string_metadata": {}
},
@@ -730,7 +730,7 @@
}
}
},
- "wrapped_source_id": 24
+ "wrapped_source_id": 25
},
"string_metadata": {}
},
@@ -914,8 +914,8 @@
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
- "source_id": 22,
- "color": -1,
+ "source_id": 23,
+ "color": 65535,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
"sac": {
@@ -927,16 +927,16 @@
"string_metadata": {}
},
{
- "source_name": "demoSlice.tif channel 1",
+ "source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
- "source_id": 24,
+ "source_id": 23,
"color": 65535,
- "converter_setup_min": 0.03902065799540933,
- "converter_setup_max": 131.07039020657996,
+ "converter_setup_min": 0.033052792654934965,
+ "converter_setup_max": 147.05187452180567,
"sac": {
"spimdata": {
- "datalocation": "src/test/resources/demoSlice.xml"
+ "datalocation": "src/test/resources/mri-stack.xml"
},
"viewsetup": 0
},
@@ -946,7 +946,7 @@
"source_name": "demoSlice.tif channel 1",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
- "source_id": 24,
+ "source_id": 25,
"color": 65535,
"converter_setup_min": 0.03902065799540933,
"converter_setup_max": 131.07039020657996,
@@ -959,32 +959,32 @@
"string_metadata": {}
},
{
- "source_name": "mri-stack",
+ "source_name": "demoSlice.tif channel 1",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
- "source_id": 26,
+ "source_id": 25,
"color": 65535,
- "converter_setup_min": 0.033052792654934965,
- "converter_setup_max": 147.05187452180567,
+ "converter_setup_min": 0.03902065799540933,
+ "converter_setup_max": 131.07039020657996,
"sac": {
"spimdata": {
- "datalocation": "src/test/resources/mri-stack.xml"
+ "datalocation": "src/test/resources/demoSlice.xml"
},
"viewsetup": 0
},
"string_metadata": {}
},
{
- "source_name": "mri-stack",
+ "source_name": "demoSlice.tif channel 1",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
"source_id": 26,
- "color": 65535,
- "converter_setup_min": 0.033052792654934965,
- "converter_setup_max": 147.05187452180567,
+ "color": -1,
+ "converter_setup_min": 0.03902065799540933,
+ "converter_setup_max": 131.07039020657996,
"sac": {
"spimdata": {
- "datalocation": "src/test/resources/mri-stack.xml"
+ "datalocation": "src/test/resources/demoSlice.xml"
},
"viewsetup": 0
},
@@ -1087,16 +1087,16 @@
"string_metadata": {}
},
{
- "source_name": "demoSlice.tif channel 1",
+ "source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
- "source_id": 33,
+ "source_id": 37,
"color": -1,
- "converter_setup_min": 0.03902065799540933,
- "converter_setup_max": 131.07039020657996,
+ "converter_setup_min": 0.033052792654934965,
+ "converter_setup_max": 147.05187452180567,
"sac": {
"spimdata": {
- "datalocation": "src/test/resources/demoSlice.xml"
+ "datalocation": "src/test/resources/mri-stack.xml"
},
"viewsetup": 0
},
@@ -1106,7 +1106,7 @@
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
- "source_id": 38,
+ "source_id": 37,
"color": -1,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
@@ -1122,7 +1122,7 @@
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
- "source_id": 38,
+ "source_id": 37,
"color": -1,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
@@ -1138,7 +1138,7 @@
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
- "source_id": 38,
+ "source_id": 37,
"color": -1,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,
@@ -1154,7 +1154,7 @@
"source_name": "mri-stack",
"source_class": "bdv.SpimSource",
"converter_class": "class net.imglib2.display.Instances$Imp",
- "source_id": 38,
+ "source_id": 37,
"color": -1,
"converter_setup_min": 0.033052792654934965,
"converter_setup_max": 147.05187452180567,