feat: make stack viewport work

cornerstonejs · Feb 12, 2025 · 3113419 · 3113419
1 parent 4b6a761
commit 3113419
Show file tree

Hide file tree

Showing 12 changed files with 352 additions and 187 deletions.
diff --git a/packages/adapters/examples/segmentationStack/index.ts b/packages/adapters/examples/segmentationStack/index.ts
@@ -23,7 +23,6 @@ console.warn(
     "Click on index.ts to open source code for this example --------->"
 );
 
-const { Enums: csEnums, RenderingEngine, utilities: csUtilities } = cornerstone;
 const { segmentation: csToolsSegmentation } = cornerstoneTools;
 import {
     readDicom,
@@ -32,14 +31,11 @@ import {
     loadSegmentation,
     exportSegmentation,
     restart,
-    getSegmentationIds,
     handleFileSelect,
     handleDragOver,
-    createSegmentation
+    createEmptySegmentation
 } from "../segmentationVolume/utils";
 
-const referenceImageIds: string[] = [];
-const segImageIds: string[] = [];
 // ======== Set up page ======== //
 
 setTitleAndDescription(
@@ -104,7 +100,7 @@ const state = {
     toolGroup: null,
     toolGroupId: "MY_TOOL_GROUP_ID",
     viewportIds: ["CT_AXIAL"],
-    segmentationIds: [],
+    segmentationId: "LOAD_SEG_ID:" + cornerstone.utilities.uuidv4(),
     referenceImageIds: [],
     segImageIds: [],
     skipOverlapping: false,
@@ -135,12 +131,10 @@ function loadDicom() {
 }
 
 function createSegmentationRepresentation() {
-    for (const segmentationId of state.segmentationIds) {
-        csToolsSegmentation.addLabelmapRepresentationToViewport(
-            state.viewportIds[0],
-            [{ segmentationId }]
-        );
-    }
+    csToolsSegmentation.addLabelmapRepresentationToViewport(
+        state.viewportIds[0],
+        [{ segmentationId: state.segmentationId }]
+    );
 }
 
 // ============================= //
@@ -196,7 +190,7 @@ addButtonToToolbar({
     id: "CREATE_SEGMENTATION",
     title: "Create Empty SEG",
     onClick: async () => {
-        await createSegmentation(state);
+        await createEmptySegmentation(state);
         createSegmentationRepresentation();
     },
     container: group2

diff --git a/packages/adapters/examples/segmentationVolume/index.ts b/packages/adapters/examples/segmentationVolume/index.ts
@@ -33,7 +33,7 @@ import {
     handleFileSelect,
     handleDragOver,
     restart,
-    createSegmentation
+    createEmptySegmentation
 } from "../segmentationVolume/utils";
 
 setTitleAndDescription(
@@ -116,7 +116,7 @@ const state = {
     toolGroupId: "MY_TOOL_GROUP_ID",
     viewportIds: ["CT_AXIAL", "CT_SAGITTAL", "CT_CORONAL"],
     volumeId: "",
-    segmentationIds: [],
+    segmentationId: "LOAD_SEG_ID:" + cornerstone.utilities.uuidv4(),
     referenceImageIds: [],
     skipOverlapping: false,
     segImageIds: [],
@@ -161,15 +161,13 @@ async function loadDicom() {
 }
 
 function createSegmentationRepresentation() {
-    for (const segmentationId of state.segmentationIds) {
-        const segMap = {
-            [state.viewportIds[0]]: [{ segmentationId }],
-            [state.viewportIds[1]]: [{ segmentationId }],
-            [state.viewportIds[2]]: [{ segmentationId }]
-        };
-
-        csToolsSegmentation.addLabelmapRepresentationToViewportMap(segMap);
-    }
+    const segMap = {
+        [state.viewportIds[0]]: [{ segmentationId: state.segmentationId }],
+        [state.viewportIds[1]]: [{ segmentationId: state.segmentationId }],
+        [state.viewportIds[2]]: [{ segmentationId: state.segmentationId }]
+    };
+
+    csToolsSegmentation.addLabelmapRepresentationToViewportMap(segMap);
 }
 // ============================= //
 addButtonToToolbar({
@@ -223,7 +221,7 @@ addButtonToToolbar({
     id: "CREATE_SEGMENTATION",
     title: "Create Empty SEG",
     onClick: async () => {
-        await createSegmentation(state);
+        await createEmptySegmentation(state);
         createSegmentationRepresentation();
     },
     container: group2

diff --git a/packages/adapters/examples/segmentationVolume/utils.ts b/packages/adapters/examples/segmentationVolume/utils.ts
@@ -18,7 +18,7 @@ export async function readDicom(files: FileList, state) {
     }
 }
 
-export async function createSegmentation(state) {
+export async function createEmptySegmentation(state) {
     const { referenceImageIds, segmentationId } = state;
 
     const derivedSegmentationImages =
@@ -44,6 +44,25 @@ export async function createSegmentation(state) {
     ]);
 }
 
+export async function createSegmentation({ state, labelMapImages }) {
+    const { segmentationId } = state;
+
+    const imageIds = labelMapImages?.flat().map(image => image.imageId);
+
+    csToolsSegmentation.addSegmentations([
+        {
+            segmentationId,
+            representation: {
+                type: cornerstoneTools.Enums.SegmentationRepresentations
+                    .Labelmap,
+                data: {
+                    imageIds
+                }
+            }
+        }
+    ]);
+}
+
 export async function readSegmentation(file: File, state) {
     const imageId = wadouri.fileManager.add(file);
     const image = await imageLoader.loadAndCacheImage(imageId);
@@ -65,9 +84,9 @@ export async function readSegmentation(file: File, state) {
 }
 
 export async function loadSegmentation(arrayBuffer: ArrayBuffer, state) {
-    const { referenceImageIds, skipOverlapping, segmentationIds } = state;
+    const { referenceImageIds, skipOverlapping, segmentationId } = state;
 
-    const generateToolState =
+    const { labelMapImages } =
         await Cornerstone3D.Segmentation.createFromDICOMSegBuffer(
             referenceImageIds,
             arrayBuffer,
@@ -77,29 +96,27 @@ export async function loadSegmentation(arrayBuffer: ArrayBuffer, state) {
             }
         );
 
-    for (let i = 0; i < generateToolState.labelMapImages.length; i++) {
-        const segmentationId = "LOAD_SEG_ID:" + cornerstone.utilities.uuidv4();
-        segmentationIds.push(segmentationId);
-        await createSegmentation({ ...state, segmentationId });
-
-        const segmentation =
-            csToolsSegmentation.state.getSegmentation(segmentationId);
-
-        const { imageIds } = segmentation.representationData.Labelmap;
-        const derivedSegmentationImages = imageIds.map(imageId =>
-            cache.getImage(imageId)
-        );
-
-        const labelmapImagesNonOverlapping =
-            generateToolState.labelMapImages[i];
-
-        for (let j = 0; j < derivedSegmentationImages.length; j++) {
-            const voxelManager = derivedSegmentationImages[j].voxelManager;
-            const scalarData = voxelManager.getScalarData();
-            scalarData.set(labelmapImagesNonOverlapping[j].getPixelData());
-            voxelManager.setScalarData(scalarData);
-        }
-    }
+    await createSegmentation({ state, labelMapImages });
+    // for (let i = 0; i < labelMapImages.length; i++) {
+    //     const segmentation =
+    //         csToolsSegmentation.state.getSegmentation(segmentationId);
+
+    //     const { imageIds } = segmentation.representationData.Labelmap;
+    //     console.log("🚀 ~ loadSegmentation ~ imageIds:", imageIds);
+    //     const derivedSegmentationImages = imageIds.map(imageId =>
+    //         cache.getImage(imageId)
+    //     );
+
+    //     const labelmapImagesNonOverlapping = labelMapImages[i];
+
+    //     for (let j = 0; j < derivedSegmentationImages.length; j++) {
+    //         const voxelManager = derivedSegmentationImages[j].voxelManager;
+    //         const scalarData = voxelManager.getScalarData();
+    //         const derivedImage = labelmapImagesNonOverlapping[j];
+    //         scalarData.set(labelmapImagesNonOverlapping[j].getPixelData());
+    //         voxelManager.setScalarData(scalarData);
+    //     }
+    // }
 }
 
 export async function exportSegmentation(state) {