@ohif/app 3.7.0-beta.42 → 3.7.0-beta.43

package/dist/{236.bundle.a2c84f9a7c7c704ca47b.js → 236.bundle.3c5f844ce9de4ec0777d.js}

@@ -2613,7 +2613,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return Promise.all(/* import() */[__webpack_require__.e(899), __webpack_require__.e(754), __webpack_require__.e(604), __webpack_require__.e(417), __webpack_require__.e(23), __webpack_require__.e(821), __webpack_require__.e(250)]).then(__webpack_require__.bind(__webpack_require__, 76516));
+  return Promise.all(/* import() */[__webpack_require__.e(754), __webpack_require__.e(604), __webpack_require__.e(417), __webpack_require__.e(23), __webpack_require__.e(821), __webpack_require__.e(250)]).then(__webpack_require__.bind(__webpack_require__, 76516));
 });
 const MicroscopyViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {

package/dist/{663.bundle.24e14d035c31bc67a1af.js → 663.bundle.2dcb8a60d59464f4e563.js}

@@ -486,8 +486,8 @@ function _getRenderableData(GraphicType, GraphicData, imageId, TrackingIdentifie
   }
   return renderableData;
 }
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/@cornerstonejs/adapters.es.js
-var adapters_es = __webpack_require__(47195);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
+var adapters_es = __webpack_require__(91202);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/isRehydratable.js
 
 const cornerstoneAdapters = adapters_es.adaptersSR.Cornerstone3D.MeasurementReport.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE;
@@ -1609,8 +1609,8 @@ function getLabelFromDCMJSImportedToolData(toolData) {
     return finding.CodeMeaning;
   }
 }
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/@cornerstonejs/adapters.es.js
-var adapters_es = __webpack_require__(47195);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/adapters/dist/adapters.es.js
+var adapters_es = __webpack_require__(91202);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.js
 
 

package/dist/{678.bundle.efd4a623a9d1bf0aa918.js → 678.bundle.13062f7926c30056aee1.js}

@@ -6705,11 +6705,11 @@ class SegmentationService extends src/* PubSubService */.hC {
       return this.addOrUpdateSegmentation(Object.assign(segmentation, cachedSegmentation), suppressEvents);
     }
     const {
-      segments,
+      labelmapBufferArray,
       referencedVolumeId
     } = segDisplaySet;
-    if (!segments || !referencedVolumeId) {
-      throw new Error('To create the segmentation from SEG displaySet, the displaySet should be loaded first, you can perform segDisplaySet.load() before calling this method.');
+    if (!labelmapBufferArray || !referencedVolumeId) {
+      throw new Error('No labelmapBufferArray or referencedVolumeId found for the SEG displaySet');
     }
 
     // if the labelmap doesn't exist, we need to create it first from the
@@ -6728,72 +6728,27 @@ class SegmentationService extends src/* PubSubService */.hC {
         sharedArrayBuffer: true
       }
     });
-    const [rows, columns] = derivedVolume.dimensions;
     const derivedVolumeScalarData = derivedVolume.getScalarData();
