fix(bugs): and replace seriesInstanceUID and seriesInstanceUIDs URL with seriesInstanceUIDs (#4049)

extensions/cornerstone/src/index.tsx

@@ -61,6 +61,24 @@ const cornerstoneExtension: Types.Extensions.Extension = {
    */
   id,
 
+  onModeEnter: ({ servicesManager }): void => {
+    const { cornerstoneViewportService, toolbarService, segmentationService } =
+      servicesManager.services;
+    toolbarService.registerEventForToolbarUpdate(cornerstoneViewportService, [
+      cornerstoneViewportService.EVENTS.VIEWPORT_DATA_CHANGED,
+    ]);
+
+    toolbarService.registerEventForToolbarUpdate(segmentationService, [
+      segmentationService.EVENTS.SEGMENTATION_ADDED,
+      segmentationService.EVENTS.SEGMENTATION_REMOVED,
+      segmentationService.EVENTS.SEGMENTATION_UPDATED,
+    ]);
+
+    toolbarService.registerEventForToolbarUpdate(cornerstone.eventTarget, [
+      cornerstoneTools.Enums.Events.TOOL_ACTIVATED,
+    ]);
+  },
+
   onModeExit: ({ servicesManager }): void => {
     const { cineService } = servicesManager.services;
     // Empty out the image load and retrieval pools to prevent memory leaks

extensions/cornerstone/src/init.tsx

@@ -99,26 +99,10 @@ export default async function init({
     uiNotificationService,
     cornerstoneViewportService,
     hangingProtocolService,
-    toolbarService,
     viewportGridService,
     stateSyncService,
-    segmentationService,
   } = servicesManager.services as CornerstoneServices;
 
-  toolbarService.registerEventForToolbarUpdate(cornerstoneViewportService, [
-    cornerstoneViewportService.EVENTS.VIEWPORT_DATA_CHANGED,
-  ]);
-
-  toolbarService.registerEventForToolbarUpdate(segmentationService, [
-    segmentationService.EVENTS.SEGMENTATION_ADDED,
-    segmentationService.EVENTS.SEGMENTATION_REMOVED,
-    segmentationService.EVENTS.SEGMENTATION_UPDATED,
-  ]);
-
-  toolbarService.registerEventForToolbarUpdate(eventTarget, [
-    cornerstoneTools.Enums.Events.TOOL_ACTIVATED,
-  ]);
-
   window.services = servicesManager.services;
   window.extensionManager = extensionManager;
   window.commandsManager = commandsManager;

extensions/cornerstone/src/services/CornerstoneCacheService/CornerstoneCacheService.ts

@@ -98,7 +98,21 @@ class CornerstoneCacheService {
     const volume = cs3DCache.getVolume(volumeId);
 
     if (volume) {
-      cs3DCache.removeVolumeLoadObject(volumeId);
+      if (volume.imageIds) {
+        // also for each imageId in the volume, remove the imageId from the cache
+        // since that will hold the old metadata as well
+
+        volume.imageIds.forEach(imageId => {
+          if (cs3DCache.getImageLoadObject(imageId)) {
+            cs3DCache.removeImageLoadObject(imageId);
+          }
+        });
+      }
+
+      // this shouldn't be via removeVolumeLoadObject, since that will
+      // remove the texture as well, but here we really just need a remove
+      // from registry so that we load it again
+      cs3DCache._volumeCache.delete(volumeId);
       this.volumeImageIds.delete(volumeId);
     }
 

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

@@ -1147,6 +1147,10 @@ class SegmentationService extends PubSubService {
 
     displaySet.isHydrated = isHydrated;
     displaySetService.setDisplaySetMetadataInvalidated(displaySetUID, false);
+
+    this._broadcastEvent(this.EVENTS.SEGMENTATION_UPDATED, {
+      segmentation: this.getSegmentation(displaySetUID),
+    });
   }
 
   private _highlightLabelmap(

extensions/cornerstone/src/utils/measurementServiceMappings/CircleROI.ts

@@ -2,6 +2,7 @@ import SUPPORTED_TOOLS from './constants/supportedTools';
 import { getDisplayUnit } from './utils';
 import getSOPInstanceAttributes from './utils/getSOPInstanceAttributes';
 import { utils } from '@ohif/core';
+import { getStatisticDisplayString } from './utils/getValueDisplayString';
 
 const CircleROI = {
   toAnnotation: measurement => {},
@@ -193,11 +194,7 @@ function getDisplayText(mappedAnnotations, displaySet, customizationService) {
   mappedAnnotations.forEach(mappedAnnotation => {
     const { unit, max, SeriesNumber } = mappedAnnotation;
 
-    let maxStr = '';
-    if (max) {
-      const roundedMax = utils.roundNumber(max, 2);
-      maxStr = `Max: ${roundedMax} <small>${getDisplayUnit(unit)}</small> `;
-    }
+    const maxStr = getStatisticDisplayString(max, unit, 'max');
 
     const str = `${maxStr}(S:${SeriesNumber}${instanceText}${frameText})`;
     if (!displayText.includes(str)) {

extensions/cornerstone/src/utils/measurementServiceMappings/EllipticalROI.ts

@@ -2,6 +2,7 @@ import SUPPORTED_TOOLS from './constants/supportedTools';
 import { getDisplayUnit } from './utils';
 import getSOPInstanceAttributes from './utils/getSOPInstanceAttributes';
 import { utils } from '@ohif/core';
+import { getStatisticDisplayString } from './utils/getValueDisplayString';
 
 const EllipticalROI = {
   toAnnotation: measurement => {},
@@ -192,12 +193,7 @@ function getDisplayText(mappedAnnotations, displaySet, customizationService) {
   mappedAnnotations.forEach(mappedAnnotation => {
     const { unit, max, SeriesNumber } = mappedAnnotation;
 
-    let maxStr = '';
-    if (max) {
-      const roundedMax = utils.roundNumber(max, 2);
-      maxStr = `Max: ${roundedMax} <small>${getDisplayUnit(unit)}</small> `;
-    }
-
+    const maxStr = getStatisticDisplayString(max, unit, 'max');
     const str = `${maxStr}(S:${SeriesNumber}${instanceText}${frameText})`;
     if (!displayText.includes(str)) {
       displayText.push(str);

extensions/cornerstone/src/utils/measurementServiceMappings/RectangleROI.ts

@@ -2,6 +2,7 @@ import SUPPORTED_TOOLS from './constants/supportedTools';
 import { getDisplayUnit } from './utils';
 import getSOPInstanceAttributes from './utils/getSOPInstanceAttributes';
 import { utils } from '@ohif/core';
+import { getStatisticDisplayString } from './utils/getValueDisplayString';
 
 const RectangleROI = {
   toAnnotation: measurement => {},
@@ -193,11 +194,7 @@ function getDisplayText(mappedAnnotations, displaySet, customizationService) {
   mappedAnnotations.forEach(mappedAnnotation => {
     const { unit, max, SeriesNumber } = mappedAnnotation;
 
-    let maxStr = '';
-    if (max) {
-      const roundedMax = utils.roundNumber(max, 2);
-      maxStr = `Max: ${roundedMax} <small>${getDisplayUnit(unit)}</small> `;
-    }
+    const maxStr = getStatisticDisplayString(max, unit, 'max');
 
     const str = `${maxStr}(S:${SeriesNumber}${instanceText}${frameText})`;
     if (!displayText.includes(str)) {

extensions/cornerstone/src/utils/measurementServiceMappings/SplineROI.ts

@@ -1,6 +1,5 @@
 import SUPPORTED_TOOLS from './constants/supportedTools';
 import getSOPInstanceAttributes from './utils/getSOPInstanceAttributes';
-import { getDisplayUnit } from './utils';
 import { utils } from '@ohif/core';
 
 /**

extensions/cornerstone/src/utils/measurementServiceMappings/utils/getValueDisplayString.js

@@ -0,0 +1,12 @@
+import { utils } from '@ohif/core';
+import getDisplayUnit from './getDisplayUnit';
+
+export const getStatisticDisplayString = (numbers, unit, key) => {
+  if (Array.isArray(numbers) && numbers.length > 0) {
+    const results = numbers.map(number => utils.roundNumber(number, 2));
+    return `${key.charAt(0).toUpperCase() + key.slice(1)}: ${results.join(', ')} <small>${getDisplayUnit(unit)}</small>`;
+  }
+
+  const result = utils.roundNumber(numbers, 2);
+  return `${key.charAt(0).toUpperCase() + key.slice(1)}: ${result} <small>${getDisplayUnit(unit)}</small>`;
+};