From 995691ddf63623a1ecb2d1b0fb8cc68f4c99ca72 Mon Sep 17 00:00:00 2001 From: "Donald J. Olbris" Date: Fri, 29 Mar 2024 09:05:28 -0400 Subject: [PATCH] fixed problem with transforms when importing/exporting from multiple sequential samples --- .../workstation/common/release_notes/curr_release.txt | 3 ++- .../janelia/workstation/controller/NeuronManager.java | 11 ++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/CommonGUI/src/main/resources/org/janelia/workstation/common/release_notes/curr_release.txt b/modules/CommonGUI/src/main/resources/org/janelia/workstation/common/release_notes/curr_release.txt index c3c81d294..9303a7e2e 100644 --- a/modules/CommonGUI/src/main/resources/org/janelia/workstation/common/release_notes/curr_release.txt +++ b/modules/CommonGUI/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 \ No newline at end of file +* 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 \ No newline at end of file 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 index c5e594292..8045a15f2 100644 --- 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 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; }