fix node selection issue in dense area with hidden neurons

JaneliaSciComp · Mar 11, 2024 · 2c462d9 · 2c462d9
1 parent 801f3d2
commit 2c462d9
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/modules/HortaTracer/src/main/java/org/janelia/horta/TracingInteractor.java b/modules/HortaTracer/src/main/java/org/janelia/horta/TracingInteractor.java
@@ -698,16 +698,20 @@ public void moveHoverCursor(Point screenPoint) {
                     if (bSearchMultipleAnchors) {
                         // Skip hidden neurons
 
-                        List<TmGeoAnnotation> nearestVertexes = spatialManager.getAnchorClosestToMicronLocation(loc, 3);
+                        List<TmGeoAnnotation> nearestVertexes = spatialManager.getAnchorClosestToMicronLocation(loc, 20);
                         float minDistSquared = Float.MAX_VALUE;
                         for (TmGeoAnnotation v : nearestVertexes) {
                             if (v == null)
                                 continue;
                             TmNeuronMetadata neuron = NeuronManager.getInstance().getNeuronFromNeuronID(v.getNeuronId());
                             if (neuron == null) 
                                 continue;
-                            if (!neuron.isVisible() || TmModelManager.getInstance().getCurrentView().isNonInteractable(neuron.getId())) {
-                                // log.info("skipping invisible neuron");
+                            if (TmModelManager.getInstance().getCurrentView().isHidden(neuron.getId())) {
+                                // log.info("skipping hidden neuron");
+                                continue;
+                            }
+                            if (TmModelManager.getInstance().getCurrentView().isNonInteractable(neuron.getId())) {
+                                // log.info("skipping non-interactable neuron");
                                 continue;
                             }
                             float[] location = TmModelManager.getInstance().getLocationInMicrometers(v.getX(),
@@ -729,12 +733,6 @@ public void moveHoverCursor(Point screenPoint) {
                     FrameworkAccess.handleException(e);
                     log.warn("Workspace does not support spatial queries. Falling back on old Horta spatial index.");
                 }
-                if (nearestVertex != null) {
-                    neuronModel = NeuronManager.getInstance().getNeuronFromNeuronID(nearestVertex.getNeuronId());
-                    if (TmModelManager.getInstance().getCurrentView().isHidden(neuronModel.getId())) {
-                        nearestVertex = null;
-                    }
-                }
             }
             else {
                 log.error("No default workspace found");
@@ -743,6 +741,7 @@ public void moveHoverCursor(Point screenPoint) {
             if (nearestVertex == null) // no vertices to be found?
                 foundGoodHighlightVertex = false;
             else {
+                neuronModel = NeuronManager.getInstance().getNeuronFromNeuronID(nearestVertex.getNeuronId());
                 if (neuronModel == null) {
                     // TODO: Should not happen
                     log.warn("Unexpected null neuron");