@cornerstonejs/tools 2.17.0 → 2.17.2

package/dist/esm/tools/segmentation/LabelmapBaseTool.d.ts

@@ -2,6 +2,7 @@ import type { Types } from '@cornerstonejs/core';
 import { BaseTool } from '../base';
 import type vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
 import * as LabelmapMemo from '../../utilities/segmentation/createLabelmapMemo';
+import type { LabelmapToolOperationData } from '../../types/LabelmapToolOperationData';
 export type PreviewData = {
     preview: unknown;
     timer?: number;
@@ -10,6 +11,25 @@ export type PreviewData = {
     element: HTMLDivElement;
     isDrag: boolean;
 };
+type EditDataReturnType = {
+    volumeId: string;
+    referencedVolumeId: string;
+    segmentsLocked: number[];
+} | {
+    imageId: string;
+    segmentsLocked: number[];
+    override?: {
+        voxelManager: Types.IVoxelManager<number> | Types.IVoxelManager<Types.RGB>;
+        imageData: vtkImageData;
+    };
+} | null;
+type ModifiedLabelmapToolOperationData = Omit<LabelmapToolOperationData, 'voxelManager' | 'override'> & {
+    voxelManager?: Types.IVoxelManager<number> | Types.IVoxelManager<Types.RGB>;
+    override?: {
+        voxelManager: Types.IVoxelManager<number> | Types.IVoxelManager<Types.RGB>;
+        imageData: vtkImageData;
+    };
+};
 export default class LabelmapBaseTool extends BaseTool {
     protected _editData: {
         override: {
@@ -35,28 +55,14 @@ export default class LabelmapBaseTool extends BaseTool {
     constructor(toolProps: any, defaultToolProps: any);
     protected get _previewData(): PreviewData;
     createMemo(segmentId: string, segmentationVoxelManager: any, preview: any): LabelmapMemo.LabelmapMemo;
-    createEditData(element: any): {
-        volumeId: string;
-        referencedVolumeId: any;
-        segmentsLocked: number[] | [];
-        imageId?: undefined;
-        override?: undefined;
-    } | {
-        imageId: string;
-        segmentsLocked: number[] | [];
-        override: {
-            voxelManager: Types.IVoxelManager<number> | Types.IVoxelManager<Types.RGB>;
-            imageData: vtkImageData;
-        };
-        volumeId?: undefined;
-        referencedVolumeId?: undefined;
-    } | {
-        imageId: string;
-        segmentsLocked: number[] | [];
-        volumeId?: undefined;
-        referencedVolumeId?: undefined;
-        override?: undefined;
-    };
+    protected createEditData(element: any): EditDataReturnType;
+    protected getEditData({ viewport, representationData, segmentsLocked, segmentationId, volumeOperation, }: {
+        viewport: any;
+        representationData: any;
+        segmentsLocked: any;
+        segmentationId: any;
+        volumeOperation?: boolean;
+    }): EditDataReturnType;
     protected createHoverData(element: any, centerCanvas?: any): {
         brushCursor: {
             metadata: {
@@ -81,78 +87,7 @@ export default class LabelmapBaseTool extends BaseTool {
         segmentationId: string;
         segmentColor: Types.Color;
     };
-    protected getOperationData(element?: any): {
-        points: any;
-        segmentIndex: number;
-        previewColors: any;
-        viewPlaneNormal: any;
-        toolGroupId: string;
-        segmentationId: string;
-        viewUp: any;
-        strategySpecificConfiguration: any;
-        preview: unknown;
-        createMemo: (segmentId: string, segmentationVoxelManager: any, preview: any) => LabelmapMemo.LabelmapMemo;
-        override: {
-            voxelManager: Types.IVoxelManager<number>;
-            imageData: vtkImageData;
-        };
-        segmentsLocked: number[];
-        imageId?: string;
-        imageIds?: string[];
-        volumeId?: string;
-        referencedVolumeId?: string;
-    } | {
-        points: any;
-        segmentIndex: number;
-        previewColors: any;
-        viewPlaneNormal: any;
-        toolGroupId: string;
-        segmentationId: string;
-        viewUp: any;
-        strategySpecificConfiguration: any;
-        preview: unknown;
-        createMemo: (segmentId: string, segmentationVoxelManager: any, preview: any) => LabelmapMemo.LabelmapMemo;
-        volumeId: string;
-        referencedVolumeId: any;
-        segmentsLocked: number[] | [];
-        imageId?: undefined;
-        override?: undefined;
-    } | {
-        points: any;
-        segmentIndex: number;
-        previewColors: any;
-        viewPlaneNormal: any;
-        toolGroupId: string;
-        segmentationId: string;
-        viewUp: any;
-        strategySpecificConfiguration: any;
-        preview: unknown;
-        createMemo: (segmentId: string, segmentationVoxelManager: any, preview: any) => LabelmapMemo.LabelmapMemo;
-        imageId: string;
-        segmentsLocked: number[] | [];
-        override: {
-            voxelManager: Types.IVoxelManager<number> | Types.IVoxelManager<Types.RGB>;
-            imageData: vtkImageData;
-        };
-        volumeId?: undefined;
-        referencedVolumeId?: undefined;
-    } | {
-        points: any;
-        segmentIndex: number;
-        previewColors: any;
-        viewPlaneNormal: any;
-        toolGroupId: string;
-        segmentationId: string;
-        viewUp: any;
-        strategySpecificConfiguration: any;
-        preview: unknown;
-        createMemo: (segmentId: string, segmentationVoxelManager: any, preview: any) => LabelmapMemo.LabelmapMemo;
-        imageId: string;
-        segmentsLocked: number[] | [];
-        volumeId?: undefined;
-        referencedVolumeId?: undefined;
-        override?: undefined;
-    };
+    protected getOperationData(element?: any): ModifiedLabelmapToolOperationData;
     addPreview(element?: HTMLDivElement, options?: {
         acceptReject: boolean;
     }): unknown;
@@ -162,3 +97,4 @@ export default class LabelmapBaseTool extends BaseTool {
         removeContours: boolean;
     }): void;
 }
+export {};

package/dist/esm/tools/segmentation/LabelmapBaseTool.js

@@ -53,6 +53,15 @@ export default class LabelmapBaseTool extends BaseTool {
         const { segmentationId } = activeSegmentation;
         const segmentsLocked = getLockedSegmentIndices(segmentationId);
         const { representationData } = getSegmentation(segmentationId);
+        const editData = this.getEditData({
+            viewport,
+            representationData,
+            segmentsLocked,
+            segmentationId,
+        });
+        return editData;
+    }
+    getEditData({ viewport, representationData, segmentsLocked, segmentationId, volumeOperation = false, }) {
         if (viewport instanceof BaseVolumeViewport) {
             const { volumeId } = representationData[SegmentationRepresentations.Labelmap];
             const actors = viewport.getActors();
@@ -82,7 +91,8 @@ export default class LabelmapBaseTool extends BaseTool {
             if (!segmentationImageId) {
                 return;
             }
-            if (this.configuration.activeStrategy.includes('SPHERE')) {
+            if (this.configuration.activeStrategy.includes('SPHERE') ||
+                volumeOperation) {
                 const referencedImageIds = viewport.getImageIds();
                 const isValidVolumeForSphere = csUtils.isValidVolume(referencedImageIds);
                 if (!isValidVolumeForSphere) {
@@ -101,7 +111,7 @@ export default class LabelmapBaseTool extends BaseTool {
                     };
                 }
                 else {
-                    const labelmapImageIds = getStackSegmentationImageIdsForViewport(viewport.id, segmentationId);
+                    const { imageIds: labelmapImageIds } = representationData.Labelmap;
                     if (!labelmapImageIds || labelmapImageIds.length === 1) {
                         return {
                             imageId: segmentationImageId,

package/dist/esm/tools/segmentation/SphereScissorsTool.js

@@ -1,5 +1,4 @@
-import { BaseVolumeViewport, cache, getEnabledElement, } from '@cornerstonejs/core';
-import { BaseTool } from '../base';
+import { getEnabledElement } from '@cornerstonejs/core';
 import { fillInsideSphere } from './strategies/fillSphere';
 import { eraseInsideSphere } from './strategies/eraseSphere';
 import { Events, SegmentationRepresentations } from '../../enums';
@@ -88,21 +87,17 @@ class SphereScissorsTool extends LabelmapBaseTool {
                 imageId: null,
             };
             const { representationData } = getSegmentation(segmentationId);
-            const labelmapData = representationData[SegmentationRepresentations.Labelmap];
-            if (viewport instanceof BaseVolumeViewport) {
-                const { volumeId } = labelmapData;
-                const segmentation = cache.getVolume(volumeId);
-                this.editData = {
-                    ...this.editData,
-                    volumeId,
-                    referencedVolumeId: segmentation.referencedVolumeId,
-                };
-            }
-            else {
-                this.editData = {
-                    ...this.editData,
-                };
-            }
+            const editData = this.getEditData({
+                viewport,
+                representationData,
+                segmentsLocked,
+                segmentationId,
+                volumeOperation: true,
+            });
+            this.editData = {
+                ...this.editData,
+                ...editData,
+            };
             this._activateDraw(element);
             hideElementCursor(element);
             evt.preventDefault();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "2.17.0",
+  "version": "2.17.2",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -104,7 +104,7 @@
     "canvas": "^2.11.2"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^2.17.0",
+    "@cornerstonejs/core": "^2.17.2",
     "@kitware/vtk.js": "32.9.0",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -123,5 +123,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "912559cd9b86ddac21f2e0d6087980fc02343f52"
+  "gitHead": "26657751a6e715570cc44115ee8cc673aa453037"
 }