@cornerstonejs/adapters 2.7.4 → 2.8.1

package/dist/esm/adapters/Cornerstone/Segmentation_4X.d.ts

@@ -10,4 +10,4 @@ declare namespace Segmentation {
 }
 export function fillSegmentation(segmentation: any, inputLabelmaps3D: any, userOptions?: {}): object;
 export function generateSegmentation(images: object[], inputLabelmaps3D: any | any[], userOptions?: any): Blob;
-export function generateToolState(imageIds: string[], arrayBuffer: ArrayBuffer, metadataProvider: any, options: obj): [];
+export function generateToolState(referencedImageIds: string[], arrayBuffer: ArrayBuffer, metadataProvider: any, options: obj): [];

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

@@ -167,7 +167,7 @@ function _createSegFromImages(images, isMultiframe, options) {
  * generateToolState - Given a set of cornerstoneTools imageIds and a Segmentation buffer,
  * derive cornerstoneTools toolState and brush metadata.
  *
- * @param  {string[]} imageIds - An array of the imageIds.
+ * @param  {string[]} referencedImageIds - An array for referenced image imageIds.
  * @param  {ArrayBuffer} arrayBuffer - The SEG arrayBuffer.
  * @param  {*} metadataProvider.
  * @param  {obj} options - Options object.
@@ -332,18 +332,18 @@ function generateToolState(_x, _x2, _x3, _x4) {
  * @returns {String}     Returns the imageId
  */
 function _generateToolState() {
-  _generateToolState = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(imageIds, arrayBuffer, metadataProvider, options) {
-    var _options$skipOverlapp, skipOverlapping, _options$tolerance, tolerance, _options$TypedArrayCo, TypedArrayConstructor, _options$maxBytesPerC, maxBytesPerChunk, eventTarget, triggerEvent, dicomData, dataset, multiframe, imagePlaneModule, generalSeriesModule, SeriesInstanceUID, ImageOrientationPatient, validOrientations, sliceLength, segMetadata, TransferSyntaxUID, pixelData, pixelDataChunks, rleEncodedFrames, orientation, sopUIDImageIdIndexMap, overlapping, insertFunction, segmentsOnFrameArray, segmentsOnFrame, arrayBufferLength, labelmapBufferArray, imageIdMaps, segmentsPixelIndices, overlappingSegments, centroidXYZ;
+  _generateToolState = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(referencedImageIds, arrayBuffer, metadataProvider, options) {
+    var _options$skipOverlapp, skipOverlapping, _options$tolerance, tolerance, _options$TypedArrayCo, TypedArrayConstructor, _options$maxBytesPerC, maxBytesPerChunk, _options$eventTarget, eventTarget, _options$triggerEvent, triggerEvent, dicomData, dataset, multiframe, imagePlaneModule, generalSeriesModule, SeriesInstanceUID, ImageOrientationPatient, validOrientations, sliceLength, segMetadata, TransferSyntaxUID, pixelData, pixelDataChunks, rleEncodedFrames, orientation, sopUIDImageIdIndexMap, overlapping, insertFunction, segmentsOnFrameArray, segmentsOnFrame, arrayBufferLength, labelmapBufferArray, imageIdMaps, segmentsPixelIndices, overlappingSegments, centroidXYZ;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _options$skipOverlapp = options.skipOverlapping, skipOverlapping = _options$skipOverlapp === void 0 ? false : _options$skipOverlapp, _options$tolerance = options.tolerance, tolerance = _options$tolerance === void 0 ? 1e-3 : _options$tolerance, _options$TypedArrayCo = options.TypedArrayConstructor, TypedArrayConstructor = _options$TypedArrayCo === void 0 ? Uint8Array : _options$TypedArrayCo, _options$maxBytesPerC = options.maxBytesPerChunk, maxBytesPerChunk = _options$maxBytesPerC === void 0 ? 199000000 : _options$maxBytesPerC, eventTarget = options.eventTarget, triggerEvent = options.triggerEvent;
+          _options$skipOverlapp = options.skipOverlapping, skipOverlapping = _options$skipOverlapp === void 0 ? false : _options$skipOverlapp, _options$tolerance = options.tolerance, tolerance = _options$tolerance === void 0 ? 1e-3 : _options$tolerance, _options$TypedArrayCo = options.TypedArrayConstructor, TypedArrayConstructor = _options$TypedArrayCo === void 0 ? Uint8Array : _options$TypedArrayCo, _options$maxBytesPerC = options.maxBytesPerChunk, maxBytesPerChunk = _options$maxBytesPerC === void 0 ? 199000000 : _options$maxBytesPerC, _options$eventTarget = options.eventTarget, eventTarget = _options$eventTarget === void 0 ? null : _options$eventTarget, _options$triggerEvent = options.triggerEvent, triggerEvent = _options$triggerEvent === void 0 ? null : _options$triggerEvent;
           dicomData = DicomMessage.readFile(arrayBuffer);
           dataset = DicomMetaDictionary.naturalizeDataset(dicomData.dict);
           dataset._meta = DicomMetaDictionary.namifyDataset(dicomData.meta);
           multiframe = Normalizer.normalizeToDataset([dataset]);
-          imagePlaneModule = metadataProvider.get("imagePlaneModule", imageIds[0]);
-          generalSeriesModule = metadataProvider.get("generalSeriesModule", imageIds[0]);
+          imagePlaneModule = metadataProvider.get("imagePlaneModule", referencedImageIds[0]);
+          generalSeriesModule = metadataProvider.get("generalSeriesModule", referencedImageIds[0]);
           SeriesInstanceUID = generalSeriesModule.seriesInstanceUID;
           if (!imagePlaneModule) {
             console.warn("Insufficient metadata, imagePlaneModule missing.");
@@ -380,10 +380,10 @@ function _generateToolState() {
           }
           throw new Error("Fractional segmentations are not yet supported");
         case 26:
-          orientation = checkOrientation(multiframe, validOrientations, [imagePlaneModule.rows, imagePlaneModule.columns, imageIds.length], tolerance); // Pre-compute the sop UID to imageId index map so that in the for loop
+          orientation = checkOrientation(multiframe, validOrientations, [imagePlaneModule.rows, imagePlaneModule.columns, referencedImageIds.length], tolerance); // Pre-compute the sop UID to imageId index map so that in the for loop
           // we don't have to call metadataProvider.get() for each imageId over
           // and over again.
-          sopUIDImageIdIndexMap = imageIds.reduce(function (acc, imageId) {
+          sopUIDImageIdIndexMap = referencedImageIds.reduce(function (acc, imageId) {
             var _metadataProvider$get = metadataProvider.get("generalImageModule", imageId),
               sopInstanceUID = _metadataProvider$get.sopInstanceUID;
             acc[sopInstanceUID] = imageId;
@@ -391,7 +391,7 @@ function _generateToolState() {
           }, {});
           overlapping = false;
           if (!skipOverlapping) {
-            overlapping = checkSEGsOverlapping(pixelDataChunks, multiframe, imageIds, validOrientations, metadataProvider, tolerance, TypedArrayConstructor, sopUIDImageIdIndexMap);
+            overlapping = checkSEGsOverlapping(pixelDataChunks, multiframe, referencedImageIds, validOrientations, metadataProvider, tolerance, TypedArrayConstructor, sopUIDImageIdIndexMap);
           }
           _context.t0 = orientation;
           _context.next = _context.t0 === "Planar" ? 33 : _context.t0 === "Perpendicular" ? 35 : _context.t0 === "Oblique" ? 36 : 37;
@@ -416,13 +416,13 @@ function _generateToolState() {
           segmentsOnFrameArray = [];
           segmentsOnFrameArray[0] = [];
           segmentsOnFrame = [];
-          arrayBufferLength = sliceLength * imageIds.length * TypedArrayConstructor.BYTES_PER_ELEMENT;
+          arrayBufferLength = sliceLength * referencedImageIds.length * TypedArrayConstructor.BYTES_PER_ELEMENT;
           labelmapBufferArray = [];
           labelmapBufferArray[0] = new ArrayBuffer(arrayBufferLength);
 
           // Pre-compute the indices and metadata so that we don't have to call
           // a function for each imageId in the for loop.
-          imageIdMaps = imageIds.reduce(function (acc, curr, index) {
+          imageIdMaps = referencedImageIds.reduce(function (acc, curr, index) {
             acc.indices[curr] = index;
             acc.metadata[curr] = metadataProvider.get("instance", curr);
             return acc;
@@ -435,13 +435,13 @@ function _generateToolState() {
           // segment in the labelmapBuffer
           segmentsPixelIndices = new Map();
           _context.next = 47;
-          return insertFunction(segmentsOnFrame, segmentsOnFrameArray, labelmapBufferArray, pixelDataChunks, multiframe, imageIds, validOrientations, metadataProvider, tolerance, TypedArrayConstructor, segmentsPixelIndices, sopUIDImageIdIndexMap, imageIdMaps, eventTarget, triggerEvent);
+          return insertFunction(segmentsOnFrame, segmentsOnFrameArray, labelmapBufferArray, pixelDataChunks, multiframe, referencedImageIds, validOrientations, metadataProvider, tolerance, TypedArrayConstructor, segmentsPixelIndices, sopUIDImageIdIndexMap, imageIdMaps, eventTarget, triggerEvent);
         case 47:
           overlappingSegments = _context.sent;
           // calculate the centroid of each segment
           centroidXYZ = new Map();
           segmentsPixelIndices.forEach(function (imageIdIndexBufferIndex, segmentIndex) {
-            var centroids = calculateCentroid(imageIdIndexBufferIndex, multiframe, metadataProvider, imageIds);
+            var centroids = calculateCentroid(imageIdIndexBufferIndex, multiframe, metadataProvider, referencedImageIds);
             centroidXYZ.set(segmentIndex, centroids);
           });
           return _context.abrupt("return", {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cornerstonejs/adapters",
-    "version": "2.7.4",
+    "version": "2.8.1",
     "description": "Adapters for Cornerstone3D to/from formats including DICOM SR and others",
     "module": "./dist/esm/index.js",
     "types": "./dist/esm/index.d.ts",
@@ -84,8 +84,8 @@
         "ndarray": "^1.0.19"
     },
     "peerDependencies": {
-        "@cornerstonejs/core": "^2.7.4",
-        "@cornerstonejs/tools": "^2.7.4"
+        "@cornerstonejs/core": "^2.8.1",
+        "@cornerstonejs/tools": "^2.8.1"
     },
-    "gitHead": "d386daf61a0fe0fb2f049e8456c3497839e7e4fa"
+    "gitHead": "1e0cd54783c405d4a72e2b23d7d519873d0c71da"
 }