Fixed initialization sequence and labelling for fragments workspaces

JaneliaSciComp · Jul 26, 2023 · 028ae07 · 028ae07
1 parent e8a0f36
commit 028ae07
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...es/ViewerController/src/main/java/org/janelia/workstation/controller/TmViewerManager.java b/...es/ViewerController/src/main/java/org/janelia/workstation/controller/TmViewerManager.java
@@ -245,7 +245,7 @@ public void loadComplete(LoadProjectEvent event) {
 
         TmModelManager.getInstance().setCurrentReviews(new TmReviewState());
         String systemNeuron = ConsoleProperties.getInstance().getProperty("console.LVVHorta.tracersgroup").trim();
-        modelManager.getCurrentView().setFilter(false);
+        TmModelManager.getInstance().getSpatialIndexManager().initialize();
         int nFragments = 0;
         for (TmNeuronMetadata neuron : modelManager.getNeuronModel().getNeurons()) {
             if (neuron.getOwnerKey().equals(systemNeuron)) {

diff --git a/...roller/src/main/java/org/janelia/workstation/controller/access/ProjectInitFacadeImpl.java b/...roller/src/main/java/org/janelia/workstation/controller/access/ProjectInitFacadeImpl.java
@@ -195,8 +195,6 @@ protected void doStuff() throws Exception {
                     NeuronManager.getInstance().setFilterStrategy(neuronFilter);
                 }
 
-                TmModelManager.getInstance().getSpatialIndexManager().initialize();
-
                 //  fireNeuronSpatialFilterUpdated(applyFilter, neuronFilter);
 
                 // Clear neuron selection

diff --git a/modules/ViewerInfoPanel/src/main/java/org/janelia/workstation/infopanel/PanelController.java b/modules/ViewerInfoPanel/src/main/java/org/janelia/workstation/infopanel/PanelController.java
@@ -65,6 +65,8 @@ public void workspaceLoaded(LoadProjectEvent loadEvent) {
         filteredAnnotationList.loadWorkspace(workspace);
         wsNeuronList.loadWorkspace(workspace);
         wsInfoPanel.loadWorkspace(workspace);
+        wsNeuronList.updateNeuronSpatialFilter(TmModelManager.getInstance().getCurrentWorkspace().isContainsFragments(),
+                TmModelManager.getInstance().getCurrentWorkspace().isContainsFragments()?"Enabled": "Disabled");
     }
 
     @Subscribe