fixed problem with transforms when importing/exporting from multiple …

…sequential samples
JaneliaSciComp · Mar 29, 2024 · 995691d · 995691d
1 parent 4b103b1
commit 995691d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...ommonGUI/src/main/resources/org/janelia/workstation/common/release_notes/curr_release.txt b/...ommonGUI/src/main/resources/org/janelia/workstation/common/release_notes/curr_release.txt
@@ -1,4 +1,5 @@
 // 9.19
 
 Horta:
-* Added text boxes for adjusting color sliders; click the '#' button
+* Added text boxes for adjusting color sliders; click the '#' button
+* Fixed bug: if importing/exporting SWCs from multiple samples, later files now use correct transform
diff --git a/modules/ViewerController/src/main/java/org/janelia/workstation/controller/NeuronManager.java b/modules/ViewerController/src/main/java/org/janelia/workstation/controller/NeuronManager.java
@@ -105,7 +105,6 @@ public class NeuronManager implements DomainObjectSelectionSupport {
     };
 
     private final TiledMicroscopeDomainMgr tmDomainMgr;
-    private SWCDataConverter swcDataConverter;
 
     private TmNeuronMetadata currentNeuron;
     private List<TmNeuronMetadata> currentFilteredNeuronList;
@@ -183,12 +182,10 @@ public synchronized void clear() {
     }
 
     public SWCDataConverter getSwcDataConverter() {
-        if (swcDataConverter == null) {
-            swcDataConverter = new SWCDataConverter();
-            swcDataConverter.setSWCExchanger(new MatrixDrivenSWCExchanger(
-                    TmModelManager.getInstance().getMicronToVoxMatrix(),
-                    TmModelManager.getInstance().getVoxToMicronMatrix()));
-        }
+        SWCDataConverter swcDataConverter = new SWCDataConverter();
+        swcDataConverter.setSWCExchanger(new MatrixDrivenSWCExchanger(
+                TmModelManager.getInstance().getMicronToVoxMatrix(),
+                TmModelManager.getInstance().getVoxToMicronMatrix()));
         return swcDataConverter;
     }