@jax-data-science/sci-image-visualizer 0.8.2 → 0.8.3

package/fesm2022/jax-data-science-sci-image-visualizer.mjs

@@ -29393,6 +29393,10 @@ class NapariVisualizerService extends BaseStoreVisualizer {
         this.loadingBadge = null;
         this.tileLoading = [];
         this.observationsLoading = 0;
+        /** Image tiles in flight, and the scene they belong to: a fetch that outlives {@link reset}
+         *  settles against the old generation and leaves the new scene's count alone. */
+        this.imageTilesLoading = 0;
+        this.imageTilesGeneration = 0;
         /** Monotonic load generation. Bumped by {@link reset} and {@link cancelLoading}; the frame-loading
          *  loops (volume assembly, surface preload) capture it and bail when it changes, so a Cancel (or a
          *  new plot) actually stops fetching frames instead of running to completion in the background. */
@@ -29711,6 +29715,9 @@ class NapariVisualizerService extends BaseStoreVisualizer {
             return false;
         }
         this.reset();
+        // This plot's scene. A newer plot resets into the next one while this one still awaits, and
+        // a superseded plot must not go on to draw (or count image tiles) into the newer scene.
+        const scene = this.imageTilesGeneration;
         this.host = host;
         this.plotDivId = plotDiv;
         this.currentPlotType = plotType;
@@ -29752,6 +29759,8 @@ class NapariVisualizerService extends BaseStoreVisualizer {
             });
             this.viewer = viewer;
             await viewer.ready;
+            if (scene !== this.imageTilesGeneration)
+                return false;
             if (isSpatialOmics3d(plotType)) {
                 await this.mountSpatialOmics3d(viewer, host);
             }
