@cornerstonejs/ai 5.11.6 → 5.12.0

package/dist/esm/ONNXSegmentationController.d.ts

@@ -65,6 +65,7 @@ export default class ONNXSegmentationController {
     private _searchBreadth;
     private loadingAI;
     protected viewport: any;
+    private viewportGeneration;
     protected excludeTool: string;
     protected currentImage: any;
     private listeners;
@@ -122,6 +123,7 @@ export default class ONNXSegmentationController {
     interpolateScroll(viewport?: any, dir?: number): Promise<void>;
     protected log(logger: Loggers, ...args: unknown[]): void;
     protected getPromptAnnotations: (viewport?: any) => cornerstoneTools.Types.Annotations;
+    protected getActiveSegmentation(viewport?: any): cornerstoneTools.Types.Segmentation;
     protected viewportRenderedListener: (_event: any) => void;
     protected annotationModifiedListener: Function;
     disconnectViewport(viewport: any): void;

package/dist/esm/ONNXSegmentationController.js

@@ -86,6 +86,7 @@ class ONNXSegmentationController {
         this.labels = [];
         this.worldPoints = new Array();
         this._searchBreadth = 3;
+        this.viewportGeneration = 0;
         this.excludeTool = ONNXSegmentationController.MarkerExclude;
         this.listeners = [
             (message, ...args) => cs3dLogger.info(message, ...args),
@@ -138,16 +139,19 @@ class ONNXSegmentationController {
             else {
                 desiredImage.sampleImageId = desiredImage.imageId;
             }
+            const segmentation = this.getActiveSegmentation();
+            if (!segmentation) {
+                this.randomPoints = [];
+            }
             if (desiredImage.imageId === currentImage?.imageId) {
                 return;
             }
-            if (this._enabled && this._autoSegmentMode) {
+            if (segmentation && this._enabled && this._autoSegmentMode) {
                 if ('isInAcquisitionPlane' in viewport &&
                     !viewport.isInAcquisitionPlane()) {
                     cs3dLogger.warn('Non acquisition plane viewports and auto segment mode is not yet supported');
                     return;
                 }
-                const segmentation = cornerstoneTools.segmentation.activeSegmentation.getActiveSegmentation(viewport.id);
                 const segmentIndex = cornerstoneTools.segmentation.segmentIndex.getActiveSegmentIndex(segmentation.segmentationId);
                 const imageIds = viewport.getImageIds();
                 const currentImageIdIndex = viewport.getCurrentImageIdIndex();
@@ -275,11 +279,13 @@ class ONNXSegmentationController {
         this.tryLoad();
     }
     initViewport(viewport) {
+        this.viewportGeneration++;
         const { desiredImage } = this;
         if (this.viewport) {
             this.disconnectViewport(this.viewport);
         }
         this.currentImage = null;
+        this.randomPoints = [];
         this.viewport = viewport;
         const brushInstance = new LabelmapBaseTool({}, {
             configuration: {
@@ -398,9 +404,16 @@ class ONNXSegmentationController {
             listener(logger, ...args);
         }
     }
+    getActiveSegmentation(viewport = this.viewport) {
+        if (!viewport) {
+            return;
+        }
+        return cornerstoneTools.segmentation.activeSegmentation.getActiveSegmentation(viewport.id);
+    }
     disconnectViewport(viewport) {
         viewport.element.removeEventListener(Events.IMAGE_RENDERED, this.viewportRenderedListener);
         const boundListener = this.annotationModifiedListener;
+        eventTarget.removeEventListener(toolsEvents.ANNOTATION_ADDED, boundListener);
         eventTarget.removeEventListener(toolsEvents.ANNOTATION_MODIFIED, boundListener);
         eventTarget.removeEventListener(toolsEvents.ANNOTATION_COMPLETED, boundListener);
     }
@@ -558,7 +571,9 @@ class ONNXSegmentationController {
     }
     async runDecode() {
         const { canvas } = this;
-        if (this.isGpuInUse || !this.currentImage?.imageEmbeddings) {
+        if (this.isGpuInUse ||
+            !this.currentImage?.imageEmbeddings ||
+            !this.getActiveSegmentation()) {
             return;
         }
         this.isGpuInUse = true;
@@ -707,6 +722,9 @@ class ONNXSegmentationController {
     createLabelmap(mask, canvasPosition, _points, _labels) {
         const { canvas, viewport } = this;
         const preview = this.tool.addPreview(viewport.element);
+        if (!preview) {
+            return;
+        }
         const { previewSegmentIndex, memo, segmentationId, segmentIndex, segmentationVoxelManager, } = preview;
         const previewVoxelManager = memo?.voxelManager;
         const { dimensions } = previewVoxelManager;
@@ -758,7 +776,7 @@ class ONNXSegmentationController {
         triggerSegmentationDataModified(segmentationId);
     }
     async decode(points, labels, useSession = this.currentImage) {
-        const { canvas, canvasMask, imageImageData, desiredImage, boxRadius } = this;
+        const { canvas, canvasMask, imageImageData, desiredImage, boxRadius, viewport, viewportGeneration, } = this;
         const ctx = canvas.getContext('2d', { willReadFrequently: true });
         ctx.clearRect(0, 0, canvas.width, canvas.height);
         canvas.width = imageImageData.width;
@@ -778,6 +796,10 @@ class ONNXSegmentationController {
             const session = useSession.decoder;
             const feed = feedForSam(emb, points, labels);
             const res = await session.run(feed);
+            if (viewport !== this.viewport ||
+                viewportGeneration !== this.viewportGeneration) {
+                return;
+            }
             for (let i = 0; i < points.length; i += 2) {
                 const label = labels[i / 2];
                 ctx.fillStyle = label ? 'blue' : 'pink';

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.11.6";
+export declare const version = "5.12.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.11.6';
+export const version = '5.12.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/ai",
-  "version": "5.11.6",
+  "version": "5.12.0",
   "description": "AI and ML Interfaces for Cornerstone3D",
   "files": [
     "dist"
@@ -63,11 +63,11 @@
     "onnxruntime-web": "1.17.1"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.11.6",
-    "@cornerstonejs/tools": "5.11.6"
+    "@cornerstonejs/core": "5.12.0",
+    "@cornerstonejs/tools": "5.12.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.11.6",
-    "@cornerstonejs/tools": "5.11.6"
+    "@cornerstonejs/core": "5.12.0",
+    "@cornerstonejs/tools": "5.12.0"
   }
 }