-    const {
-      imageIds
-    } = referencedVolume;
-    const sopUIDImageIdIndexMap = imageIds.reduce((acc, imageId, index) => {
-      const {
-        sopInstanceUid
-      } = esm.metaData.get('generalImageModule', imageId);
-      acc[sopInstanceUid] = index;
-      return acc;
-    }, {});
-    const numSegments = Object.keys(segments).length;
-    // Note: ideally we could use the TypedArray set method, but since each
-    // slice can have multiple segments, we need to loop over each slice and
-    // set the segment value for each segment.
-    let overlappingSegments = false;
-    const _segmentInfoUpdate = (segmentInfo, segmentIndex) => {
+    const segmentsInfo = segDisplaySet.segMetadata.data;
+    derivedVolumeScalarData.set(new Uint8Array(labelmapBufferArray[0]));
+    segmentation.segments = segmentsInfo.map((segmentInfo, segmentIndex) => {
+      if (segmentIndex === 0) {
+        return;
+      }
       const {
-        pixelData: segPixelData
+        SegmentedPropertyCategoryCodeSequence,
+        SegmentNumber,
+        SegmentLabel,
+        SegmentAlgorithmType,
+        SegmentAlgorithmName,
+        SegmentedPropertyTypeCodeSequence,
+        rgba
       } = segmentInfo;
-      let segmentX = 0;
-      let segmentY = 0;
-      let segmentZ = 0;
-      let count = 0;
-      for (const [functionalGroupIndex, functionalGroup] of segmentInfo.functionalGroups.entries()) {
-        const {
-          ReferencedSOPInstanceUID
-        } = functionalGroup.DerivationImageSequence.SourceImageSequence;
-        const imageIdIndex = sopUIDImageIdIndexMap[ReferencedSOPInstanceUID];
-        if (imageIdIndex === -1) {
-          return;
-        }
-        const step = rows * columns;
-
-        // we need a faster way to get the pixel data for the current
-        // functional group, which we use typed array view
-
-        const functionGroupPixelData = new Uint8Array(segPixelData.buffer, functionalGroupIndex * step, step);
-        const functionalGroupStartIndex = imageIdIndex * step;
-        const functionalGroupEndIndex = (imageIdIndex + 1) * step;
-
-        // Note: this for loop is not optimized, since DICOM SEG stores
-        // each segment as a separate labelmap so if there is a slice
-        // that has multiple segments, we will have to loop over each
-        // segment and we cannot use the TypedArray set method.
-        for (let i = functionalGroupStartIndex, j = 0; i < functionalGroupEndIndex; i++, j++) {
-          if (functionGroupPixelData[j] !== 0) {
-            if (derivedVolumeScalarData[i] !== 0) {
-              overlappingSegments = true;
-            }
-            derivedVolumeScalarData[i] = segmentIndex;
-
-            // centroid calculations
-            segmentX += i % columns;
-            segmentY += Math.floor(i / columns) % rows;
-            segmentZ += Math.floor(i / (columns * rows));
-            count++;
-          }
-        }
-      }
-
-      // centroid calculations
-      const x = Math.floor(segmentX / count);
-      const y = Math.floor(segmentY / count);
-      const z = Math.floor(segmentZ / count);
+      const {
+        x,
+        y,
+        z
+      } = segDisplaySet.centroids.get(segmentIndex);
       const centerWorld = derivedVolume.imageData.indexToWorld([x, y, z]);
       segmentation.cachedStats = {
         ...segmentation.cachedStats,
@@ -6808,51 +6763,24 @@ class SegmentationService extends src/* PubSubService */.hC {
           }
         }
       };
-      const numInitialized = Object.keys(segmentation.cachedStats.segmentCenter).length;
-
-      // Calculate percentage completed
-      const percentComplete = Math.round(numInitialized / numSegments * 100);
-      this._broadcastEvent(SegmentationService_EVENTS.SEGMENT_LOADING_COMPLETE, {
-        percentComplete,
-        numSegments: numSegments
-      });
-    };
-    const promiseArray = [];
-    for (const segmentIndex in segments) {
-      const segmentInfo = segments[segmentIndex];
-
-      // Important: we need a non-blocking way to update the segmentation
-      // state, otherwise the UI will freeze and the user will not be able
-      // to interact with the app or progress bars will not be updated.
-      const promise = new Promise((resolve, reject) => {
-        setTimeout(() => {
-          _segmentInfoUpdate(segmentInfo, segmentIndex);
-          resolve();
-        }, 0);
-      });
-      promiseArray.push(promise);
-    }
-    await Promise.all(promiseArray);
-    segmentation.segmentCount = Object.keys(segments).length;
-    segmentation.segments = [null]; // segment 0
-
-    Object.keys(segments).forEach(segmentIndex => {
-      const segmentInfo = segments[segmentIndex];
-      const segIndex = Number(segmentIndex);
-      segmentation.segments[segIndex] = {
-        label: segmentInfo.label || `Segment ${segIndex}`,
-        segmentIndex: Number(segmentIndex),
-        color: [segmentInfo.color[0], segmentInfo.color[1], segmentInfo.color[2]],
-        opacity: segmentInfo.color[3],
+      return {
+        label: SegmentLabel || `Segment ${SegmentNumber}`,
+        segmentIndex: Number(SegmentNumber),
+        category: SegmentedPropertyCategoryCodeSequence ? SegmentedPropertyCategoryCodeSequence.CodeMeaning : '',
+        type: SegmentedPropertyTypeCodeSequence ? SegmentedPropertyTypeCodeSequence.CodeMeaning : '',
+        algorithmType: SegmentAlgorithmType,
+        algorithmName: SegmentAlgorithmName,
+        color: rgba,
+        opacity: 255,
         isVisible: true,
         isLocked: false
       };
     });
+    segmentation.segmentCount = segmentsInfo.length - 1;
     segDisplaySet.isLoaded = true;
     this._broadcastEvent(SegmentationService_EVENTS.SEGMENTATION_LOADING_COMPLETE, {
       segmentationId,
-      segDisplaySet,
-      overlappingSegments
+      segDisplaySet
     });
     return this.addOrUpdateSegmentation(segmentation, suppressEvents);
   }