@@ -29848,11 +29857,15 @@ class NapariVisualizerService extends BaseStoreVisualizer {
         const v = this.viewer;
         if (!v)
             return;
+        const scene = this.imageTilesGeneration;
         const desc = await this.ensureDescriptor();
+        // Reset into a newer scene while the descriptor was in flight: this render is superseded.
+        if (scene !== this.imageTilesGeneration)
+            return;
         if (desc && desc.levels?.length) {
             if (token != null && token !== this.sliceReq)
                 return;
-            await this.renderImageTiled(z, desc);
+            await this.renderImageTiled(z, desc, scene);
             return;
         }
         return this.renderImageStitched(z, token);
@@ -29945,7 +29958,7 @@ class NapariVisualizerService extends BaseStoreVisualizer {
      * coordinates so regions align. Same three modes as the stitch path. Per-channel layers use the
      * REAL pyramid levels (per-channel tiles only exist there); the composite uses all levels.
      */
-    async renderImageTiled(z, desc) {
+    async renderImageTiled(z, desc, scene) {
         const v = this.viewer;
         if (!v)
             return;
@@ -29962,7 +29975,7 @@ class NapariVisualizerService extends BaseStoreVisualizer {
                 const st = states.find((s) => s.index === c);
                 const color = st?.color ?? desc.channelInfo?.[c]?.color ?? tintFor(c);
                 views.push({
-                    source: this.buildTiledSource(desc, c, 1),
+                    source: this.buildTiledSource(desc, c, 1, scene),
                     tint: color,
                     name: st?.name ?? `ch${c}`,
                     contrastLimits: [st?.min ?? 0, st?.max ?? 255],
@@ -29978,7 +29991,7 @@ class NapariVisualizerService extends BaseStoreVisualizer {
             const st = states[0];
             this.channelView.render('grayscale', [
                 {
-                    source: this.buildTiledSource(desc, undefined, 1),
+                    source: this.buildTiledSource(desc, undefined, 1, scene),
                     colormap: this.grayscaleColormap(),
                     contrastLimits: [st?.min ?? 0, st?.max ?? 255],
                     gamma: st?.gamma ?? 1,
@@ -29988,7 +30001,7 @@ class NapariVisualizerService extends BaseStoreVisualizer {
         }
         else {
             this.imageMode = 'rgb';
-            this.channelView.render('rgb', [{ source: this.buildTiledSource(desc, undefined, 4) }], {
+            this.channelView.render('rgb', [{ source: this.buildTiledSource(desc, undefined, 4, scene) }], {
                 interpolation,
             });
         }
@@ -29999,8 +30012,9 @@ class NapariVisualizerService extends BaseStoreVisualizer {
         await this.refreshHistogramSamples(z, desc);
     }
     /** Build a pyramidal TiledSource backed by the server `/tile` endpoint. `channel` selects a band
-     *  (grayscale luminance, real levels only); omit it for the composite (RGBA, all levels). */
-    buildTiledSource(desc, channel, channels) {
+     *  (grayscale luminance, real levels only); omit it for the composite (RGBA, all levels).
+     *  `scene` is the generation of the render that asked for it, taken before that render's awaits. */
+    buildTiledSource(desc, channel, channels, scene) {
         const infoB64 = this.tiles.getSelectedInfoB64() ?? '';
         // Per-channel tiles exist only at REAL Bio-Formats levels; the composite exists at all levels.
         const usable = channel == null
@@ -30010,6 +30024,9 @@ class NapariVisualizerService extends BaseStoreVisualizer {
         const tileSize = desc.tileSize || TILE_SIZE;
         const ch = channel == null ? '' : `&channel=${channel}`;
         const api = this.api;
+        // The scene this source draws: its tiles count on the badge only while that scene is current,
+        // so a request the disposed source still issues after a reset never shows on the new one.
+        const generation = scene;
         return {
             kind: 'tiled',
             width: desc.width,
@@ -30023,17 +30040,31 @@ class NapariVisualizerService extends BaseStoreVisualizer {
             fetchTile: async (key) => {
                 const res = usable[key.level]?.res ?? key.level;
                 const url = `${api}tile?info=${infoB64}&res=${res}&col=${key.col}&row=${key.row}&z=${key.z}&tileSize=${tileSize}${ch}`;
-                const headers = await this.tiles
-                    .getAuthHeaders()
-                    .catch(() => ({}));
-                const resp = await fetch(url, { headers });
-                if (!resp.ok) {
-                    throw new Error(`[napari-js] tile ${key.level}/${key.col}/${key.row} → ${resp.status}`);
+                // "Image reloading…" on the loading badge while any tile of the image is in flight.
+                const counted = generation === this.imageTilesGeneration;
+                if (counted) {
+                    this.imageTilesLoading++;
+                    this.showLoading();
+                }
+                try {
+                    const headers = await this.tiles
+                        .getAuthHeaders()
+                        .catch(() => ({}));
+                    const resp = await fetch(url, { headers });
+                    if (!resp.ok) {
+                        throw new Error(`[napari-js] tile ${key.level}/${key.col}/${key.row} → ${resp.status}`);
+                    }
+                    const bmp = await createImageBitmap(await resp.blob());
+                    if (channels === 4)
+                        return { width: bmp.width, height: bmp.height, data: bmp };
+                    return this.bitmapToLuminance(bmp);
+                }
+                finally {
+                    if (counted && generation === this.imageTilesGeneration) {
+                        this.imageTilesLoading--;
+                        this.showLoading();
+                    }
                 }
-                const bmp = await createImageBitmap(await resp.blob());
-                if (channels === 4)
-                    return { width: bmp.width, height: bmp.height, data: bmp };
-                return this.bitmapToLuminance(bmp);
             },
         };
     }
@@ -30195,7 +30226,11 @@ class NapariVisualizerService extends BaseStoreVisualizer {
         if (!this.host)
             return;
         this.loadingBadge ??= new NapariLoadingBadge(this.host);
-        this.loadingBadge.set([...(this.observationsLoading > 0 ? ['Observations'] : []), ...this.tileLoading]);
+        this.loadingBadge.set([
+            ...(this.imageTilesLoading > 0 ? ['Image'] : []),
+            ...(this.observationsLoading > 0 ? ['Observations'] : []),
+            ...this.tileLoading,
+        ]);
     }
     installNavigator(z) {
         this.navigator?.destroy();
@@ -32744,6 +32779,8 @@ class NapariVisualizerService extends BaseStoreVisualizer {
         this.loadingBadge = null;
         this.tileLoading = [];
         this.observationsLoading = 0;
+        this.imageTilesLoading = 0;
+        this.imageTilesGeneration++;
         this.regionOverlay?.destroy();
         this.regionOverlay = null;
         this.axesLabels?.destroy();