fix(bugs): enhancements and bugs in several areas (#4086)

extensions/cornerstone-dicom-rt/src/utils/promptHydrateRT.ts

@@ -15,23 +15,28 @@ function promptHydrateRT({
   hydrateRTDisplaySet,
 }) {
   const { uiViewportDialogService } = servicesManager.services;
-
+  const extensionManager = servicesManager._extensionManager;
+  const appConfig = extensionManager._appConfig;
   return new Promise(async function (resolve, reject) {
-    const promptResult = await _askHydrate(uiViewportDialogService, viewportId);
+    const promptResult = appConfig?.disableConfirmationPrompts
+      ? RESPONSE.HYDRATE_SEG
+      : await _askHydrate(uiViewportDialogService, viewportId);
 
     if (promptResult === RESPONSE.HYDRATE_SEG) {
       preHydrateCallbacks?.forEach(callback => {
         callback();
       });
 
-      const isHydrated = await hydrateRTDisplaySet({
-        rtDisplaySet,
-        viewportId,
-        toolGroupId,
-        servicesManager,
-      });
+      window.setTimeout(async () => {
+        const isHydrated = await hydrateRTDisplaySet({
+          rtDisplaySet,
+          viewportId,
+          toolGroupId,
+          servicesManager,
+        });
 
-      resolve(isHydrated);
+        resolve(isHydrated);
+      }, 0);
     }
   });
 }

extensions/cornerstone-dicom-seg/src/commandsModule.ts

@@ -258,9 +258,12 @@ const commandsModule = ({
       labelmapObj.metadata = [];
 
       const segmentationInOHIF = segmentationService.getSegmentation(segmentationId);
-      labelmapObj.segmentsOnLabelmap.forEach(segmentIndex => {
+      segmentationInOHIF.segments.forEach(segment => {
         // segmentation service already has a color for each segment
-        const segment = segmentationInOHIF?.segments[segmentIndex];
+        if (!segment) {
+          return;
+        }
+        const segmentIndex = segment.segmentIndex;
         const { label, color } = segment;
 
         const RecommendedDisplayCIELabValue = dcmjs.data.Colors.rgb2DICOMLAB(

extensions/cornerstone-dicom-seg/src/utils/promptHydrateSEG.ts

@@ -14,21 +14,27 @@ function promptHydrateSEG({
   hydrateSEGDisplaySet,
 }) {
   const { uiViewportDialogService } = servicesManager.services;
+  const extensionManager = servicesManager._extensionManager;
+  const appConfig = extensionManager._appConfig;
 
   return new Promise(async function (resolve, reject) {
-    const promptResult = await _askHydrate(uiViewportDialogService, viewportId);
+    const promptResult = appConfig?.disableConfirmationPrompts
+      ? RESPONSE.HYDRATE_SEG
+      : await _askHydrate(uiViewportDialogService, viewportId);
 
     if (promptResult === RESPONSE.HYDRATE_SEG) {
       preHydrateCallbacks?.forEach(callback => {
         callback();
       });
 
-      const isHydrated = await hydrateSEGDisplaySet({
-        segDisplaySet,
-        viewportId,
-      });
+      window.setTimeout(async () => {
+        const isHydrated = await hydrateSEGDisplaySet({
+          segDisplaySet,
+          viewportId,
+        });
 
-      resolve(isHydrated);
+        resolve(isHydrated);
+      }, 0);
     }
   });
 }

extensions/cornerstone/src/Viewport/Overlays/CustomizableViewportOverlay.tsx

@@ -137,20 +137,8 @@ function CustomizableViewportOverlay({
           return;
         }
 
-        const imageData = viewport.getImageData();
+        const scale = viewport.getZoom();
 
-        if (!imageData) {
-          return;
-        }
-
-        if (camera.scale) {
-          setScale(camera.scale);
-          return;
-        }
-
-        const { spacing } = imageData;
-        // convert parallel scale to scale
-        const scale = (element.clientHeight * spacing[0] * 0.5) / camera.parallelScale;
         setScale(scale);
       }
     };

extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts

@@ -568,7 +568,7 @@ class SegmentationService extends PubSubService {
         rgba,
       } = segmentInfo;
 
-      const { x, y, z } = segDisplaySet.centroids.get(segmentIndex);
+      const { x, y, z } = segDisplaySet.centroids.get(segmentIndex) || { x: 0, y: 0, z: 0 };
       const centerWorld = derivedVolume.imageData.indexToWorld([x, y, z]);
 
       segmentation.cachedStats = {

extensions/default/src/Actions/createReportAsync.tsx

@@ -39,6 +39,7 @@ async function createReportAsync({ servicesManager, getReport, reportType = 'mea
       message: error.message || `Failed to store ${reportType}`,
       type: 'error',
     });
+    throw new Error(`Failed to store ${reportType}. Error: ${error.message || 'Unknown error'}`);
   } finally {
     uiDialogService.dismiss({ id: loadingDialogId });
   }

extensions/dicom-microscopy/src/index.tsx

@@ -99,7 +99,9 @@ const extension: Types.Extensions.Extension = {
           const { microscopyService } = servicesManager.services;
 
           const activeInteractions = microscopyService.getActiveInteractions();
-
+          if (!activeInteractions) {
+            return false;
+          }
           const isPrimaryActive = activeInteractions.find(interactions => {
             const sameMouseButton = interactions[1].bindings.mouseButtons.includes('left');
 

extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptBeginTracking.js

@@ -11,12 +11,15 @@ const RESPONSE = {
 
 function promptBeginTracking({ servicesManager, extensionManager }, ctx, evt) {
   const { uiViewportDialogService } = servicesManager.services;
+  const appConfig = extensionManager._appConfig;
   // When the state change happens after a promise, the state machine sends the retult in evt.data;
   // In case of direct transition to the state, the state machine sends the data in evt;
   const { viewportId, StudyInstanceUID, SeriesInstanceUID } = evt.data || evt;
 
   return new Promise(async function (resolve, reject) {
-    let promptResult = await _askTrackMeasurements(uiViewportDialogService, viewportId);
+    let promptResult = appConfig?.disableConfirmationPrompts
+      ? RESPONSE.SET_STUDY_AND_SERIES
+      : await _askTrackMeasurements(uiViewportDialogService, viewportId);
 
     resolve({
       userResponse: promptResult,

extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptHydrateStructuredReport.js

@@ -15,9 +15,10 @@ function promptHydrateStructuredReport({ servicesManager, extensionManager, appC
   const { uiViewportDialogService, displaySetService } = servicesManager.services;
   const { viewportId, displaySetInstanceUID } = evt;
   const srDisplaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
-
   return new Promise(async function (resolve, reject) {
-    const promptResult = await _askTrackMeasurements(uiViewportDialogService, viewportId);
+    const promptResult = appConfig?.disableConfirmationPrompts
+      ? RESPONSE.HYDRATE_REPORT
+      : await _askTrackMeasurements(uiViewportDialogService, viewportId);
 
     // Need to do action here... So we can set state...
     let StudyInstanceUID, SeriesInstanceUIDs;

extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptSaveReport.js

@@ -2,7 +2,7 @@ import { createReportAsync, createReportDialogPrompt } from '@ohif/extension-def
 import getNextSRSeriesNumber from '../../_shared/getNextSRSeriesNumber';
 import RESPONSE from '../../_shared/PROMPT_RESPONSES';
 
-function promptSaveReport({ servicesManager, commandsManager, extensionManager }, ctx, evt) {
+async function promptSaveReport({ servicesManager, commandsManager, extensionManager }, ctx, evt) {
   const { uiDialogService, measurementService, displaySetService } = servicesManager.services;
   const viewportId = evt.viewportId === undefined ? evt.data.viewportId : evt.viewportId;
   const isBackupSave = evt.isBackupSave === undefined ? evt.data.isBackupSave : evt.isBackupSave;
@@ -12,8 +12,7 @@ function promptSaveReport({ servicesManager, commandsManager, extensionManager }
   const { trackedStudy, trackedSeries } = ctx;
   let displaySetInstanceUIDs;
 
-  return new Promise(async function (resolve, reject) {
-    // TODO: Fallback if (uiDialogService) {
+  try {
     const promptResult = await createReportDialogPrompt(uiDialogService, {
       extensionManager,
     });
@@ -57,15 +56,17 @@ function promptSaveReport({ servicesManager, commandsManager, extensionManager }
       // Do nothing
     }
 
-    resolve({
+    return {
       userResponse: promptResult.action,
       createdDisplaySetInstanceUIDs: displaySetInstanceUIDs,
       StudyInstanceUID,
       SeriesInstanceUID,
       viewportId,
       isBackupSave,
-    });
-  });
+    };
+  } catch (error) {
+    return null;
+  }
 }
 
 export default promptSaveReport;

extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptTrackNewStudy.js

@@ -11,12 +11,15 @@ const RESPONSE = {
 
 function promptTrackNewStudy({ servicesManager, extensionManager }, ctx, evt) {
   const { UIViewportDialogService } = servicesManager.services;
+  const appConfig = extensionManager._appConfig;
   // When the state change happens after a promise, the state machine sends the retult in evt.data;
   // In case of direct transition to the state, the state machine sends the data in evt;
   const { viewportId, StudyInstanceUID, SeriesInstanceUID } = evt.data || evt;
 
   return new Promise(async function (resolve, reject) {
-    let promptResult = await _askTrackMeasurements(UIViewportDialogService, viewportId);
+    let promptResult = appConfig?.disableConfirmationPrompts
+      ? RESPONSE.SET_STUDY_AND_SERIES
+      : await _askTrackMeasurements(UIViewportDialogService, viewportId);
 
     if (promptResult === RESPONSE.SET_STUDY_AND_SERIES) {
       promptResult = ctx.isDirty