@cornerstonejs/adapters 3.23.0 → 3.24.0

package/dist/esm/adapters/Cornerstone/Segmentation_4X.js

@@ -853,6 +853,18 @@ function unpackPixelData(multiframe, options) {
     // MAX 2GB is the limit right now to allocate a buffer
     return getUnpackedChunks(data, options.maxBytesPerChunk);
   }
+  if (segType === "LABELMAP") {
+    // For LABELMAP, we can return the data as is, since it is already in a
+    // format that Cornerstone can handle. Also here we are returning the
+    // whole data at once, since the storage is more efficent than BINARY mode
+    if (multiframe.BitsStored === 8) {
+      return new Uint8Array(data);
+    } else if (multiframe.BitsStored === 16) {
+      return new Uint16Array(data);
+    } else {
+      return new Uint8Array(data);
+    }
+  }
   const pixelData = new Uint8Array(data);
   const max = multiframe.MaximumFractionalValue;
   const onlyMaxAndZero = pixelData.find(element => element !== 0 && element !== max) === undefined;

package/dist/esm/adapters/Cornerstone3D/Segmentation/labelmapImagesFromBuffer.js

@@ -267,7 +267,72 @@ function insertPixelDataPlanar(_ref4) {
         });
       }
     };
-    processChunk(0);
+    const processLabelmapChunk = firstIndex => {
+      const pfSeq = multiframe.PerFrameFunctionalGroupsSequence;
+      const sharedPlaneOrientation = multiframe.SharedFunctionalGroupsSequence.PlaneOrientationSequence?.ImageOrientationPatient;
+      for (let i = firstIndex; i < firstIndex + imagesPerChunk && i < groupsLen; i++) {
+        const PerFrameFunctionalGroups = pfSeq[i];
+        const ImageOrientationPatientI = sharedPlaneOrientation || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
+        const view = pixelDataChunks.subarray(i * sliceLength, (i + 1) * sliceLength);
+        const pixelDataI2D = ndarray(view, [Rows, Columns]);
+        const alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
+        if (!alignedPixelDataI) {
+          throw new Error("Individual Labelmap SEG frames are out of plane with respect to the first SEG frame. " + "This is not yet supported. Aborting segmentation loading.");
+        }
+        const imageId = findReferenceSourceImageId(multiframe, i, referencedImageIds, metadataProvider, tolerance, sopUIDImageIdIndexMap);
+        if (!imageId) {
+          console.warn(`Image not present in stack, can't import frame : ${i}.`);
+          continue;
+        }
+        const sourceImageMetadata = imageIdMaps.metadata[imageId];
+        if (Rows !== sourceImageMetadata.Rows || Columns !== sourceImageMetadata.Columns) {
+          throw new Error("Individual Labelmap SEG frames have different geometry dimensions (Rows and Columns) " + "respect to the source image reference frame. This is not yet supported. " + "Aborting segmentation loading. ");
+        }
+        const imageIdIndex = imageIdMaps.indices[imageId];
+        const labelmapImage = labelMapImages[imageIdIndex];
+        const labelmap2DView = labelmapImage.getPixelData();
+        const data = alignedPixelDataI.data;
+        let segmentsOnFrameArr = segmentsOnFrame[imageIdIndex];
+        if (!segmentsOnFrameArr) {
+          segmentsOnFrameArr = [];
+          segmentsOnFrame[imageIdIndex] = segmentsOnFrameArr;
+        }
+        const segSet = new Set(segmentsOnFrameArr);
+        for (let k = 0, len = data.length; k < len; ++k) {
+          const segIdx = data[k];
+          if (segIdx !== 0) {
+            labelmap2DView[k] = segIdx;
+            if (!segSet.has(segIdx)) {
+              segmentsOnFrameArr.push(segIdx);
+              segSet.add(segIdx);
+            }
+            if (!segmentsPixelIndices.has(segIdx)) {
+              segmentsPixelIndices.set(segIdx, {});
+            }
+            const segmentPixelInfo = segmentsPixelIndices.get(segIdx);
+            if (!segmentPixelInfo[imageIdIndex]) {
+              segmentPixelInfo[imageIdIndex] = [];
+            }
+            segmentPixelInfo[imageIdIndex].push(k);
+          }
+        }
+      }
+      const percentComplete = Math.round(firstIndex / groupsLen * 100);
+      throttledTriggerLoadProgressEvent(percentComplete);
+      if (firstIndex < groupsLen) {
+        setTimeout(() => processLabelmapChunk(firstIndex + imagesPerChunk), 0);
+      } else {
+        resolve({
+          hasOverlappingSegments: false,
+          arrayOfLabelMapImages: [labelMapImages]
+        });
+      }
+    };
+    if (multiframe.SegmentationType === "LABELMAP") {
+      processLabelmapChunk(0);
+    } else {
+      processChunk(0);
+    }
   });
 }
 const getAlignedPixelData = _ref5 => {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.23.0";
+export declare const version = "3.24.0";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cornerstonejs/adapters",
-    "version": "3.23.0",
+    "version": "3.24.0",
     "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
     "module": "./dist/esm/index.js",
     "types": "./dist/esm/index.d.ts",
@@ -85,13 +85,13 @@
     "dependencies": {
         "@babel/runtime-corejs2": "^7.17.8",
         "buffer": "^6.0.3",
-        "dcmjs": "^0.40.0",
+        "dcmjs": "^0.42.0",
         "gl-matrix": "^3.4.3",
         "ndarray": "^1.0.19"
     },
     "peerDependencies": {
-        "@cornerstonejs/core": "^3.23.0",
-        "@cornerstonejs/tools": "^3.23.0"
+        "@cornerstonejs/core": "^3.24.0",
+        "@cornerstonejs/tools": "^3.24.0"
     },
-    "gitHead": "85796c96f904126c372f8e5bc6bea3db1c955aa8"
+    "gitHead": "c5fbc9b942368afc0e6835ca3f3747b1e4510182"
 }