improved getMeshSource function to always return the correct source f…

…or layers with more than one datasource
seung-lab · Oct 3, 2023 · 816612a · 816612a
1 parent 0302038
commit 816612a
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/neuroglancer/datasource/graphene/frontend.ts b/src/neuroglancer/datasource/graphene/frontend.ts
@@ -28,8 +28,8 @@ import {CHUNKED_GRAPH_LAYER_RPC_ID, CHUNKED_GRAPH_RENDER_LAYER_UPDATE_SOURCES_RP
 import {DataEncoding, ShardingHashFunction, ShardingParameters} from 'neuroglancer/datasource/precomputed/base';
 import {getSegmentPropertyMap, MultiscaleVolumeInfo, parseMultiscaleVolumeInfo, parseProviderUrl, PrecomputedDataSource, PrecomputedMultiscaleVolumeChunkSource, resolvePath} from 'neuroglancer/datasource/precomputed/frontend';
 import {LayerView, MouseSelectionState, VisibleLayerInfo} from 'neuroglancer/layer';
-import {LoadedDataSubsource} from 'neuroglancer/layer_data_source';
-import {MeshLayer, MeshSource, MultiscaleMeshLayer} from 'neuroglancer/mesh/frontend';
+import {LoadedDataSubsource, LoadedLayerDataSource} from 'neuroglancer/layer_data_source';
+import {MeshSource} from 'neuroglancer/mesh/frontend';
 import {DisplayDimensionRenderInfo} from 'neuroglancer/navigation_state';
 import {ChunkTransformParameters, getChunkPositionFromCombinedGlobalLocalPositions, getChunkTransformParameters, RenderLayerTransformOrError} from 'neuroglancer/render_coordinate_transform';
 import {RenderLayer, RenderLayerRole} from 'neuroglancer/renderlayer';
@@ -951,9 +951,20 @@ class GraphConnection extends SegmentationGraphSourceConnection {
 
   getMeshSource() {
     const {layer} = this;
-    for (const x of layer.renderLayers) {
-      if (x instanceof MeshLayer || x instanceof MultiscaleMeshLayer) {
-        return x.source;
+    for (const dataSource of layer.dataSources) {
+      const {loadState} = dataSource;
+      if (loadState instanceof LoadedLayerDataSource) {
+        const {subsources} = loadState.dataSource;
+        const graphSubsource = subsources.filter(subsource => subsource.id === 'graph')[0];
+        if (graphSubsource && graphSubsource.subsource.segmentationGraph) {
+          if (graphSubsource.subsource.segmentationGraph !== this.graph) {
+            continue;
+          }
+        }
+        const meshSubsource = subsources.filter(subsource => subsource.id === 'mesh')[0];
+        if (meshSubsource) {
+          return meshSubsource.subsource.mesh;
+        }
       }
     }
     return undefined;