@jax-data-science/sci-image-visualizer 0.8.3 → 0.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +201 -460
- package/esm2022/index.mjs +28 -15
- package/esm2022/lib/channel-histogram/channel-histogram.component.mjs +163 -91
- package/esm2022/lib/contracts/capabilities.contract.mjs +4 -3
- package/esm2022/lib/contracts/cell-segmenter.contract.mjs +1 -1
- package/esm2022/lib/contracts/channel-histogram-api.contract.mjs +5 -1
- package/esm2022/lib/contracts/color.mjs +60 -0
- package/esm2022/lib/contracts/colormap-lut.mjs +213 -57
- package/esm2022/lib/contracts/coordinate-transform.contract.mjs +1 -1
- package/esm2022/lib/contracts/display-types.mjs +11 -1
- package/esm2022/lib/contracts/instance-segmenter.contract.mjs +1 -1
- package/esm2022/lib/contracts/intensity.mjs +48 -5
- package/esm2022/lib/contracts/plot-type-contribution.contract.mjs +1 -1
- package/esm2022/lib/contracts/plot-type.mjs +134 -17
- package/esm2022/lib/contracts/ports/image-state.port.mjs +4 -1
- package/esm2022/lib/contracts/ports/preferences.port.mjs +5 -1
- package/esm2022/lib/contracts/ports/region-io.port.mjs +2 -1
- package/esm2022/lib/contracts/ports/spatial-data.port.mjs +5 -1
- package/esm2022/lib/contracts/ports/tile-access.port.mjs +2 -1
- package/esm2022/lib/contracts/region-editor-api.contract.mjs +1 -1
- package/esm2022/lib/contracts/region-overlay.contract.mjs +1 -1
- package/esm2022/lib/contracts/sam.contract.mjs +1 -1
- package/esm2022/lib/contracts/semantic-segmenter.contract.mjs +1 -1
- package/esm2022/lib/contracts/spatial-dataset.contract.mjs +3 -1
- package/esm2022/lib/contracts/toolbar-tool.contract.mjs +6 -4
- package/esm2022/lib/contracts/visualizer.contract.mjs +1 -1
- package/esm2022/lib/contracts/viz-config.mjs +2 -1
- package/esm2022/lib/geometry/contour.mjs +63 -0
- package/esm2022/lib/geometry/raster.mjs +98 -0
- package/esm2022/lib/geometry/ring.mjs +201 -0
- package/esm2022/lib/hex-color-picker/hex-color-picker.component.mjs +202 -102
- package/esm2022/lib/implementations/base-store-visualizer.mjs +201 -48
- package/esm2022/lib/implementations/napari-js/napari-axes-gizmo.mjs +65 -0
- package/esm2022/lib/implementations/napari-js/napari-display-state.mjs +136 -0
- package/esm2022/lib/implementations/napari-js/napari-helpers.mjs +199 -0
- package/esm2022/lib/implementations/napari-js/napari-image-2d-scene.mjs +602 -0
- package/esm2022/lib/implementations/napari-js/napari-loading-badge.mjs +3 -4
- package/esm2022/lib/implementations/napari-js/napari-loading-state.mjs +66 -0
- package/esm2022/lib/implementations/napari-js/napari-region-overlay.mjs +157 -591
- package/esm2022/lib/implementations/napari-js/napari-scene.mjs +2 -0
- package/esm2022/lib/implementations/napari-js/napari-spatial-2d-scene.mjs +614 -0
- package/esm2022/lib/implementations/napari-js/napari-spatial-3d-scene.mjs +769 -0
- package/esm2022/lib/implementations/napari-js/napari-spatial-encoding.mjs +199 -0
- package/esm2022/lib/implementations/napari-js/napari-spatial-hover.mjs +263 -0
- package/esm2022/lib/implementations/napari-js/napari-spatial-scene.mjs +159 -0
- package/esm2022/lib/implementations/napari-js/napari-spatial-tiles.mjs +106 -1408
- package/esm2022/lib/implementations/napari-js/napari-spatial-tooltip.mjs +2 -2
- package/esm2022/lib/implementations/napari-js/napari-surface-scene.mjs +271 -0
- package/esm2022/lib/implementations/napari-js/napari-tile-client.mjs +562 -0
- package/esm2022/lib/implementations/napari-js/napari-tool-bridge.mjs +344 -0
- package/esm2022/lib/implementations/napari-js/napari-visualizer.service.mjs +358 -4218
- package/esm2022/lib/implementations/napari-js/napari-volume-scene.mjs +439 -0
- package/esm2022/lib/implementations/napari-js/napari-volume-z-handle.mjs +6 -6
- package/esm2022/lib/implementations/napari-js/region-overlay/overlay-projection.mjs +96 -0
- package/esm2022/lib/implementations/napari-js/region-overlay/region-edit.mjs +35 -0
- package/esm2022/lib/implementations/napari-js/region-overlay/region-svg-renderer.mjs +182 -0
- package/esm2022/lib/implementations/napari-js/spatial-tiles/categorical-lookup.mjs +30 -0
- package/esm2022/lib/implementations/napari-js/spatial-tiles/cell-layers.mjs +274 -0
- package/esm2022/lib/implementations/napari-js/spatial-tiles/density-layer.mjs +144 -0
- package/esm2022/lib/implementations/napari-js/spatial-tiles/layer-groups.mjs +165 -0
- package/esm2022/lib/implementations/napari-js/spatial-tiles/plan-context.mjs +78 -0
- package/esm2022/lib/implementations/napari-js/spatial-tiles/transcript-hover.mjs +182 -0
- package/esm2022/lib/implementations/napari-js/spatial-tiles/transcript-jobs.mjs +369 -0
- package/esm2022/lib/implementations/napari-js/spatial-tiles/transcript-layers.mjs +306 -0
- package/esm2022/lib/implementations/osd/display-pipeline.mjs +102 -40
- package/esm2022/lib/implementations/osd/histogram-sampler.mjs +56 -31
- package/esm2022/lib/implementations/osd/openseadragon-viewer-options.mjs +128 -0
- package/esm2022/lib/implementations/osd/openseadragon-visualizer.service.mjs +333 -1685
- package/esm2022/lib/implementations/osd/osd-coordinate-transform.mjs +1 -1
- package/esm2022/lib/implementations/osd/osd-coords.mjs +5 -6
- package/esm2022/lib/implementations/osd/osd-export.mjs +122 -0
- package/esm2022/lib/implementations/osd/osd-lib.mjs +15 -1
- package/esm2022/lib/implementations/osd/osd-navigator-chrome.mjs +205 -0
- package/esm2022/lib/implementations/osd/osd-pixel-readback.mjs +68 -0
- package/esm2022/lib/implementations/osd/osd-region-overlay-draw.mjs +153 -0
- package/esm2022/lib/implementations/osd/osd-region-overlay.mjs +185 -718
- package/esm2022/lib/implementations/osd/osd-scale-bar.mjs +52 -60
- package/esm2022/lib/implementations/osd/osd-tile-source.mjs +105 -0
- package/esm2022/lib/implementations/osd/osd-viewer-like.mjs +2 -0
- package/esm2022/lib/implementations/osd/osd-viewer-mount.mjs +44 -0
- package/esm2022/lib/implementations/osd/osd-viewport.mjs +184 -0
- package/esm2022/lib/implementations/osd/osd-zoom.mjs +7 -1
- package/esm2022/lib/implementations/osd/simple-source.mjs +395 -0
- package/esm2022/lib/implementations/osd/slice-cache.mjs +53 -48
- package/esm2022/lib/implementations/osd/tile-client.mjs +32 -11
- package/esm2022/lib/implementations/osd/tile-recolor.mjs +330 -0
- package/esm2022/lib/implementations/plotly/omics-trace-builders.mjs +161 -73
- package/esm2022/lib/implementations/plotly/plotly-coordinate-transform.mjs +1 -1
- package/esm2022/lib/implementations/plotly/plotly-image-loader.mjs +112 -0
- package/esm2022/lib/implementations/plotly/plotly-image-recolor.mjs +178 -0
- package/esm2022/lib/implementations/plotly/plotly-intensity-inset.mjs +33 -0
- package/esm2022/lib/implementations/plotly/plotly-isosurface-controls.mjs +83 -0
- package/esm2022/lib/implementations/plotly/plotly-layouts.mjs +121 -0
- package/esm2022/lib/implementations/plotly/plotly-readback.mjs +117 -0
- package/esm2022/lib/implementations/plotly/plotly-region-overlay.mjs +19 -10
- package/esm2022/lib/implementations/plotly/plotly-shape-projection.mjs +223 -0
- package/esm2022/lib/implementations/plotly/plotly-trace-builders.mjs +79 -19
- package/esm2022/lib/implementations/plotly/plotly-zoom-controller.mjs +223 -0
- package/esm2022/lib/implementations/plotly/plotly.service.mjs +439 -1655
- package/esm2022/lib/implementations/region-centroids.mjs +47 -0
- package/esm2022/lib/implementations/simple-slice-access.service.mjs +22 -12
- package/esm2022/lib/implementations/spatial-data-http/spatial-data-http.service.mjs +172 -92
- package/esm2022/lib/implementations/spatial-data-http/spatial-wire.mjs +103 -22
- package/esm2022/lib/implementations/tile-server/index.mjs +6 -0
- package/esm2022/lib/implementations/tile-server/native-histogram.mjs +30 -0
- package/esm2022/lib/implementations/tile-server/poll-descriptor.mjs +65 -0
- package/esm2022/lib/implementations/tile-server/tile-protocol.mjs +42 -0
- package/esm2022/lib/implementations/tile-server/transport.mjs +135 -0
- package/esm2022/lib/intensity/intensity-profile.mjs +107 -0
- package/esm2022/lib/intensity/intensity-profile.service.mjs +223 -0
- package/esm2022/lib/intensity-inset/intensity-inset.component.mjs +133 -0
- package/esm2022/lib/models/bezier.mjs +1 -11
- package/esm2022/lib/models/class-preset.mjs +41 -3
- package/esm2022/lib/models/geometry.mjs +27 -164
- package/esm2022/lib/models/polygon-edit.mjs +254 -0
- package/esm2022/lib/models/polygon-factory.mjs +118 -0
- package/esm2022/lib/models/region-clone.mjs +68 -0
- package/esm2022/lib/models/region-geojson.mjs +373 -0
- package/esm2022/lib/models/region.mjs +34 -33
- package/esm2022/lib/models/shape.mjs +18 -16
- package/esm2022/lib/plot-mode/contribution-host.mjs +297 -0
- package/esm2022/lib/plot-mode/plot-mode-controller.mjs +9 -6
- package/esm2022/lib/plot-mode/plot-type-menu.mjs +85 -0
- package/esm2022/lib/plot-mode/tool-params-model.mjs +87 -0
- package/esm2022/lib/plot.utilities.mjs +296 -473
- package/esm2022/lib/processing/image-crop.mjs +1 -1
- package/esm2022/lib/processing/processing-image.mjs +28 -15
- package/esm2022/lib/provide-visualization.mjs +40 -14
- package/esm2022/lib/region-editor/classes-panel/classes-panel.component.mjs +99 -0
- package/esm2022/lib/region-editor/file-stem.mjs +13 -0
- package/esm2022/lib/region-editor/manage-classes-dialog/manage-classes-dialog.component.mjs +118 -0
- package/esm2022/lib/region-editor/mask-export.service.mjs +98 -0
- package/esm2022/lib/region-editor/mask-raster.mjs +11 -5
- package/esm2022/lib/region-editor/region-color-dialog/region-color-dialog.component.mjs +56 -0
- package/esm2022/lib/region-editor/region-editor-help/region-editor-help.component.mjs +28 -0
- package/esm2022/lib/region-editor/region-editor.component.mjs +402 -651
- package/esm2022/lib/region-editor/region-metrics.mjs +68 -0
- package/esm2022/lib/region-editor/region-persistence.service.mjs +134 -0
- package/esm2022/lib/region-editor/region-table/region-table.component.mjs +153 -0
- package/esm2022/lib/region-editor/save-mask-dialog/save-mask-dialog.component.mjs +91 -0
- package/esm2022/lib/region-editor/save-regions-dialog/save-regions-dialog.component.mjs +92 -0
- package/esm2022/lib/region-ops.service.mjs +28 -70
- package/esm2022/lib/region-overlay/region-geometry.mjs +360 -0
- package/esm2022/lib/region-overlay/region-hit-test.mjs +103 -0
- package/esm2022/lib/region-overlay/svg-region-renderer.mjs +228 -0
- package/esm2022/lib/render-orchestrator.mjs +14 -11
- package/esm2022/lib/render-session.mjs +207 -0
- package/esm2022/lib/routing-visualizer.service.mjs +459 -411
- package/esm2022/lib/spatial/density-raster.mjs +14 -0
- package/esm2022/lib/spatial/embedding-compute-coordinator.mjs +239 -0
- package/esm2022/lib/spatial/embedding-compute.mjs +43 -10
- package/esm2022/lib/spatial/gene-search.mjs +1 -1
- package/esm2022/lib/spatial/glyphs.mjs +97 -0
- package/esm2022/lib/spatial/lod.mjs +187 -0
- package/esm2022/lib/spatial/spatial-controls.facade.mjs +200 -0
- package/esm2022/lib/spatial/spatial-density.mjs +25 -16
- package/esm2022/lib/spatial/spatial-encoding.mjs +26 -82
- package/esm2022/lib/spatial/spatial-expression.mjs +43 -42
- package/esm2022/lib/spatial/spatial-framing.mjs +1 -1
- package/esm2022/lib/spatial/spatial-heatmap.mjs +6 -3
- package/esm2022/lib/spatial/spatial-hover.mjs +5 -33
- package/esm2022/lib/spatial/spatial-panel-model.mjs +282 -0
- package/esm2022/lib/spatial/spatial-sections.mjs +1 -1
- package/esm2022/lib/spatial/spatial-selection.mjs +33 -46
- package/esm2022/lib/spatial/spatial-tile-merge.mjs +219 -0
- package/esm2022/lib/spatial/spatial-tiles.mjs +12 -648
- package/esm2022/lib/spatial/spatial-volume-image.mjs +2 -4
- package/esm2022/lib/spatial/stats.mjs +71 -0
- package/esm2022/lib/spatial/transcript-grouping.mjs +307 -0
- package/esm2022/lib/spatial-controls/spatial-cells-panel/spatial-cells-panel.component.mjs +150 -0
- package/esm2022/lib/spatial-controls/spatial-charts/chart-data-model.mjs +309 -0
- package/esm2022/lib/spatial-controls/spatial-charts/chart-help.mjs +145 -0
- package/esm2022/lib/spatial-controls/spatial-charts/plotly-chart-host.mjs +158 -0
- package/esm2022/lib/spatial-controls/spatial-charts/spatial-chart-window/spatial-chart-window.component.mjs +47 -0
- package/esm2022/lib/spatial-controls/spatial-charts/spatial-charts.component.mjs +297 -802
- package/esm2022/lib/spatial-controls/spatial-charts/spatial-embedding-controls/spatial-embedding-controls.component.mjs +89 -0
- package/esm2022/lib/spatial-controls/spatial-charts/spatial-heatmap-controls/spatial-heatmap-controls.component.mjs +52 -0
- package/esm2022/lib/spatial-controls/spatial-controls.component.mjs +143 -1238
- package/esm2022/lib/spatial-controls/spatial-gene-picker.mjs +153 -0
- package/esm2022/lib/spatial-controls/spatial-gene-tree/spatial-gene-tree.component.mjs +241 -0
- package/esm2022/lib/spatial-controls/spatial-groups-panel/spatial-groups-panel.component.mjs +193 -0
- package/esm2022/lib/spatial-controls/spatial-key/spatial-key.component.mjs +132 -0
- package/esm2022/lib/spatial-controls/spatial-key/spatial-key.model.mjs +67 -0
- package/esm2022/lib/spatial-controls/spatial-marker-genes-form/spatial-marker-genes-form.component.mjs +147 -0
- package/esm2022/lib/spatial-controls/spatial-observations-panel/spatial-observations-panel.component.mjs +300 -0
- package/esm2022/lib/spatial-controls/spatial-transcripts-panel/spatial-transcripts-panel.component.mjs +370 -0
- package/esm2022/lib/store/class-color.util.mjs +46 -3
- package/esm2022/lib/store/region-history.mjs +146 -0
- package/esm2022/lib/store/region-scope-cache.mjs +140 -0
- package/esm2022/lib/store/region-selection.mjs +82 -0
- package/esm2022/lib/store/region-store.service.mjs +279 -675
- package/esm2022/lib/store/spatial-selection.service.mjs +2 -2
- package/esm2022/lib/store/visualizer-store.service.mjs +49 -71
- package/esm2022/lib/toast-outlets.mjs +5 -4
- package/esm2022/lib/toolbar/brush/brush-tool.service.mjs +92 -434
- package/esm2022/lib/toolbar/canvas-tools.mjs +20 -0
- package/esm2022/lib/toolbar/crop/slide-crop.mjs +26 -42
- package/esm2022/lib/toolbar/plot-type-selector/plot-type-selector.component.mjs +85 -0
- package/esm2022/lib/toolbar/region-tools/region-tool-buttons.mjs +74 -0
- package/esm2022/lib/toolbar/region-tools/region-tools.component.mjs +114 -0
- package/esm2022/lib/toolbar/segmentation/cell-segment-tool.service.mjs +74 -78
- package/esm2022/lib/toolbar/segmentation/cellpose-segmenter.service.mjs +50 -8
- package/esm2022/lib/toolbar/segmentation/onnx-sam-session.mjs +61 -42
- package/esm2022/lib/toolbar/segmentation/pending-calls.mjs +47 -0
- package/esm2022/lib/toolbar/segmentation/sam-model-registry.mjs +12 -4
- package/esm2022/lib/toolbar/segmentation/sam-onnx-core.mjs +70 -14
- package/esm2022/lib/toolbar/segmentation/sam-point-tool.service.mjs +135 -172
- package/esm2022/lib/toolbar/segmentation/sam-prompt.mjs +9 -90
- package/esm2022/lib/toolbar/segmentation/sam-session.service.mjs +183 -0
- package/esm2022/lib/toolbar/segmentation/sam-tool.service.mjs +95 -150
- package/esm2022/lib/toolbar/segmentation/segmentation-commit.mjs +12 -0
- package/esm2022/lib/toolbar/segmentation/segmentation-runner.mjs +108 -0
- package/esm2022/lib/toolbar/segmentation-tools/segmentation-tools.component.mjs +155 -0
- package/esm2022/lib/toolbar/stack-controls/stack-controls.component.mjs +81 -0
- package/esm2022/lib/toolbar/tool-kit/async-tool-status.mjs +37 -0
- package/esm2022/lib/toolbar/tool-kit/canvas-tool-manager.mjs +63 -0
- package/esm2022/lib/toolbar/tool-kit/canvas-tool.mjs +2 -0
- package/esm2022/lib/toolbar/tool-kit/frame-pixels.mjs +108 -0
- package/esm2022/lib/toolbar/tool-kit/mask-stroke-editor.mjs +306 -0
- package/esm2022/lib/toolbar/tool-kit/matrix-frame.mjs +61 -0
- package/esm2022/lib/toolbar/tool-kit/tool-overlay.mjs +140 -0
- package/esm2022/lib/toolbar/tool-kit/undo-gesture.mjs +24 -0
- package/esm2022/lib/toolbar/tool-slider/tool-slider.component.mjs +63 -0
- package/esm2022/lib/toolbar/toolbar-help-dialog/toolbar-help-dialog.component.mjs +50 -0
- package/esm2022/lib/toolbar/toolbar.component.mjs +68 -117
- package/esm2022/lib/toolbar/vertex-eraser/vertex-eraser-tool.service.mjs +93 -115
- package/esm2022/lib/toolbar/view-controls/view-controls.component.mjs +107 -0
- package/esm2022/lib/toolbar/wand/wand-region-grow.mjs +321 -0
- package/esm2022/lib/toolbar/wand/wand-tool.service.mjs +121 -416
- package/esm2022/lib/toolbar/wand/wand.service.mjs +30 -894
- package/esm2022/lib/toolbar/zoom-to-box/zoom-to-box-tool.service.mjs +48 -90
- package/esm2022/lib/util/mark-for-check.mjs +17 -0
- package/esm2022/lib/util/supersede.mjs +56 -0
- package/esm2022/lib/visualization.module.mjs +39 -141
- package/esm2022/lib/visualizer/floating-drag.directive.mjs +58 -0
- package/esm2022/lib/visualizer/region-actions.mjs +149 -0
- package/esm2022/lib/visualizer/region-load.mjs +60 -0
- package/esm2022/lib/visualizer/spatial-dataset-binder.mjs +163 -0
- package/esm2022/lib/visualizer/tool-modes.mjs +113 -0
- package/esm2022/lib/visualizer/viewer-shortcuts.mjs +167 -0
- package/esm2022/lib/visualizer/visualizer-context-menu.mjs +119 -0
- package/esm2022/lib/visualizer.component.mjs +480 -1902
- package/esm2022/lib/workers/spatial-math-ops.mjs +43 -0
- package/esm2022/lib/workers/spatial-math-worker.mjs +10 -0
- package/esm2022/lib/workers/spatial-math.mjs +190 -0
- package/fesm2022/jax-data-science-sci-image-visualizer-jax-data-science-sci-image-visualizer-Csxlnq7I.mjs +41083 -0
- package/fesm2022/jax-data-science-sci-image-visualizer-jax-data-science-sci-image-visualizer-Csxlnq7I.mjs.map +1 -0
- package/fesm2022/jax-data-science-sci-image-visualizer-onnx-sam-session-Bkujqg7m.mjs +238 -0
- package/fesm2022/jax-data-science-sci-image-visualizer-onnx-sam-session-Bkujqg7m.mjs.map +1 -0
- package/fesm2022/jax-data-science-sci-image-visualizer-spatial-math-worker-BzVFFqGS.mjs +12 -0
- package/fesm2022/jax-data-science-sci-image-visualizer-spatial-math-worker-BzVFFqGS.mjs.map +1 -0
- package/fesm2022/jax-data-science-sci-image-visualizer.mjs +41 -34467
- package/fesm2022/jax-data-science-sci-image-visualizer.mjs.map +1 -1
- package/fesm2022/mask.worker.js +36 -917
- package/fesm2022/onnx-sam.worker.js +52 -16
- package/fesm2022/spatial-math.worker.js +471 -0
- package/fesm2022/tsne.worker.js +32 -15
- package/index.d.ts +13 -10
- package/lib/channel-histogram/channel-histogram.component.d.ts +53 -43
- package/lib/contracts/capabilities.contract.d.ts +4 -2
- package/lib/contracts/cell-segmenter.contract.d.ts +1 -0
- package/lib/contracts/channel-histogram-api.contract.d.ts +4 -0
- package/lib/contracts/color.d.ts +27 -0
- package/lib/contracts/colormap-lut.d.ts +19 -4
- package/lib/contracts/coordinate-transform.contract.d.ts +3 -3
- package/lib/contracts/display-types.d.ts +21 -0
- package/lib/contracts/instance-segmenter.contract.d.ts +5 -0
- package/lib/contracts/intensity.d.ts +13 -2
- package/lib/contracts/plot-type.d.ts +3 -1
- package/lib/contracts/ports/image-state.port.d.ts +6 -2
- package/lib/contracts/ports/preferences.port.d.ts +4 -0
- package/lib/contracts/ports/region-io.port.d.ts +1 -0
- package/lib/contracts/ports/spatial-data.port.d.ts +4 -10
- package/lib/contracts/ports/tile-access.port.d.ts +1 -0
- package/lib/contracts/region-editor-api.contract.d.ts +1 -1
- package/lib/contracts/region-overlay.contract.d.ts +5 -0
- package/lib/contracts/sam.contract.d.ts +7 -0
- package/lib/contracts/semantic-segmenter.contract.d.ts +6 -0
- package/lib/contracts/spatial-dataset.contract.d.ts +19 -6
- package/lib/contracts/toolbar-tool.contract.d.ts +1 -0
- package/lib/contracts/visualizer.contract.d.ts +221 -54
- package/lib/contracts/viz-config.d.ts +1 -0
- package/lib/geometry/contour.d.ts +24 -0
- package/lib/geometry/raster.d.ts +42 -0
- package/lib/geometry/ring.d.ts +67 -0
- package/lib/hex-color-picker/hex-color-picker.component.d.ts +61 -27
- package/lib/implementations/base-store-visualizer.d.ts +61 -15
- package/lib/implementations/napari-js/napari-axes-gizmo.d.ts +36 -0
- package/lib/implementations/napari-js/napari-display-state.d.ts +76 -0
- package/lib/implementations/napari-js/napari-helpers.d.ts +129 -0
- package/lib/implementations/napari-js/napari-image-2d-scene.d.ts +162 -0
- package/lib/implementations/napari-js/napari-loading-badge.d.ts +0 -1
- package/lib/implementations/napari-js/napari-loading-state.d.ts +30 -0
- package/lib/implementations/napari-js/napari-region-overlay.d.ts +62 -70
- package/lib/implementations/napari-js/napari-scene.d.ts +93 -0
- package/lib/implementations/napari-js/napari-spatial-2d-scene.d.ts +163 -0
- package/lib/implementations/napari-js/napari-spatial-3d-scene.d.ts +212 -0
- package/lib/implementations/napari-js/napari-spatial-encoding.d.ts +114 -0
- package/lib/implementations/napari-js/napari-spatial-hover.d.ts +89 -0
- package/lib/implementations/napari-js/napari-spatial-scene.d.ts +118 -0
- package/lib/implementations/napari-js/napari-spatial-tiles.d.ts +56 -263
- package/lib/implementations/napari-js/napari-spatial-tooltip.d.ts +1 -1
- package/lib/implementations/napari-js/napari-surface-scene.d.ts +76 -0
- package/lib/implementations/napari-js/napari-tile-client.d.ts +214 -0
- package/lib/implementations/napari-js/napari-tool-bridge.d.ts +179 -0
- package/lib/implementations/napari-js/napari-visualizer.service.d.ts +121 -883
- package/lib/implementations/napari-js/napari-volume-scene.d.ts +104 -0
- package/lib/implementations/napari-js/napari-volume-z-handle.d.ts +8 -12
- package/lib/implementations/napari-js/region-overlay/overlay-projection.d.ts +59 -0
- package/lib/implementations/napari-js/region-overlay/region-edit.d.ts +15 -0
- package/lib/implementations/napari-js/region-overlay/region-svg-renderer.d.ts +54 -0
- package/lib/implementations/napari-js/spatial-tiles/categorical-lookup.d.ts +26 -0
- package/lib/implementations/napari-js/spatial-tiles/cell-layers.d.ts +70 -0
- package/lib/implementations/napari-js/spatial-tiles/density-layer.d.ts +61 -0
- package/lib/implementations/napari-js/spatial-tiles/layer-groups.d.ts +67 -0
- package/lib/implementations/napari-js/spatial-tiles/plan-context.d.ts +38 -0
- package/lib/implementations/napari-js/spatial-tiles/transcript-hover.d.ts +71 -0
- package/lib/implementations/napari-js/spatial-tiles/transcript-jobs.d.ts +105 -0
- package/lib/implementations/napari-js/spatial-tiles/transcript-layers.d.ts +56 -0
- package/lib/implementations/osd/display-pipeline.d.ts +38 -9
- package/lib/implementations/osd/histogram-sampler.d.ts +22 -12
- package/lib/implementations/osd/openseadragon-viewer-options.d.ts +35 -0
- package/lib/implementations/osd/openseadragon-visualizer.service.d.ts +78 -354
- package/lib/implementations/osd/osd-coordinate-transform.d.ts +2 -1
- package/lib/implementations/osd/osd-coords.d.ts +6 -4
- package/lib/implementations/osd/osd-export.d.ts +36 -0
- package/lib/implementations/osd/osd-lib.d.ts +7 -0
- package/lib/implementations/osd/osd-navigator-chrome.d.ts +69 -0
- package/lib/implementations/osd/osd-pixel-readback.d.ts +22 -0
- package/lib/implementations/osd/osd-region-overlay-draw.d.ts +37 -0
- package/lib/implementations/osd/osd-region-overlay.d.ts +36 -48
- package/lib/implementations/osd/osd-scale-bar.d.ts +8 -6
- package/lib/implementations/osd/osd-tile-source.d.ts +49 -0
- package/lib/implementations/osd/osd-viewer-like.d.ts +100 -0
- package/lib/implementations/osd/osd-viewer-mount.d.ts +14 -0
- package/lib/implementations/osd/osd-viewport.d.ts +77 -0
- package/lib/implementations/osd/osd-zoom.d.ts +6 -0
- package/lib/implementations/osd/simple-source.d.ts +161 -0
- package/lib/implementations/osd/slice-cache.d.ts +12 -3
- package/lib/implementations/osd/tile-client.d.ts +11 -14
- package/lib/implementations/osd/tile-recolor.d.ts +141 -0
- package/lib/implementations/plotly/omics-trace-builders.d.ts +32 -20
- package/lib/implementations/plotly/plotly-image-loader.d.ts +49 -0
- package/lib/implementations/plotly/plotly-image-recolor.d.ts +75 -0
- package/lib/implementations/plotly/plotly-intensity-inset.d.ts +8 -0
- package/lib/implementations/plotly/plotly-isosurface-controls.d.ts +38 -0
- package/lib/implementations/plotly/plotly-layouts.d.ts +188 -0
- package/lib/implementations/plotly/plotly-readback.d.ts +41 -0
- package/lib/implementations/plotly/plotly-region-overlay.d.ts +2 -2
- package/lib/implementations/plotly/plotly-shape-projection.d.ts +92 -0
- package/lib/implementations/plotly/plotly-trace-builders.d.ts +23 -12
- package/lib/implementations/plotly/plotly-zoom-controller.d.ts +86 -0
- package/lib/implementations/plotly/plotly.service.d.ts +136 -401
- package/lib/implementations/region-centroids.d.ts +14 -0
- package/lib/implementations/simple-slice-access.service.d.ts +7 -4
- package/lib/implementations/spatial-data-http/spatial-data-http.service.d.ts +42 -18
- package/lib/implementations/spatial-data-http/spatial-wire.d.ts +34 -9
- package/lib/implementations/tile-server/index.d.ts +5 -0
- package/lib/implementations/tile-server/native-histogram.d.ts +25 -0
- package/lib/implementations/tile-server/poll-descriptor.d.ts +39 -0
- package/lib/implementations/tile-server/tile-protocol.d.ts +80 -0
- package/lib/implementations/tile-server/transport.d.ts +62 -0
- package/lib/intensity/intensity-profile.d.ts +66 -0
- package/lib/intensity/intensity-profile.service.d.ts +108 -0
- package/lib/intensity-inset/intensity-inset.component.d.ts +58 -0
- package/lib/models/bezier.d.ts +0 -5
- package/lib/models/class-preset.d.ts +18 -0
- package/lib/models/geometry.d.ts +14 -48
- package/lib/models/polygon-edit.d.ts +72 -0
- package/lib/models/polygon-factory.d.ts +40 -0
- package/lib/models/region-clone.d.ts +20 -0
- package/lib/models/region-geojson.d.ts +17 -0
- package/lib/models/region.d.ts +40 -4
- package/lib/models/shape.d.ts +8 -0
- package/lib/plot-mode/contribution-host.d.ts +125 -0
- package/lib/plot-mode/plot-type-menu.d.ts +60 -0
- package/lib/plot-mode/tool-params-model.d.ts +49 -0
- package/lib/plot.utilities.d.ts +19 -30
- package/lib/processing/processing-image.d.ts +5 -2
- package/lib/provide-visualization.d.ts +19 -2
- package/lib/region-editor/classes-panel/classes-panel.component.d.ts +56 -0
- package/lib/region-editor/file-stem.d.ts +7 -0
- package/lib/region-editor/manage-classes-dialog/manage-classes-dialog.component.d.ts +45 -0
- package/lib/region-editor/mask-export.service.d.ts +54 -0
- package/lib/region-editor/mask-raster.d.ts +2 -8
- package/lib/region-editor/region-color-dialog/region-color-dialog.component.d.ts +29 -0
- package/lib/region-editor/region-editor-help/region-editor-help.component.d.ts +11 -0
- package/lib/region-editor/region-editor.component.d.ts +166 -199
- package/lib/region-editor/region-metrics.d.ts +26 -0
- package/lib/region-editor/region-persistence.service.d.ts +69 -0
- package/lib/region-editor/region-table/region-table.component.d.ts +83 -0
- package/lib/region-editor/save-mask-dialog/save-mask-dialog.component.d.ts +36 -0
- package/lib/region-editor/save-regions-dialog/save-regions-dialog.component.d.ts +37 -0
- package/lib/region-ops.service.d.ts +1 -7
- package/lib/region-overlay/region-geometry.d.ts +157 -0
- package/lib/region-overlay/region-hit-test.d.ts +38 -0
- package/lib/region-overlay/svg-region-renderer.d.ts +110 -0
- package/lib/render-orchestrator.d.ts +6 -2
- package/lib/render-session.d.ts +75 -0
- package/lib/routing-visualizer.service.d.ts +110 -58
- package/lib/spatial/density-raster.d.ts +6 -0
- package/lib/spatial/embedding-compute-coordinator.d.ts +123 -0
- package/lib/spatial/embedding-compute.d.ts +21 -2
- package/lib/spatial/glyphs.d.ts +16 -0
- package/lib/spatial/lod.d.ts +94 -0
- package/lib/spatial/spatial-controls.facade.d.ts +64 -0
- package/lib/spatial/spatial-density.d.ts +15 -5
- package/lib/spatial/spatial-encoding.d.ts +11 -44
- package/lib/spatial/spatial-expression.d.ts +40 -22
- package/lib/spatial/spatial-framing.d.ts +1 -0
- package/lib/spatial/spatial-heatmap.d.ts +2 -0
- package/lib/spatial/spatial-hover.d.ts +4 -16
- package/lib/spatial/spatial-panel-model.d.ts +135 -0
- package/lib/spatial/spatial-selection.d.ts +21 -26
- package/lib/spatial/spatial-tile-merge.d.ts +41 -0
- package/lib/spatial/spatial-tiles.d.ts +9 -256
- package/lib/spatial/stats.d.ts +38 -0
- package/lib/spatial/transcript-grouping.d.ts +119 -0
- package/lib/spatial-controls/spatial-cells-panel/spatial-cells-panel.component.d.ts +64 -0
- package/lib/spatial-controls/spatial-charts/chart-data-model.d.ts +153 -0
- package/lib/spatial-controls/spatial-charts/chart-help.d.ts +69 -0
- package/lib/spatial-controls/spatial-charts/plotly-chart-host.d.ts +98 -0
- package/lib/spatial-controls/spatial-charts/spatial-chart-window/spatial-chart-window.component.d.ts +26 -0
- package/lib/spatial-controls/spatial-charts/spatial-charts.component.d.ts +101 -260
- package/lib/spatial-controls/spatial-charts/spatial-embedding-controls/spatial-embedding-controls.component.d.ts +43 -0
- package/lib/spatial-controls/spatial-charts/spatial-heatmap-controls/spatial-heatmap-controls.component.d.ts +27 -0
- package/lib/spatial-controls/spatial-controls.component.d.ts +68 -448
- package/lib/spatial-controls/spatial-gene-picker.d.ts +86 -0
- package/lib/spatial-controls/spatial-gene-tree/spatial-gene-tree.component.d.ts +102 -0
- package/lib/spatial-controls/spatial-groups-panel/spatial-groups-panel.component.d.ts +72 -0
- package/lib/spatial-controls/spatial-key/spatial-key.component.d.ts +66 -0
- package/lib/spatial-controls/spatial-key/spatial-key.model.d.ts +33 -0
- package/lib/spatial-controls/spatial-marker-genes-form/spatial-marker-genes-form.component.d.ts +64 -0
- package/lib/spatial-controls/spatial-observations-panel/spatial-observations-panel.component.d.ts +117 -0
- package/lib/spatial-controls/spatial-transcripts-panel/spatial-transcripts-panel.component.d.ts +142 -0
- package/lib/store/class-color.util.d.ts +35 -1
- package/lib/store/region-history.d.ts +66 -0
- package/lib/store/region-scope-cache.d.ts +63 -0
- package/lib/store/region-selection.d.ts +36 -0
- package/lib/store/region-store.service.d.ts +104 -112
- package/lib/store/visualizer-store.service.d.ts +22 -33
- package/lib/toast-outlets.d.ts +4 -3
- package/lib/toolbar/brush/brush-tool.service.d.ts +31 -98
- package/lib/toolbar/canvas-tools.d.ts +20 -0
- package/lib/toolbar/crop/slide-crop.d.ts +10 -4
- package/lib/toolbar/plot-type-selector/plot-type-selector.component.d.ts +38 -0
- package/lib/toolbar/region-tools/region-tool-buttons.d.ts +21 -0
- package/lib/toolbar/region-tools/region-tools.component.d.ts +60 -0
- package/lib/toolbar/segmentation/cell-segment-tool.service.d.ts +10 -14
- package/lib/toolbar/segmentation/cellpose-segmenter.service.d.ts +12 -2
- package/lib/toolbar/segmentation/onnx-sam-session.d.ts +22 -3
- package/lib/toolbar/segmentation/pending-calls.d.ts +31 -0
- package/lib/toolbar/segmentation/sam-model-registry.d.ts +9 -3
- package/lib/toolbar/segmentation/sam-onnx-core.d.ts +18 -5
- package/lib/toolbar/segmentation/sam-point-tool.service.d.ts +46 -32
- package/lib/toolbar/segmentation/sam-prompt.d.ts +7 -31
- package/lib/toolbar/segmentation/sam-session.service.d.ts +74 -0
- package/lib/toolbar/segmentation/sam-tool.service.d.ts +23 -30
- package/lib/toolbar/segmentation/segmentation-commit.d.ts +8 -0
- package/lib/toolbar/segmentation/segmentation-runner.d.ts +52 -0
- package/lib/toolbar/segmentation-tools/segmentation-tools.component.d.ts +87 -0
- package/lib/toolbar/stack-controls/stack-controls.component.d.ts +40 -0
- package/lib/toolbar/tool-kit/async-tool-status.d.ts +21 -0
- package/lib/toolbar/tool-kit/canvas-tool-manager.d.ts +36 -0
- package/lib/toolbar/tool-kit/canvas-tool.d.ts +86 -0
- package/lib/toolbar/tool-kit/frame-pixels.d.ts +45 -0
- package/lib/toolbar/tool-kit/mask-stroke-editor.d.ts +125 -0
- package/lib/toolbar/tool-kit/matrix-frame.d.ts +40 -0
- package/lib/toolbar/tool-kit/tool-overlay.d.ts +60 -0
- package/lib/toolbar/tool-kit/undo-gesture.d.ts +17 -0
- package/lib/toolbar/tool-slider/tool-slider.component.d.ts +33 -0
- package/lib/toolbar/toolbar-help-dialog/toolbar-help-dialog.component.d.ts +24 -0
- package/lib/toolbar/toolbar.component.d.ts +47 -83
- package/lib/toolbar/vertex-eraser/vertex-eraser-tool.service.d.ts +33 -40
- package/lib/toolbar/view-controls/view-controls.component.d.ts +54 -0
- package/lib/toolbar/wand/wand-region-grow.d.ts +49 -0
- package/lib/toolbar/wand/wand-tool.service.d.ts +39 -124
- package/lib/toolbar/wand/wand.service.d.ts +22 -116
- package/lib/toolbar/zoom-to-box/zoom-to-box-tool.service.d.ts +17 -37
- package/lib/util/mark-for-check.d.ts +11 -0
- package/lib/util/supersede.d.ts +53 -0
- package/lib/visualization.module.d.ts +18 -39
- package/lib/visualizer/floating-drag.directive.d.ts +30 -0
- package/lib/visualizer/region-actions.d.ts +54 -0
- package/lib/visualizer/region-load.d.ts +27 -0
- package/lib/visualizer/spatial-dataset-binder.d.ts +74 -0
- package/lib/visualizer/tool-modes.d.ts +49 -0
- package/lib/visualizer/viewer-shortcuts.d.ts +71 -0
- package/lib/visualizer/visualizer-context-menu.d.ts +55 -0
- package/lib/visualizer.component.d.ts +201 -447
- package/lib/workers/spatial-math-ops.d.ts +65 -0
- package/lib/workers/spatial-math-worker.d.ts +7 -0
- package/lib/workers/spatial-math.d.ts +74 -0
- package/package.json +12 -3
- package/src/lib/styles/_viz-icons-rules.scss +73 -0
- package/src/lib/styles/viz-icons.scss +14 -0
- package/esm2022/lib/implementations/napari-js/napari-axes-labels.mjs +0 -97
- package/esm2022/lib/implementations/napari-js/napari-navigator.mjs +0 -195
- package/esm2022/lib/implementations/napari-js/napari-scale-bar.mjs +0 -92
- package/fesm2022/jax-data-science-sci-image-visualizer-onnx-sam-session-BwP-A11m.mjs +0 -329
- package/fesm2022/jax-data-science-sci-image-visualizer-onnx-sam-session-BwP-A11m.mjs.map +0 -1
- package/lib/implementations/napari-js/napari-axes-labels.d.ts +0 -49
- package/lib/implementations/napari-js/napari-navigator.d.ts +0 -72
- package/lib/implementations/napari-js/napari-scale-bar.d.ts +0 -35
- package/src/lib/assets/cell-detection.svg +0 -37
- package/src/lib/assets/click.svg +0 -1
- package/src/lib/assets/colormap-luts.json +0 -1
- package/src/lib/assets/edit-selection-white.svg +0 -47
- package/src/lib/assets/icons/colormap-earth.png +0 -0
- package/src/lib/assets/icons/colormap-placeholder.png +0 -0
- package/src/lib/assets/icons/colormap-pubu.png +0 -0
- package/src/lib/assets/interactive-segmentation-cursor.svg +0 -1
- package/src/lib/assets/picture-segmentation.svg +0 -43
- package/src/lib/assets/test/download-379.svg +0 -1
- package/src/lib/assets/test/download-98.svg +0 -1
- package/src/lib/assets/test/json-1.svg +0 -1
- package/src/lib/assets/test/load-53.svg +0 -1
- package/src/lib/assets/test/mask-44.svg +0 -1
- package/src/lib/assets/test/mask-download-44.svg +0 -15
- package/src/lib/assets/test/mask-save-44.svg +0 -11
- package/src/lib/assets/test/overlay-1.svg +0 -1
- package/src/lib/assets/test/overlay-4.svg +0 -1
- package/src/lib/assets/test/region-26.svg +0 -1
- package/src/lib/assets/test/save-56.svg +0 -1
- package/src/lib/assets/test/upload-43.svg +0 -1
|
@@ -0,0 +1,165 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Bottom to top: cell fill, cell outline, nucleus outline, the transcript density, then the
|
|
3
|
+
* transcripts. The density goes OVER the service's observation markers on purpose: under 10^5
|
|
4
|
+
* dots it would only show in the gaps between cells.
|
|
5
|
+
*/
|
|
6
|
+
export const TILE_LAYER_ORDER = [
|
|
7
|
+
'cellFill',
|
|
8
|
+
'cellOutline',
|
|
9
|
+
'nucleusOutline',
|
|
10
|
+
'density',
|
|
11
|
+
'transcripts',
|
|
12
|
+
];
|
|
13
|
+
/**
|
|
14
|
+
* One napari-js layer per named group, kept in a fixed bottom-to-top order, plus what each
|
|
15
|
+
* group currently shows (its key), so an unchanged plan is a no-op.
|
|
16
|
+
*
|
|
17
|
+
* Order is kept with `LayerList.move`, which restacks a layer without disposing its GPU visual
|
|
18
|
+
* (a remove + re-add would re-upload its whole buffer, review NAPARI-BOUNDARY-11). A plan still
|
|
19
|
+
* restores the order once, after all its groups are in place, and moves only the layers that
|
|
20
|
+
* are out of place ({@link restoreOrder}).
|
|
21
|
+
*/
|
|
22
|
+
export class OrderedLayerGroups {
|
|
23
|
+
constructor(order) {
|
|
24
|
+
this.order = order;
|
|
25
|
+
this.current = null;
|
|
26
|
+
this.layers = new Map();
|
|
27
|
+
/** What each group currently shows, so an unchanged plan is a no-op. */
|
|
28
|
+
this.keys = new Map();
|
|
29
|
+
}
|
|
30
|
+
/** The viewer the groups are drawn into, while attached. */
|
|
31
|
+
get viewer() {
|
|
32
|
+
return this.current;
|
|
33
|
+
}
|
|
34
|
+
attach(viewer) {
|
|
35
|
+
this.current = viewer;
|
|
36
|
+
}
|
|
37
|
+
/** Remove every group's layer from the viewer and forget the layers, keys and viewer. */
|
|
38
|
+
detach() {
|
|
39
|
+
if (this.current) {
|
|
40
|
+
for (const layer of this.layers.values()) {
|
|
41
|
+
if (this.current.layers.items.includes(layer))
|
|
42
|
+
this.current.layers.remove(layer);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
this.layers.clear();
|
|
46
|
+
this.keys.clear();
|
|
47
|
+
this.current = null;
|
|
48
|
+
}
|
|
49
|
+
/** Whether `group` has a layer (on screen or not). */
|
|
50
|
+
has(group) {
|
|
51
|
+
return this.layers.has(group);
|
|
52
|
+
}
|
|
53
|
+
/** `group`'s layer (on screen or not), if it has one. */
|
|
54
|
+
layer(group) {
|
|
55
|
+
return this.layers.get(group);
|
|
56
|
+
}
|
|
57
|
+
/** Whether `group`'s layer is in the viewer now. */
|
|
58
|
+
shown(group) {
|
|
59
|
+
const layer = this.layers.get(group);
|
|
60
|
+
return !!layer && !!this.current?.layers.items.includes(layer);
|
|
61
|
+
}
|
|
62
|
+
/** What `group` currently shows, as its plan keyed it. */
|
|
63
|
+
key(group) {
|
|
64
|
+
return this.keys.get(group);
|
|
65
|
+
}
|
|
66
|
+
setKey(group, key) {
|
|
67
|
+
this.keys.set(group, key);
|
|
68
|
+
}
|
|
69
|
+
/** Forget what `group` shows, so the next plan redraws it. */
|
|
70
|
+
forgetKey(group) {
|
|
71
|
+
this.keys.delete(group);
|
|
72
|
+
}
|
|
73
|
+
/** Whether `layer` is one of the groups' layers. */
|
|
74
|
+
owns(layer) {
|
|
75
|
+
for (const l of this.layers.values())
|
|
76
|
+
if (l === layer)
|
|
77
|
+
return true;
|
|
78
|
+
return false;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Put a shapes layer in place for `group`: a geometry change builds a new layer, a
|
|
82
|
+
* colour-only change mutates the per-shape colours or values/colormap of the existing one.
|
|
83
|
+
*/
|
|
84
|
+
upsertShapes(group, wanted, geometryChanged, rings, opts) {
|
|
85
|
+
if (!wanted) {
|
|
86
|
+
this.drop(group);
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
const existing = this.layers.get(group);
|
|
90
|
+
if (existing && !geometryChanged && this.current.layers.items.includes(existing)) {
|
|
91
|
+
// Per-shape colours win over values; clearing them hands the layer back to values/colormap.
|
|
92
|
+
existing.faceColor = opts.faceColor ?? null;
|
|
93
|
+
// Flat colour has no values; clearing them is what switches the layer to `color`.
|
|
94
|
+
existing.values = opts.values ?? null;
|
|
95
|
+
if (opts.colormap)
|
|
96
|
+
existing.colormap = opts.colormap;
|
|
97
|
+
if (opts.contrastLimits)
|
|
98
|
+
existing.contrastLimits = opts.contrastLimits;
|
|
99
|
+
if (opts.color)
|
|
100
|
+
existing.color = opts.color;
|
|
101
|
+
if (opts.opacity !== undefined)
|
|
102
|
+
existing.opacity = opts.opacity;
|
|
103
|
+
this.current.requestRender();
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
const layer = this.current.addShapes(rings.coords, rings.offsets, opts);
|
|
107
|
+
this.replace(group, layer);
|
|
108
|
+
}
|
|
109
|
+
/**
|
|
110
|
+
* Install `layer` as `group`'s layer. The layer was just added by the caller, so it is on
|
|
111
|
+
* top: the plan puts the groups that belong above it back in place once it is done
|
|
112
|
+
* ({@link restoreOrder}), rather than after every replaced group.
|
|
113
|
+
*/
|
|
114
|
+
replace(group, layer) {
|
|
115
|
+
const v = this.current;
|
|
116
|
+
const old = this.layers.get(group);
|
|
117
|
+
if (old && old !== layer && v.layers.items.includes(old))
|
|
118
|
+
v.layers.remove(old);
|
|
119
|
+
this.layers.set(group, layer);
|
|
120
|
+
v.requestRender();
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Put the groups' layers in order, moving to the top only from the first one out of place
|
|
124
|
+
* (and, with `aboveOthers`, the first one under a layer that is not ours — the service's
|
|
125
|
+
* markers). Everything before that is already where it belongs. A move keeps each layer
|
|
126
|
+
* mounted (no `removed`/`added`), so nothing is re-uploaded.
|
|
127
|
+
*/
|
|
128
|
+
restoreOrder(aboveOthers) {
|
|
129
|
+
const v = this.current;
|
|
130
|
+
if (!v)
|
|
131
|
+
return;
|
|
132
|
+
const items = v.layers.items;
|
|
133
|
+
const wanted = this.order.map((g) => this.layers.get(g)).filter((l) => !!l && items.includes(l));
|
|
134
|
+
const ours = new Set(wanted);
|
|
135
|
+
let lastOther = -1;
|
|
136
|
+
if (aboveOthers)
|
|
137
|
+
items.forEach((l, i) => {
|
|
138
|
+
if (!ours.has(l))
|
|
139
|
+
lastOther = i;
|
|
140
|
+
});
|
|
141
|
+
const current = items.filter((l) => ours.has(l));
|
|
142
|
+
let k = 0;
|
|
143
|
+
while (k < wanted.length && current[k] === wanted[k] && items.indexOf(wanted[k]) > lastOther)
|
|
144
|
+
k++;
|
|
145
|
+
if (k === wanted.length)
|
|
146
|
+
return;
|
|
147
|
+
for (const layer of wanted.slice(k))
|
|
148
|
+
v.layers.move(layer, items.length - 1);
|
|
149
|
+
v.requestRender();
|
|
150
|
+
}
|
|
151
|
+
/** Remove `group`'s layer and forget its key. */
|
|
152
|
+
drop(group) {
|
|
153
|
+
const layer = this.layers.get(group);
|
|
154
|
+
if (layer && this.current?.layers.items.includes(layer))
|
|
155
|
+
this.current.layers.remove(layer);
|
|
156
|
+
this.layers.delete(group);
|
|
157
|
+
this.keys.delete(group);
|
|
158
|
+
}
|
|
159
|
+
/** Drop every group. */
|
|
160
|
+
dropAll() {
|
|
161
|
+
for (const g of this.order)
|
|
162
|
+
this.drop(g);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"layer-groups.js","sourceRoot":"","sources":["../../../../../../src/lib/implementations/napari-js/spatial-tiles/layer-groups.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Layer, ShapesLayer, Viewer } from 'napari-js';\n\nimport type { SpatialPolygons } from '../../../contracts/spatial-dataset.contract';\n\n/** The layer groups of the 2D spatial tile view. */\nexport type TileGroup = 'density' | 'cellFill' | 'cellOutline' | 'nucleusOutline' | 'transcripts';\n\n/**\n * Bottom to top: cell fill, cell outline, nucleus outline, the transcript density, then the\n * transcripts. The density goes OVER the service's observation markers on purpose: under 10^5\n * dots it would only show in the gaps between cells.\n */\nexport const TILE_LAYER_ORDER: readonly TileGroup[] = [\n  'cellFill',\n  'cellOutline',\n  'nucleusOutline',\n  'density',\n  'transcripts',\n];\n\n/**\n * One napari-js layer per named group, kept in a fixed bottom-to-top order, plus what each\n * group currently shows (its key), so an unchanged plan is a no-op.\n *\n * Order is kept with `LayerList.move`, which restacks a layer without disposing its GPU visual\n * (a remove + re-add would re-upload its whole buffer, review NAPARI-BOUNDARY-11). A plan still\n * restores the order once, after all its groups are in place, and moves only the layers that\n * are out of place ({@link restoreOrder}).\n */\nexport class OrderedLayerGroups<G extends string> {\n  private current: Viewer | null = null;\n  private readonly layers = new Map<G, Layer>();\n  /** What each group currently shows, so an unchanged plan is a no-op. */\n  private readonly keys = new Map<G, string>();\n\n  constructor(private readonly order: readonly G[]) {}\n\n  /** The viewer the groups are drawn into, while attached. */\n  get viewer(): Viewer | null {\n    return this.current;\n  }\n\n  attach(viewer: Viewer): void {\n    this.current = viewer;\n  }\n\n  /** Remove every group's layer from the viewer and forget the layers, keys and viewer. */\n  detach(): void {\n    if (this.current) {\n      for (const layer of this.layers.values()) {\n        if (this.current.layers.items.includes(layer)) this.current.layers.remove(layer);\n      }\n    }\n    this.layers.clear();\n    this.keys.clear();\n    this.current = null;\n  }\n\n  /** Whether `group` has a layer (on screen or not). */\n  has(group: G): boolean {\n    return this.layers.has(group);\n  }\n\n  /** `group`'s layer (on screen or not), if it has one. */\n  layer(group: G): Layer | undefined {\n    return this.layers.get(group);\n  }\n\n  /** Whether `group`'s layer is in the viewer now. */\n  shown(group: G): boolean {\n    const layer = this.layers.get(group);\n    return !!layer && !!this.current?.layers.items.includes(layer);\n  }\n\n  /** What `group` currently shows, as its plan keyed it. */\n  key(group: G): string | undefined {\n    return this.keys.get(group);\n  }\n\n  setKey(group: G, key: string): void {\n    this.keys.set(group, key);\n  }\n\n  /** Forget what `group` shows, so the next plan redraws it. */\n  forgetKey(group: G): void {\n    this.keys.delete(group);\n  }\n\n  /** Whether `layer` is one of the groups' layers. */\n  owns(layer: Layer): boolean {\n    for (const l of this.layers.values()) if (l === layer) return true;\n    return false;\n  }\n\n  /**\n   * Put a shapes layer in place for `group`: a geometry change builds a new layer, a\n   * colour-only change mutates the per-shape colours or values/colormap of the existing one.\n   */\n  upsertShapes(\n    group: G,\n    wanted: boolean,\n    geometryChanged: boolean,\n    rings: SpatialPolygons,\n    opts: Parameters<Viewer['addShapes']>[2] & object,\n  ): void {\n    if (!wanted) {\n      this.drop(group);\n      return;\n    }\n    const existing = this.layers.get(group) as ShapesLayer | undefined;\n    if (existing && !geometryChanged && this.current!.layers.items.includes(existing)) {\n      // Per-shape colours win over values; clearing them hands the layer back to values/colormap.\n      existing.faceColor = opts.faceColor ?? null;\n      // Flat colour has no values; clearing them is what switches the layer to `color`.\n      existing.values = opts.values ?? null;\n      if (opts.colormap) existing.colormap = opts.colormap;\n      if (opts.contrastLimits) existing.contrastLimits = opts.contrastLimits;\n      if (opts.color) existing.color = opts.color;\n      if (opts.opacity !== undefined) existing.opacity = opts.opacity;\n      this.current!.requestRender();\n      return;\n    }\n    const layer = this.current!.addShapes(rings.coords, rings.offsets, opts);\n    this.replace(group, layer);\n  }\n\n  /**\n   * Install `layer` as `group`'s layer. The layer was just added by the caller, so it is on\n   * top: the plan puts the groups that belong above it back in place once it is done\n   * ({@link restoreOrder}), rather than after every replaced group.\n   */\n  replace(group: G, layer: Layer): void {\n    const v = this.current!;\n    const old = this.layers.get(group);\n    if (old && old !== layer && v.layers.items.includes(old)) v.layers.remove(old);\n    this.layers.set(group, layer);\n    v.requestRender();\n  }\n\n  /**\n   * Put the groups' layers in order, moving to the top only from the first one out of place\n   * (and, with `aboveOthers`, the first one under a layer that is not ours — the service's\n   * markers). Everything before that is already where it belongs. A move keeps each layer\n   * mounted (no `removed`/`added`), so nothing is re-uploaded.\n   */\n  restoreOrder(aboveOthers: boolean): void {\n    const v = this.current;\n    if (!v) return;\n    const items = v.layers.items;\n    const wanted = this.order.map((g) => this.layers.get(g)).filter((l): l is Layer => !!l && items.includes(l));\n    const ours = new Set<Layer>(wanted);\n    let lastOther = -1;\n    if (aboveOthers)\n      items.forEach((l, i) => {\n        if (!ours.has(l)) lastOther = i;\n      });\n    const current = items.filter((l) => ours.has(l));\n    let k = 0;\n    while (k < wanted.length && current[k] === wanted[k] && items.indexOf(wanted[k]) > lastOther) k++;\n    if (k === wanted.length) return;\n    for (const layer of wanted.slice(k)) v.layers.move(layer, items.length - 1);\n    v.requestRender();\n  }\n\n  /** Remove `group`'s layer and forget its key. */\n  drop(group: G): void {\n    const layer = this.layers.get(group);\n    if (layer && this.current?.layers.items.includes(layer)) this.current.layers.remove(layer);\n    this.layers.delete(group);\n    this.keys.delete(group);\n  }\n\n  /** Drop every group. */\n  dropAll(): void {\n    for (const g of this.order) this.drop(g);\n  }\n}\n"]}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Loads in flight, per layer label ("Transcripts", "Cells"…), for the canvas loading badge.
|
|
3
|
+
* Shared by every plan: a label stays reported while any plan still loads it.
|
|
4
|
+
*/
|
|
5
|
+
export class LoadTracker {
|
|
6
|
+
constructor(changed) {
|
|
7
|
+
this.changed = changed;
|
|
8
|
+
this.loading = new Map();
|
|
9
|
+
}
|
|
10
|
+
/** Report `label` loading while `work` is in flight. */
|
|
11
|
+
async track(label, work) {
|
|
12
|
+
this.loading.set(label, (this.loading.get(label) ?? 0) + 1);
|
|
13
|
+
this.changed([...this.loading.keys()]);
|
|
14
|
+
try {
|
|
15
|
+
return await work;
|
|
16
|
+
}
|
|
17
|
+
finally {
|
|
18
|
+
const n = (this.loading.get(label) ?? 1) - 1;
|
|
19
|
+
if (n > 0)
|
|
20
|
+
this.loading.set(label, n);
|
|
21
|
+
else
|
|
22
|
+
this.loading.delete(label);
|
|
23
|
+
this.changed([...this.loading.keys()]);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
/** Forget every load (the viewer went away) and report none. */
|
|
27
|
+
clear() {
|
|
28
|
+
this.loading.clear();
|
|
29
|
+
this.changed([]);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* One run of `NapariSpatialTileLayers.plan()`. Completeness belongs to the run that did the
|
|
34
|
+
* fetching: on the instance, a superseded run's failed tile marked the CURRENT run incomplete,
|
|
35
|
+
* which then skipped caching its keys and retried for nothing (review NAPARI-BOUNDARY-9).
|
|
36
|
+
*/
|
|
37
|
+
export class PlanContext {
|
|
38
|
+
/** `isStale` turns true once a newer plan started or the viewer changed. */
|
|
39
|
+
constructor(isStale, loads) {
|
|
40
|
+
this.isStale = isStale;
|
|
41
|
+
this.loads = loads;
|
|
42
|
+
this.failed = false;
|
|
43
|
+
}
|
|
44
|
+
/** True once a newer plan started or the viewer changed. */
|
|
45
|
+
stale() {
|
|
46
|
+
return this.isStale();
|
|
47
|
+
}
|
|
48
|
+
/** Set when a fetch of this run failed (see fetchAll): don't cache it as done; retry. */
|
|
49
|
+
get incomplete() {
|
|
50
|
+
return this.failed;
|
|
51
|
+
}
|
|
52
|
+
/** A request of this run failed: what it drew must not be cached as done. */
|
|
53
|
+
markIncomplete() {
|
|
54
|
+
this.failed = true;
|
|
55
|
+
}
|
|
56
|
+
/** Report `label` loading while `work` is in flight. */
|
|
57
|
+
track(label, work) {
|
|
58
|
+
return this.loads.track(label, work);
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Fetch every tile, drawing what arrived. A failure does not fail the view, but it marks this
|
|
62
|
+
* run incomplete: the caller must not cache it as done, and `plan()` retries it.
|
|
63
|
+
*/
|
|
64
|
+
async fetchAll(keys, load) {
|
|
65
|
+
const settled = await Promise.allSettled(keys.map(load));
|
|
66
|
+
const out = [];
|
|
67
|
+
for (const s of settled) {
|
|
68
|
+
if (s.status === 'fulfilled')
|
|
69
|
+
out.push(s.value);
|
|
70
|
+
else
|
|
71
|
+
console.warn('[napari-js] spatial tile failed', s.reason);
|
|
72
|
+
}
|
|
73
|
+
if (out.length < keys.length)
|
|
74
|
+
this.markIncomplete();
|
|
75
|
+
return out;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhbi1jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2xpYi9pbXBsZW1lbnRhdGlvbnMvbmFwYXJpLWpzL3NwYXRpYWwtdGlsZXMvcGxhbi1jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUNILE1BQU0sT0FBTyxXQUFXO0lBR3RCLFlBQTZCLE9BQW1DO1FBQW5DLFlBQU8sR0FBUCxPQUFPLENBQTRCO1FBRi9DLFlBQU8sR0FBRyxJQUFJLEdBQUcsRUFBa0IsQ0FBQztJQUVjLENBQUM7SUFFcEUsd0RBQXdEO0lBQ3hELEtBQUssQ0FBQyxLQUFLLENBQUksS0FBYSxFQUFFLElBQWdCO1FBQzVDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQzVELElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3ZDLElBQUksQ0FBQztZQUNILE9BQU8sTUFBTSxJQUFJLENBQUM7UUFDcEIsQ0FBQztnQkFBUyxDQUFDO1lBQ1QsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDN0MsSUFBSSxDQUFDLEdBQUcsQ0FBQztnQkFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUM7O2dCQUNqQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNoQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztRQUN6QyxDQUFDO0lBQ0gsQ0FBQztJQUVELGdFQUFnRTtJQUNoRSxLQUFLO1FBQ0gsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNyQixJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ25CLENBQUM7Q0FDRjtBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLE9BQU8sV0FBVztJQUd0Qiw0RUFBNEU7SUFDNUUsWUFDbUIsT0FBc0IsRUFDdEIsS0FBa0I7UUFEbEIsWUFBTyxHQUFQLE9BQU8sQ0FBZTtRQUN0QixVQUFLLEdBQUwsS0FBSyxDQUFhO1FBTDdCLFdBQU0sR0FBRyxLQUFLLENBQUM7SUFNcEIsQ0FBQztJQUVKLDREQUE0RDtJQUM1RCxLQUFLO1FBQ0gsT0FBTyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDeEIsQ0FBQztJQUVELHlGQUF5RjtJQUN6RixJQUFJLFVBQVU7UUFDWixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDckIsQ0FBQztJQUVELDZFQUE2RTtJQUM3RSxjQUFjO1FBQ1osSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUM7SUFDckIsQ0FBQztJQUVELHdEQUF3RDtJQUN4RCxLQUFLLENBQUksS0FBYSxFQUFFLElBQWdCO1FBQ3RDLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFFRDs7O09BR0c7SUFDSCxLQUFLLENBQUMsUUFBUSxDQUFPLElBQVMsRUFBRSxJQUEwQjtRQUN4RCxNQUFNLE9BQU8sR0FBRyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBQ3pELE1BQU0sR0FBRyxHQUFRLEVBQUUsQ0FBQztRQUNwQixLQUFLLE1BQU0sQ0FBQyxJQUFJLE9BQU8sRUFBRSxDQUFDO1lBQ3hCLElBQUksQ0FBQyxDQUFDLE1BQU0sS0FBSyxXQUFXO2dCQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDOztnQkFDM0MsT0FBTyxDQUFDLElBQUksQ0FBQyxpQ0FBaUMsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDakUsQ0FBQztRQUNELElBQUksR0FBRyxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTTtZQUFFLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUNwRCxPQUFPLEdBQUcsQ0FBQztJQUNiLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogTG9hZHMgaW4gZmxpZ2h0LCBwZXIgbGF5ZXIgbGFiZWwgKFwiVHJhbnNjcmlwdHNcIiwgXCJDZWxsc1wi4oCmKSwgZm9yIHRoZSBjYW52YXMgbG9hZGluZyBiYWRnZS5cbiAqIFNoYXJlZCBieSBldmVyeSBwbGFuOiBhIGxhYmVsIHN0YXlzIHJlcG9ydGVkIHdoaWxlIGFueSBwbGFuIHN0aWxsIGxvYWRzIGl0LlxuICovXG5leHBvcnQgY2xhc3MgTG9hZFRyYWNrZXIge1xuICBwcml2YXRlIHJlYWRvbmx5IGxvYWRpbmcgPSBuZXcgTWFwPHN0cmluZywgbnVtYmVyPigpO1xuXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVhZG9ubHkgY2hhbmdlZDogKGxhYmVsczogc3RyaW5nW10pID0+IHZvaWQpIHt9XG5cbiAgLyoqIFJlcG9ydCBgbGFiZWxgIGxvYWRpbmcgd2hpbGUgYHdvcmtgIGlzIGluIGZsaWdodC4gKi9cbiAgYXN5bmMgdHJhY2s8VD4obGFiZWw6IHN0cmluZywgd29yazogUHJvbWlzZTxUPik6IFByb21pc2U8VD4ge1xuICAgIHRoaXMubG9hZGluZy5zZXQobGFiZWwsICh0aGlzLmxvYWRpbmcuZ2V0KGxhYmVsKSA/PyAwKSArIDEpO1xuICAgIHRoaXMuY2hhbmdlZChbLi4udGhpcy5sb2FkaW5nLmtleXMoKV0pO1xuICAgIHRyeSB7XG4gICAgICByZXR1cm4gYXdhaXQgd29yaztcbiAgICB9IGZpbmFsbHkge1xuICAgICAgY29uc3QgbiA9ICh0aGlzLmxvYWRpbmcuZ2V0KGxhYmVsKSA/PyAxKSAtIDE7XG4gICAgICBpZiAobiA+IDApIHRoaXMubG9hZGluZy5zZXQobGFiZWwsIG4pO1xuICAgICAgZWxzZSB0aGlzLmxvYWRpbmcuZGVsZXRlKGxhYmVsKTtcbiAgICAgIHRoaXMuY2hhbmdlZChbLi4udGhpcy5sb2FkaW5nLmtleXMoKV0pO1xuICAgIH1cbiAgfVxuXG4gIC8qKiBGb3JnZXQgZXZlcnkgbG9hZCAodGhlIHZpZXdlciB3ZW50IGF3YXkpIGFuZCByZXBvcnQgbm9uZS4gKi9cbiAgY2xlYXIoKTogdm9pZCB7XG4gICAgdGhpcy5sb2FkaW5nLmNsZWFyKCk7XG4gICAgdGhpcy5jaGFuZ2VkKFtdKTtcbiAgfVxufVxuXG4vKipcbiAqIE9uZSBydW4gb2YgYE5hcGFyaVNwYXRpYWxUaWxlTGF5ZXJzLnBsYW4oKWAuIENvbXBsZXRlbmVzcyBiZWxvbmdzIHRvIHRoZSBydW4gdGhhdCBkaWQgdGhlXG4gKiBmZXRjaGluZzogb24gdGhlIGluc3RhbmNlLCBhIHN1cGVyc2VkZWQgcnVuJ3MgZmFpbGVkIHRpbGUgbWFya2VkIHRoZSBDVVJSRU5UIHJ1biBpbmNvbXBsZXRlLFxuICogd2hpY2ggdGhlbiBza2lwcGVkIGNhY2hpbmcgaXRzIGtleXMgYW5kIHJldHJpZWQgZm9yIG5vdGhpbmcgKHJldmlldyBOQVBBUkktQk9VTkRBUlktOSkuXG4gKi9cbmV4cG9ydCBjbGFzcyBQbGFuQ29udGV4dCB7XG4gIHByaXZhdGUgZmFpbGVkID0gZmFsc2U7XG5cbiAgLyoqIGBpc1N0YWxlYCB0dXJucyB0cnVlIG9uY2UgYSBuZXdlciBwbGFuIHN0YXJ0ZWQgb3IgdGhlIHZpZXdlciBjaGFuZ2VkLiAqL1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIHJlYWRvbmx5IGlzU3RhbGU6ICgpID0+IGJvb2xlYW4sXG4gICAgcHJpdmF0ZSByZWFkb25seSBsb2FkczogTG9hZFRyYWNrZXIsXG4gICkge31cblxuICAvKiogVHJ1ZSBvbmNlIGEgbmV3ZXIgcGxhbiBzdGFydGVkIG9yIHRoZSB2aWV3ZXIgY2hhbmdlZC4gKi9cbiAgc3RhbGUoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuIHRoaXMuaXNTdGFsZSgpO1xuICB9XG5cbiAgLyoqIFNldCB3aGVuIGEgZmV0Y2ggb2YgdGhpcyBydW4gZmFpbGVkIChzZWUgZmV0Y2hBbGwpOiBkb24ndCBjYWNoZSBpdCBhcyBkb25lOyByZXRyeS4gKi9cbiAgZ2V0IGluY29tcGxldGUoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuIHRoaXMuZmFpbGVkO1xuICB9XG5cbiAgLyoqIEEgcmVxdWVzdCBvZiB0aGlzIHJ1biBmYWlsZWQ6IHdoYXQgaXQgZHJldyBtdXN0IG5vdCBiZSBjYWNoZWQgYXMgZG9uZS4gKi9cbiAgbWFya0luY29tcGxldGUoKTogdm9pZCB7XG4gICAgdGhpcy5mYWlsZWQgPSB0cnVlO1xuICB9XG5cbiAgLyoqIFJlcG9ydCBgbGFiZWxgIGxvYWRpbmcgd2hpbGUgYHdvcmtgIGlzIGluIGZsaWdodC4gKi9cbiAgdHJhY2s8VD4obGFiZWw6IHN0cmluZywgd29yazogUHJvbWlzZTxUPik6IFByb21pc2U8VD4ge1xuICAgIHJldHVybiB0aGlzLmxvYWRzLnRyYWNrKGxhYmVsLCB3b3JrKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBGZXRjaCBldmVyeSB0aWxlLCBkcmF3aW5nIHdoYXQgYXJyaXZlZC4gQSBmYWlsdXJlIGRvZXMgbm90IGZhaWwgdGhlIHZpZXcsIGJ1dCBpdCBtYXJrcyB0aGlzXG4gICAqIHJ1biBpbmNvbXBsZXRlOiB0aGUgY2FsbGVyIG11c3Qgbm90IGNhY2hlIGl0IGFzIGRvbmUsIGFuZCBgcGxhbigpYCByZXRyaWVzIGl0LlxuICAgKi9cbiAgYXN5bmMgZmV0Y2hBbGw8SywgVD4oa2V5czogS1tdLCBsb2FkOiAoazogSykgPT4gUHJvbWlzZTxUPik6IFByb21pc2U8VFtdPiB7XG4gICAgY29uc3Qgc2V0dGxlZCA9IGF3YWl0IFByb21pc2UuYWxsU2V0dGxlZChrZXlzLm1hcChsb2FkKSk7XG4gICAgY29uc3Qgb3V0OiBUW10gPSBbXTtcbiAgICBmb3IgKGNvbnN0IHMgb2Ygc2V0dGxlZCkge1xuICAgICAgaWYgKHMuc3RhdHVzID09PSAnZnVsZmlsbGVkJykgb3V0LnB1c2gocy52YWx1ZSk7XG4gICAgICBlbHNlIGNvbnNvbGUud2FybignW25hcGFyaS1qc10gc3BhdGlhbCB0aWxlIGZhaWxlZCcsIHMucmVhc29uKTtcbiAgICB9XG4gICAgaWYgKG91dC5sZW5ndGggPCBrZXlzLmxlbmd0aCkgdGhpcy5tYXJrSW5jb21wbGV0ZSgpO1xuICAgIHJldHVybiBvdXQ7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
import { NO_CATEGORY, NO_OBSERVATION, } from '../../../contracts/spatial-dataset.contract';
|
|
2
|
+
/**
|
|
3
|
+
* Tooltips for the transcript markers of the 2D spatial view.
|
|
4
|
+
*
|
|
5
|
+
* Reads only what the transcript layer last drew — handed over one way through
|
|
6
|
+
* {@link setDrawn} / {@link setTypes} — and asks the server for the slower details (distinct
|
|
7
|
+
* genes in a group, its top genes and cells, the cell's display id) once the pointer has
|
|
8
|
+
* rested on a marker, caching them until the next draw.
|
|
9
|
+
*/
|
|
10
|
+
export class TranscriptHover {
|
|
11
|
+
/** `layerShown` says whether the transcript layer is on screen now (it may have been dropped). */
|
|
12
|
+
constructor(port, layerShown) {
|
|
13
|
+
this.port = port;
|
|
14
|
+
this.layerShown = layerShown;
|
|
15
|
+
/** What the transcript layer currently shows (written by drawing, read by hover). */
|
|
16
|
+
this.drawn = null;
|
|
17
|
+
/** The cell-type column, to name the cell a marker is in. */
|
|
18
|
+
this.types = null;
|
|
19
|
+
/** µm per observation unit of the drawn dataset, for describing a grouped marker's area. */
|
|
20
|
+
this.micronsPerUnit = null;
|
|
21
|
+
/** Details already fetched, by hovered entry. */
|
|
22
|
+
this.cache = new Map();
|
|
23
|
+
this.key = null;
|
|
24
|
+
this.timer = null;
|
|
25
|
+
}
|
|
26
|
+
/** The transcript layer was redrawn: hover names these entries now (cached details are dropped). */
|
|
27
|
+
setDrawn(drawn, micronsPerUnit) {
|
|
28
|
+
this.drawn = drawn;
|
|
29
|
+
this.cache.clear();
|
|
30
|
+
this.micronsPerUnit = micronsPerUnit;
|
|
31
|
+
}
|
|
32
|
+
/** The cell-type column the drawn entries' cells are named by, or null. */
|
|
33
|
+
setTypes(types) {
|
|
34
|
+
this.types = types;
|
|
35
|
+
}
|
|
36
|
+
/** Nothing is drawn any more. */
|
|
37
|
+
clear() {
|
|
38
|
+
this.drawn = null;
|
|
39
|
+
}
|
|
40
|
+
/** Stop a pending details request and forget what was drawn. */
|
|
41
|
+
dispose() {
|
|
42
|
+
if (this.timer)
|
|
43
|
+
clearTimeout(this.timer);
|
|
44
|
+
this.timer = null;
|
|
45
|
+
this.drawn = null;
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Tooltip lines for the transcript marker under world point `(wx, wy)`, or null.
|
|
49
|
+
*
|
|
50
|
+
* The marker is napari-js's pick on the drawn layer: hit anywhere on it, or within
|
|
51
|
+
* `radiusWorld` of its centre when it is smaller than that, the NEAREST centre winning
|
|
52
|
+
* among several (an exact tie, such as two genes' groups on one bin centre, goes to the one
|
|
53
|
+
* drawn on top). Returns what is known at once (gene, count, cell type); anything that needs
|
|
54
|
+
* the server — distinct genes in a group, its top genes and cells, the cell's display id —
|
|
55
|
+
* arrives through `onDetails` once the pointer has rested on the marker briefly.
|
|
56
|
+
*/
|
|
57
|
+
hoverAt(wx, wy, radiusWorld, onDetails) {
|
|
58
|
+
const d = this.drawn;
|
|
59
|
+
if (!d || !this.layerShown() || !d.merged.count) {
|
|
60
|
+
this.key = null;
|
|
61
|
+
return null;
|
|
62
|
+
}
|
|
63
|
+
const i = d.layer.pick(wx, wy, { tolerance: radiusWorld, tieBreak: 'nearest' });
|
|
64
|
+
if (i < 0) {
|
|
65
|
+
this.key = null;
|
|
66
|
+
return null;
|
|
67
|
+
}
|
|
68
|
+
const key = `${d.kind}|${d.merged.x[i]}|${d.merged.y[i]}|${d.merged.gene[i]}`;
|
|
69
|
+
const cached = this.cache.get(key);
|
|
70
|
+
if (cached)
|
|
71
|
+
return cached;
|
|
72
|
+
if (key !== this.key) {
|
|
73
|
+
this.key = key;
|
|
74
|
+
if (this.timer)
|
|
75
|
+
clearTimeout(this.timer);
|
|
76
|
+
this.timer = setTimeout(() => void this.fetchDetails(d, i, key, onDetails), 150);
|
|
77
|
+
}
|
|
78
|
+
return this.describe(d, i, null);
|
|
79
|
+
}
|
|
80
|
+
async fetchDetails(d, i, key, onDetails) {
|
|
81
|
+
if (!this.port.getTranscriptSummary || this.key !== key)
|
|
82
|
+
return;
|
|
83
|
+
const obs = d.merged.observation[i];
|
|
84
|
+
const cells = obs === NO_OBSERVATION ? [] : [obs];
|
|
85
|
+
let box;
|
|
86
|
+
if ((d.kind === 'bins' || d.kind === 'genes') && d.bin) {
|
|
87
|
+
const { size, origin } = d.bin;
|
|
88
|
+
const bx = Math.floor((d.merged.x[i] - origin[0]) / size);
|
|
89
|
+
const by = Math.floor((d.merged.y[i] - origin[1]) / size);
|
|
90
|
+
const x0 = origin[0] + bx * size;
|
|
91
|
+
const y0 = origin[1] + by * size;
|
|
92
|
+
box = [x0, y0, x0 + size, y0 + size];
|
|
93
|
+
}
|
|
94
|
+
else if (d.kind === 'individual') {
|
|
95
|
+
const e = 0.02;
|
|
96
|
+
box = [d.merged.x[i] - e, d.merged.y[i] - e, d.merged.x[i] + e, d.merged.y[i] + e];
|
|
97
|
+
}
|
|
98
|
+
const genes = d.groupGenes && d.entryGroup ? d.groupGenes[d.entryGroup[i]] : undefined;
|
|
99
|
+
try {
|
|
100
|
+
const summary = await this.port.getTranscriptSummary({ box, cells, ...(genes ? { genes } : {}) });
|
|
101
|
+
const lines = this.describe(d, i, summary);
|
|
102
|
+
this.cache.set(key, lines);
|
|
103
|
+
if (this.key === key)
|
|
104
|
+
onDetails(lines);
|
|
105
|
+
}
|
|
106
|
+
catch (err) {
|
|
107
|
+
console.warn('[napari-js] transcript details unavailable', err);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
/** The tooltip text for entry `i`, with the server's details when they have arrived. */
|
|
111
|
+
describe(d, i, s) {
|
|
112
|
+
const t = d.merged;
|
|
113
|
+
const n = t.weight[i];
|
|
114
|
+
const obs = t.observation[i];
|
|
115
|
+
const fmt = (v) => v.toLocaleString();
|
|
116
|
+
const typeOf = (o) => {
|
|
117
|
+
const types = this.types;
|
|
118
|
+
if (!types || o === NO_OBSERVATION || types.meta.kind !== 'categorical')
|
|
119
|
+
return null;
|
|
120
|
+
const c = types.codes[o];
|
|
121
|
+
return c === NO_CATEGORY ? null : (types.meta.categories[c] ?? null);
|
|
122
|
+
};
|
|
123
|
+
const cellLine = (o, prefix) => {
|
|
124
|
+
if (o === NO_OBSERVATION)
|
|
125
|
+
return 'outside any cell';
|
|
126
|
+
const id = s?.cellIds?.[o] ?? `#${o}`;
|
|
127
|
+
const type = typeOf(o);
|
|
128
|
+
return `${prefix} ${id}${type ? ` · ${type}` : ''}`;
|
|
129
|
+
};
|
|
130
|
+
if (d.kind === 'bins') {
|
|
131
|
+
const lines = [`${fmt(n)} transcripts · all genes`];
|
|
132
|
+
if (d.bin)
|
|
133
|
+
lines.push(`${d.bin.size.toFixed(1)} × ${d.bin.size.toFixed(1)} µm area`);
|
|
134
|
+
if (s?.transcripts !== undefined) {
|
|
135
|
+
lines.push(`${fmt(s.genes ?? 0)} distinct genes · ${fmt(s.cells ?? 0)} cell${s.cells === 1 ? '' : 's'}` +
|
|
136
|
+
(s.unassigned ? ` · ${fmt(s.unassigned)} outside cells` : ''));
|
|
137
|
+
if (s.topGenes?.length) {
|
|
138
|
+
lines.push(`top genes: ${s.topGenes
|
|
139
|
+
.slice(0, 5)
|
|
140
|
+
.map((g) => `${g.name} ${fmt(g.count)}`)
|
|
141
|
+
.join(', ')}`);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
lines.push(cellLine(obs, 'mostly cell'));
|
|
145
|
+
if (!s && this.port.getTranscriptSummary)
|
|
146
|
+
lines.push('loading details…');
|
|
147
|
+
return lines;
|
|
148
|
+
}
|
|
149
|
+
if (d.kind === 'individual') {
|
|
150
|
+
const gene = s?.topGenes?.[0]?.name;
|
|
151
|
+
return [
|
|
152
|
+
gene ? `${gene} transcript` : 'Transcript',
|
|
153
|
+
cellLine(obs, 'in cell'),
|
|
154
|
+
...(!s && this.port.getTranscriptSummary ? ['loading details…'] : []),
|
|
155
|
+
];
|
|
156
|
+
}
|
|
157
|
+
const gene = d.genes[t.gene[i]] ?? 'transcript';
|
|
158
|
+
if (d.bin) {
|
|
159
|
+
const um = d.bin.size * (this.micronsPerUnit ?? 1);
|
|
160
|
+
const group = d.entryGroup && d.groupNames ? d.groupNames[d.entryGroup[i]] : gene;
|
|
161
|
+
const top = s?.topGenes?.length
|
|
162
|
+
? [
|
|
163
|
+
s.topGenes
|
|
164
|
+
.slice(0, 6)
|
|
165
|
+
.map((g) => `${g.name} ${fmt(g.count)}`)
|
|
166
|
+
.join(', '),
|
|
167
|
+
]
|
|
168
|
+
: [];
|
|
169
|
+
return [
|
|
170
|
+
`${group} · ${fmt(n)} transcript${n === 1 ? '' : 's'}`,
|
|
171
|
+
...(d.groupGenes ? top : group !== gene ? [`mostly ${gene}`] : []),
|
|
172
|
+
`${um.toFixed(1)} × ${um.toFixed(1)} µm area · zoom in to split`,
|
|
173
|
+
...(obs === NO_OBSERVATION && d.groupGenes ? [] : [cellLine(obs, 'mostly cell')]),
|
|
174
|
+
...(!s && d.groupGenes && this.port.getTranscriptSummary ? ['loading details…'] : []),
|
|
175
|
+
];
|
|
176
|
+
}
|
|
177
|
+
return n > 1
|
|
178
|
+
? [`${gene} · ${fmt(n)} transcripts`, 'grouped: zoom in to split', cellLine(obs, 'near cell')]
|
|
179
|
+
: [`${gene} transcript`, cellLine(obs, 'in cell')];
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transcript-hover.js","sourceRoot":"","sources":["../../../../../../src/lib/implementations/napari-js/spatial-tiles/transcript-hover.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PointsLayer } from 'napari-js';\n\nimport type { SpatialDataPort } from '../../../contracts/ports/spatial-data.port';\nimport {\n  NO_CATEGORY,\n  NO_OBSERVATION,\n  SpatialTranscriptSummary,\n  SpatialTranscriptTile,\n} from '../../../contracts/spatial-dataset.contract';\nimport type { CategoricalCodes } from './categorical-lookup';\n\n/** What one transcript entry is — decides what hovering it says. */\nexport type TranscriptKind = 'genes' | 'individual' | 'bins';\n\n/** A bin grid: its size and origin, so a hovered bin's square can be recovered. */\nexport interface TranscriptBin {\n  size: number;\n  origin: [number, number];\n}\n\n/**\n * Tooltips for the transcript markers of the 2D spatial view.\n *\n * Reads only what the transcript layer last drew — handed over one way through\n * {@link setDrawn} / {@link setTypes} — and asks the server for the slower details (distinct\n * genes in a group, its top genes and cells, the cell's display id) once the pointer has\n * rested on a marker, caching them until the next draw.\n */\nexport class TranscriptHover {\n  /** What the transcript layer currently shows (written by drawing, read by hover). */\n  private drawn: DrawnTranscripts | null = null;\n  /** The cell-type column, to name the cell a marker is in. */\n  private types: CategoricalCodes | null = null;\n  /** µm per observation unit of the drawn dataset, for describing a grouped marker's area. */\n  private micronsPerUnit: number | null = null;\n  /** Details already fetched, by hovered entry. */\n  private readonly cache = new Map<string, string[]>();\n  private key: string | null = null;\n  private timer: ReturnType<typeof setTimeout> | null = null;\n\n  /** `layerShown` says whether the transcript layer is on screen now (it may have been dropped). */\n  constructor(\n    private readonly port: SpatialDataPort,\n    private readonly layerShown: () => boolean,\n  ) {}\n\n  /** The transcript layer was redrawn: hover names these entries now (cached details are dropped). */\n  setDrawn(drawn: DrawnTranscripts, micronsPerUnit: number | null): void {\n    this.drawn = drawn;\n    this.cache.clear();\n    this.micronsPerUnit = micronsPerUnit;\n  }\n\n  /** The cell-type column the drawn entries' cells are named by, or null. */\n  setTypes(types: CategoricalCodes | null): void {\n    this.types = types;\n  }\n\n  /** Nothing is drawn any more. */\n  clear(): void {\n    this.drawn = null;\n  }\n\n  /** Stop a pending details request and forget what was drawn. */\n  dispose(): void {\n    if (this.timer) clearTimeout(this.timer);\n    this.timer = null;\n    this.drawn = null;\n  }\n\n  /**\n   * Tooltip lines for the transcript marker under world point `(wx, wy)`, or null.\n   *\n   * The marker is napari-js's pick on the drawn layer: hit anywhere on it, or within\n   * `radiusWorld` of its centre when it is smaller than that, the NEAREST centre winning\n   * among several (an exact tie, such as two genes' groups on one bin centre, goes to the one\n   * drawn on top). Returns what is known at once (gene, count, cell type); anything that needs\n   * the server — distinct genes in a group, its top genes and cells, the cell's display id —\n   * arrives through `onDetails` once the pointer has rested on the marker briefly.\n   */\n  hoverAt(wx: number, wy: number, radiusWorld: number, onDetails: (lines: string[]) => void): string[] | null {\n    const d = this.drawn;\n    if (!d || !this.layerShown() || !d.merged.count) {\n      this.key = null;\n      return null;\n    }\n    const i = d.layer.pick(wx, wy, { tolerance: radiusWorld, tieBreak: 'nearest' });\n    if (i < 0) {\n      this.key = null;\n      return null;\n    }\n    const key = `${d.kind}|${d.merged.x[i]}|${d.merged.y[i]}|${d.merged.gene[i]}`;\n    const cached = this.cache.get(key);\n    if (cached) return cached;\n    if (key !== this.key) {\n      this.key = key;\n      if (this.timer) clearTimeout(this.timer);\n      this.timer = setTimeout(() => void this.fetchDetails(d, i, key, onDetails), 150);\n    }\n    return this.describe(d, i, null);\n  }\n\n  private async fetchDetails(\n    d: DrawnTranscripts,\n    i: number,\n    key: string,\n    onDetails: (lines: string[]) => void,\n  ): Promise<void> {\n    if (!this.port.getTranscriptSummary || this.key !== key) return;\n    const obs = d.merged.observation[i];\n    const cells = obs === NO_OBSERVATION ? [] : [obs];\n    let box: [number, number, number, number] | undefined;\n    if ((d.kind === 'bins' || d.kind === 'genes') && d.bin) {\n      const { size, origin } = d.bin;\n      const bx = Math.floor((d.merged.x[i] - origin[0]) / size);\n      const by = Math.floor((d.merged.y[i] - origin[1]) / size);\n      const x0 = origin[0] + bx * size;\n      const y0 = origin[1] + by * size;\n      box = [x0, y0, x0 + size, y0 + size];\n    } else if (d.kind === 'individual') {\n      const e = 0.02;\n      box = [d.merged.x[i] - e, d.merged.y[i] - e, d.merged.x[i] + e, d.merged.y[i] + e];\n    }\n    const genes = d.groupGenes && d.entryGroup ? d.groupGenes[d.entryGroup[i]] : undefined;\n    try {\n      const summary = await this.port.getTranscriptSummary({ box, cells, ...(genes ? { genes } : {}) });\n      const lines = this.describe(d, i, summary);\n      this.cache.set(key, lines);\n      if (this.key === key) onDetails(lines);\n    } catch (err) {\n      console.warn('[napari-js] transcript details unavailable', err);\n    }\n  }\n\n  /** The tooltip text for entry `i`, with the server's details when they have arrived. */\n  private describe(d: DrawnTranscripts, i: number, s: SpatialTranscriptSummary | null): string[] {\n    const t = d.merged;\n    const n = t.weight[i];\n    const obs = t.observation[i];\n    const fmt = (v: number) => v.toLocaleString();\n    const typeOf = (o: number) => {\n      const types = this.types;\n      if (!types || o === NO_OBSERVATION || types.meta.kind !== 'categorical') return null;\n      const c = types.codes[o];\n      return c === NO_CATEGORY ? null : (types.meta.categories[c] ?? null);\n    };\n    const cellLine = (o: number, prefix: string) => {\n      if (o === NO_OBSERVATION) return 'outside any cell';\n      const id = s?.cellIds?.[o] ?? `#${o}`;\n      const type = typeOf(o);\n      return `${prefix} ${id}${type ? ` · ${type}` : ''}`;\n    };\n\n    if (d.kind === 'bins') {\n      const lines = [`${fmt(n)} transcripts · all genes`];\n      if (d.bin) lines.push(`${d.bin.size.toFixed(1)} × ${d.bin.size.toFixed(1)} µm area`);\n      if (s?.transcripts !== undefined) {\n        lines.push(\n          `${fmt(s.genes ?? 0)} distinct genes · ${fmt(s.cells ?? 0)} cell${s.cells === 1 ? '' : 's'}` +\n            (s.unassigned ? ` · ${fmt(s.unassigned)} outside cells` : ''),\n        );\n        if (s.topGenes?.length) {\n          lines.push(\n            `top genes: ${s.topGenes\n              .slice(0, 5)\n              .map((g) => `${g.name} ${fmt(g.count)}`)\n              .join(', ')}`,\n          );\n        }\n      }\n      lines.push(cellLine(obs, 'mostly cell'));\n      if (!s && this.port.getTranscriptSummary) lines.push('loading details…');\n      return lines;\n    }\n    if (d.kind === 'individual') {\n      const gene = s?.topGenes?.[0]?.name;\n      return [\n        gene ? `${gene} transcript` : 'Transcript',\n        cellLine(obs, 'in cell'),\n        ...(!s && this.port.getTranscriptSummary ? ['loading details…'] : []),\n      ];\n    }\n    const gene = d.genes[t.gene[i]] ?? 'transcript';\n    if (d.bin) {\n      const um = d.bin.size * (this.micronsPerUnit ?? 1);\n      const group = d.entryGroup && d.groupNames ? d.groupNames[d.entryGroup[i]] : gene;\n      const top = s?.topGenes?.length\n        ? [\n            s.topGenes\n              .slice(0, 6)\n              .map((g) => `${g.name} ${fmt(g.count)}`)\n              .join(', '),\n          ]\n        : [];\n      return [\n        `${group} · ${fmt(n)} transcript${n === 1 ? '' : 's'}`,\n        ...(d.groupGenes ? top : group !== gene ? [`mostly ${gene}`] : []),\n        `${um.toFixed(1)} × ${um.toFixed(1)} µm area · zoom in to split`,\n        ...(obs === NO_OBSERVATION && d.groupGenes ? [] : [cellLine(obs, 'mostly cell')]),\n        ...(!s && d.groupGenes && this.port.getTranscriptSummary ? ['loading details…'] : []),\n      ];\n    }\n    return n > 1\n      ? [`${gene} · ${fmt(n)} transcripts`, 'grouped: zoom in to split', cellLine(obs, 'near cell')]\n      : [`${gene} transcript`, cellLine(obs, 'in cell')];\n  }\n}\n\n/** What the transcript layer currently shows — what hovering needs to name a marker. */\nexport interface DrawnTranscripts {\n  kind: TranscriptKind;\n  bin?: TranscriptBin;\n  merged: SpatialTranscriptTile;\n  /** The layer the entries are drawn in, one marker per entry in the same order. */\n  layer: PointsLayer;\n  genes: string[];\n  /** For a grouped gene selection: each entry's group, and the groups' names. */\n  entryGroup?: Int32Array;\n  groupNames?: string[];\n  /** Each group's genes, when the markers came from the density grids (for the hover). */\n  groupGenes?: string[][];\n}\n"]}
|