@ohif/app 3.9.0-beta.22 → 3.9.0-beta.24

package/dist/{117.bundle.772ce244eee25d9b7316.js → 117.bundle.ba41cf7978afb629dcff.js}

@@ -7,7 +7,7 @@
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-async function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds, immediateRender = false, suppressEvents = false) {
+async function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds) {
     for (const viewportId of viewportIds) {
         const viewport = renderingEngine.getViewport(viewportId);
         if (!viewport) {
@@ -20,7 +20,7 @@ async function addImageSlicesToViewports(renderingEngine, stackInputs, viewportI
     }
     const addStackPromises = viewportIds.map(async (viewportId) => {
         const viewport = renderingEngine.getViewport(viewportId);
-        return viewport.addImages(stackInputs, immediateRender, suppressEvents);
+        return viewport.addImages(stackInputs);
     });
     await Promise.all(addStackPromises);
 }
@@ -656,12 +656,24 @@ function createAndCacheDerivedImage(referencedImageId, options = {}, preventCach
     const { TypedArrayConstructor } = (0,_utilities__WEBPACK_IMPORTED_MODULE_4__.getBufferConfiguration)(options.targetBufferType, length);
     const imageScalarData = new TypedArrayConstructor(skipCreateBuffer ? 1 : length);
     const derivedImageId = imageId;
-    ['imagePixelModule', 'imagePlaneModule', 'generalSeriesModule'].forEach((type) => {
+    ['imagePlaneModule', 'generalSeriesModule'].forEach((type) => {
         _utilities__WEBPACK_IMPORTED_MODULE_4__.genericMetadataProvider.add(derivedImageId, {
             type,
             metadata: ___WEBPACK_IMPORTED_MODULE_6__.metaData.get(type, referencedImageId),
         });
     });
+    const imagePixelModule = ___WEBPACK_IMPORTED_MODULE_6__.metaData.get('imagePixelModule', referencedImageId);
+    _utilities__WEBPACK_IMPORTED_MODULE_4__.genericMetadataProvider.add(derivedImageId, {
+        type: 'imagePixelModule',
+        metadata: {
+            ...imagePixelModule,
+            bitsAllocated: 8,
+            bitsStored: 8,
+            highBit: 7,
+            samplesPerPixel: 1,
+            pixelRepresentation: 0,
+        },
+    });
     const localImage = createAndCacheLocalImage({ scalarData: imageScalarData, onCacheAdd, skipCreateBuffer }, imageId, true);
     const imageLoadObject = {
         promise: Promise.resolve(localImage),
@@ -3057,6 +3069,7 @@ class BidirectionalTool extends _base__WEBPACK_IMPORTED_MODULE_4__/* .Annotation
                 viewUp: [...viewUp],
                 FrameOfReferenceUID,
                 referencedImageId,
+                ...viewport.getViewReference({ points: [worldPos] }),
             },
             data: {
                 handles: {

package/dist/{129.bundle.6d295bd7fb0e53fe8cea.js → 129.bundle.a95b9a51ee8d9f0abbd8.js}

@@ -880,7 +880,7 @@ var ImageData = __webpack_require__(51250);
  * @param params.viewportId - ID of the viewport to be updated.
  * @param params.loadFn - Function to load the segmentation data.
  * @param params.servicesManager - The services manager.
- * @param params.referencedDisplaySetInstanceUID - Optional UID for the referenced display set instance.
+ * @param params.displaySet -  the display set.
  *
  * @returns Returns true upon successful update of viewports for segmentation rendering.
  */
@@ -888,7 +888,7 @@ async function updateViewportsForSegmentationRendering({
   viewportId,
   loadFn,
   servicesManager,
-  referencedDisplaySetInstanceUID
+  displaySet
 }) {
   const {
     cornerstoneViewportService,
@@ -900,11 +900,11 @@ async function updateViewportsForSegmentationRendering({
     viewportGridService
   });
   const targetViewportId = viewport.viewportOptions.viewportId;
-  referencedDisplaySetInstanceUID = referencedDisplaySetInstanceUID || viewport?.displaySetInstanceUIDs[0];
+  const referencedDisplaySetInstanceUID = displaySet?.referencedDisplaySetInstanceUID || viewport?.displaySetInstanceUIDs[0];
   const updatedViewports = getUpdatedViewportsForSegmentation({
     servicesManager,
     viewportId,
-    referencedDisplaySetInstanceUID
+    displaySet
   });
 
   // create Segmentation callback which needs to be waited until
@@ -920,7 +920,7 @@ async function updateViewportsForSegmentationRendering({
   updatedViewports.forEach(async viewport => {
     viewport.viewportOptions = {
       ...viewport.viewportOptions,
-      viewportType: 'volume',
+      viewportType: displaySet?.Modality === 'RTSTRUCT' ? 'stack' : 'volume',
       needsRerendering: true
     };
     const viewportId = viewport.viewportId;
@@ -929,7 +929,7 @@ async function updateViewportsForSegmentationRendering({
 
     // only run the createSegmentationForVolume for the targetViewportId
     // since the rest will get handled by cornerstoneViewportService
-    if (volumeExists && viewportId === targetViewportId) {
+    if ((volumeExists || displaySet.Modality === 'RTSTRUCT') && viewportId === targetViewportId) {
       await createSegmentationForVolume();
       return;
     }
@@ -978,14 +978,14 @@ const getTargetViewport = ({
  * @param {Object} params - Parameters for the function.
  * @param params.viewportId - the ID of the viewport to be updated.
  * @param params.servicesManager - The services manager
- * @param params.referencedDisplaySetInstanceUID - Optional UID for the referenced display set instance.
+ * @param params.displaySet -  the display set.
  *
  * @returns {Array} Returns an array of viewports that require updates for segmentation rendering.
  */
 function getUpdatedViewportsForSegmentation({
   viewportId,
   servicesManager,
-  referencedDisplaySetInstanceUID
+  displaySet
 }) {
   const {
     hangingProtocolService,
@@ -1003,7 +1003,7 @@ function getUpdatedViewportsForSegmentation({
   });
   const targetViewportId = viewport.viewportOptions.viewportId;
   const displaySetInstanceUIDs = viewports.get(targetViewportId).displaySetInstanceUIDs;
-  const referenceDisplaySetInstanceUID = referencedDisplaySetInstanceUID || displaySetInstanceUIDs[0];
+  const referenceDisplaySetInstanceUID = displaySet?.referencedDisplaySetInstanceUID || displaySetInstanceUIDs[0];
   const referencedDisplaySet = displaySetService.getDisplaySetByUID(referenceDisplaySetInstanceUID);
   const segmentationFrameOfReferenceUID = referencedDisplaySet.instances[0].FrameOfReferenceUID;
   const updatedViewports = hangingProtocolService.getViewportsRequireUpdate(targetViewportId, referenceDisplaySetInstanceUID, isHangingProtocolLayout);
@@ -1017,7 +1017,7 @@ function getUpdatedViewportsForSegmentation({
         viewportId,
         displaySetInstanceUIDs: viewport.displaySetInstanceUIDs,
         viewportOptions: {
-          viewportType: 'volume',
+          viewportType: displaySet.Modality === 'RTSTRUCT' ? 'stack' : 'volume',
           needsRerendering: true
         }
       });
@@ -1225,7 +1225,7 @@ const commandsModule = ({
       updateViewportsForSegmentationRendering({
         viewportId,
         servicesManager,
-        referencedDisplaySetInstanceUID: displaySet.referencedDisplaySetInstanceUID,
+        displaySet,
         loadFn: async () => {
           const segDisplaySet = displaySet;
           const suppressEvents = false;

package/dist/{139.bundle.737ae06ef5dea8ea26a1.js → 139.bundle.679c4baad7c7f65ebabd.js}

@@ -83,7 +83,7 @@ function CornerstoneImageScrollbar({
       const imageIndex = viewport.getCurrentImageIdIndex();
       setImageSliceData({
         imageIndex: imageIndex,
-        numberOfSlices: viewportData.data.imageIds.length
+        numberOfSlices: viewportData.data[0].imageIds.length
       });
       return;
     }
@@ -113,7 +113,7 @@ function CornerstoneImageScrollbar({
       // find the index of imageId in the imageIds
       setImageSliceData({
         imageIndex: newImageIdIndex,
-        numberOfSlices: viewportData.data.imageIds.length
+        numberOfSlices: viewportData.data[0].imageIds.length
       });
     };
     element.addEventListener(dist_esm.Enums.Events.STACK_VIEWPORT_SCROLL, updateStackIndex);
@@ -468,7 +468,7 @@ function CustomizableViewportOverlay({
 function _getViewportInstances(viewportData) {
   const imageIds = [];
   if (viewportData.viewportType === dist_esm.Enums.ViewportType.STACK) {
-    imageIds.push(viewportData.data.imageIds[0]);
+    imageIds.push(viewportData.data[0].imageIds[0]);
   } else if (viewportData.viewportType === dist_esm.Enums.ViewportType.ORTHOGRAPHIC) {
     const volumes = viewportData.data;
     volumes.forEach(volume => {
@@ -498,7 +498,7 @@ const getInstanceNumber = (viewportData, viewportId, imageIndex, cornerstoneView
   return instanceNumber ?? null;
 };
 function _getInstanceNumberFromStack(viewportData, imageIndex) {
-  const imageIds = viewportData.data.imageIds;
+  const imageIds = viewportData.data[0].imageIds;
   const imageId = imageIds[imageIndex];
   if (!imageId) {
     return;
@@ -693,7 +693,7 @@ function ViewportOrientationMarkers({
     let rowCosines, columnCosines;
     if (viewportData.viewportType === 'stack') {
       const imageIndex = imageSliceData.imageIndex;
-      const imageId = viewportData.data.imageIds?.[imageIndex];
+      const imageId = viewportData.data[0].imageIds?.[imageIndex];
 
       // Workaround for below TODO stub
       if (!imageId) {

package/dist/{164.bundle.3221590f5e6855086889.js → 164.bundle.79cc35bc3e6b792636cd.js}

@@ -7,7 +7,7 @@
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-async function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds, immediateRender = false, suppressEvents = false) {
+async function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds) {
     for (const viewportId of viewportIds) {
         const viewport = renderingEngine.getViewport(viewportId);
         if (!viewport) {
@@ -20,7 +20,7 @@ async function addImageSlicesToViewports(renderingEngine, stackInputs, viewportI
     }
     const addStackPromises = viewportIds.map(async (viewportId) => {
         const viewport = renderingEngine.getViewport(viewportId);
-        return viewport.addImages(stackInputs, immediateRender, suppressEvents);
+        return viewport.addImages(stackInputs);
     });
     await Promise.all(addStackPromises);
 }
@@ -647,12 +647,24 @@ function createAndCacheDerivedImage(referencedImageId, options = {}, preventCach
     const { TypedArrayConstructor } = (0,_utilities__WEBPACK_IMPORTED_MODULE_4__.getBufferConfiguration)(options.targetBufferType, length);
     const imageScalarData = new TypedArrayConstructor(skipCreateBuffer ? 1 : length);
     const derivedImageId = imageId;
-    ['imagePixelModule', 'imagePlaneModule', 'generalSeriesModule'].forEach((type) => {
+    ['imagePlaneModule', 'generalSeriesModule'].forEach((type) => {
         _utilities__WEBPACK_IMPORTED_MODULE_4__.genericMetadataProvider.add(derivedImageId, {
             type,
             metadata: ___WEBPACK_IMPORTED_MODULE_6__.metaData.get(type, referencedImageId),
         });
     });
+    const imagePixelModule = ___WEBPACK_IMPORTED_MODULE_6__.metaData.get('imagePixelModule', referencedImageId);
+    _utilities__WEBPACK_IMPORTED_MODULE_4__.genericMetadataProvider.add(derivedImageId, {
+        type: 'imagePixelModule',
+        metadata: {
+            ...imagePixelModule,
+            bitsAllocated: 8,
+            bitsStored: 8,
+            highBit: 7,
+            samplesPerPixel: 1,
+            pixelRepresentation: 0,
+        },
+    });
     const localImage = createAndCacheLocalImage({ scalarData: imageScalarData, onCacheAdd, skipCreateBuffer }, imageId, true);
     const imageLoadObject = {
         promise: Promise.resolve(localImage),
@@ -2324,6 +2336,7 @@ class BidirectionalTool extends _base__WEBPACK_IMPORTED_MODULE_4__/* .Annotation
                 viewUp: [...viewUp],
                 FrameOfReferenceUID,
                 referencedImageId,
+                ...viewport.getViewReference({ points: [worldPos] }),
             },
             data: {
                 handles: {

package/dist/{236.bundle.d3a631d79ee8952e3c60.js → 236.bundle.343bcd0be60d0ae61901.js}

@@ -2770,7 +2770,7 @@ function _imageChangeEventListener(evt) {
                         imageActor.getMapper().setInputData(imageData);
                     },
                 },
-            ], true, false);
+            ]);
             (0,triggerSegmentationRender/* default */.Ay)(toolGroup.id);
             return;
         }
@@ -13061,6 +13061,7 @@ class AngleTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .AnnotationTool */
                     viewUp: [...viewUp],
                     FrameOfReferenceUID,
                     referencedImageId,
+                    ...viewport.getViewReference({ points: [worldPos] }),
                 },
                 data: {
                     handles: {
@@ -13528,6 +13529,7 @@ class ArrowAnnotateTool extends _base__WEBPACK_IMPORTED_MODULE_2__/* .Annotation
                     viewUp: [...viewUp],
                     FrameOfReferenceUID,
                     referencedImageId,
+                    ...viewport.getViewReference({ points: [worldPos] }),
                 },
                 data: {
                     text: '',
@@ -14599,6 +14601,7 @@ class BidirectionalTool extends _base__WEBPACK_IMPORTED_MODULE_4__/* .Annotation
                 viewUp: [...viewUp],
                 FrameOfReferenceUID,
                 referencedImageId,
+                ...viewport.getViewReference({ points: [worldPos] }),
             },
             data: {
                 handles: {
@@ -14751,6 +14754,7 @@ class CircleROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .AnnotationTool
                     viewUp: [...viewUp],
                     FrameOfReferenceUID,
                     referencedImageId,
+                    ...viewport.getViewReference({ points: [worldPos] }),
                 },
                 data: {
                     label: '',
@@ -15361,6 +15365,7 @@ class CobbAngleTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .AnnotationTool
                     viewUp: [...viewUp],
                     FrameOfReferenceUID,
                     referencedImageId,
+                    ...viewport.getViewReference({ points: [worldPos] }),
                 },
                 data: {
                     handles: {
@@ -16231,6 +16236,7 @@ class EllipticalROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .Annotation
                     viewUp: [...viewUp],
                     FrameOfReferenceUID,
                     referencedImageId,
+                    ...viewport.getViewReference({ points: [worldPos] }),
                 },
                 data: {
                     label: '',
@@ -18642,6 +18648,7 @@ class RectangleROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .AnnotationT
                     viewUp: [...viewUp],
                     FrameOfReferenceUID,
                     referencedImageId,
+                    ...viewport.getViewReference({ points: [worldPos] }),
                 },
                 data: {
                     label: '',