fix(segmentation): failing to render SEG because it was on default tool group (#3222)

* fix: Segmentation service fixes for secondary volumes

* Remove toolgroupID in promptSeg

extensions/cornerstone-dicom-seg/package.json

@@ -59,7 +59,7 @@
     "babel-eslint": "^8.0.3",
     "babel-loader": "^8.0.0-beta.4",
     "clean-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^10.2.0",
+    "copy-webpack-plugin": "^11.0.0",
     "cross-env": "^7.0.3",
     "dotenv": "^14.1.0",
     "eslint": "^5.0.1",

extensions/cornerstone-dicom-seg/src/panels/PanelSegmentation.tsx

@@ -203,7 +203,7 @@ export default function PanelSegmentation({
           showAddSegmentation={false}
           segmentations={segmentations}
           isMinimized={isMinimized}
-          activeSegmentationId={selectedSegmentationId}
+          activeSegmentationId={selectedSegmentationId || ''}
           onSegmentationClick={onSegmentationClick}
           onSegmentationDelete={onSegmentationDelete}
           onSegmentationEdit={onSegmentationEdit}

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

@@ -1,7 +1,6 @@
 async function _hydrateSEGDisplaySet({
   segDisplaySet,
   viewportIndex,
-  toolGroupId,
   servicesManager,
 }) {
   const {
@@ -55,8 +54,6 @@ async function _hydrateSEGDisplaySet({
         viewportIndex: index,
         displaySetInstanceUIDs: viewport.displaySetInstanceUIDs,
         viewportOptions: {
-          viewportType: 'volume',
-          toolGroupId,
           initialImageOptions: {
             preset: 'middle',
           },

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

@@ -10,13 +10,12 @@ function promptHydrateSEG({
   servicesManager,
   segDisplaySet,
   viewportIndex,
-  toolGroupId = 'default',
 }) {
-  const { UIViewportDialogService } = servicesManager.services;
+  const { uiViewportDialogService } = servicesManager.services;
 
   return new Promise(async function(resolve, reject) {
     const promptResult = await _askHydrate(
-      UIViewportDialogService,
+      uiViewportDialogService,
       viewportIndex
     );
 
@@ -24,7 +23,6 @@ function promptHydrateSEG({
       const isHydrated = await hydrateSEGDisplaySet({
         segDisplaySet,
         viewportIndex,
-        toolGroupId,
         servicesManager,
       });
 
@@ -33,7 +31,7 @@ function promptHydrateSEG({
   });
 }
 
-function _askHydrate(UIViewportDialogService, viewportIndex) {
+function _askHydrate(uiViewportDialogService, viewportIndex) {
   return new Promise(function(resolve, reject) {
     const message = 'Do you want to open this Segmentation?';
     const actions = [
@@ -49,18 +47,18 @@ function _askHydrate(UIViewportDialogService, viewportIndex) {
       },
     ];
     const onSubmit = result => {
-      UIViewportDialogService.hide();
+      uiViewportDialogService.hide();
       resolve(result);
     };
 
-    UIViewportDialogService.show({
+    uiViewportDialogService.show({
       viewportIndex,
       type: 'info',
       message,
       actions,
       onSubmit,
       onOutsideClick: () => {
-        UIViewportDialogService.hide();
+        uiViewportDialogService.hide();
         resolve(RESPONSE.CANCEL);
       },
     });

extensions/cornerstone-dicom-seg/src/viewports/OHIFCornerstoneSEGViewport.tsx

@@ -235,6 +235,8 @@ function OHIFCornerstoneSEGViewport(props) {
       return;
     }
 
+    // This creates a custom tool group which has the lifetime of this view
+    // only, and does NOT interfere with currently displayed segmentations.
     toolGroup = createSEGToolGroupAndAddTools(
       toolGroupService,
       toolGroupId,
@@ -249,6 +251,7 @@ function OHIFCornerstoneSEGViewport(props) {
         toolGroupId
       );
 
+      // Only destroy the viewport specific implementation
       toolGroupService.destroyToolGroup(toolGroupId);
     };
   }, []);
@@ -298,14 +301,12 @@ function OHIFCornerstoneSEGViewport(props) {
     StudyDate,
     SeriesDescription,
     SpacingBetweenSlices,
-    SeriesNumber,
   } = referencedDisplaySetRef.current.metadata;
 
   const onStatusClick = async () => {
     const isHydrated = await hydrateSEGDisplaySet({
       segDisplaySet,
       viewportIndex,
-      toolGroupId,
       servicesManager,
     });
 

extensions/cornerstone-dicom-sr/package.json

@@ -45,8 +45,8 @@
   "dependencies": {
     "@babel/runtime": "^7.20.13",
     "classnames": "^2.3.2",
-    "@cornerstonejs/adapters": "^0.3.1",
-    "@cornerstonejs/core": "^0.32.0",
-    "@cornerstonejs/tools": "^0.48.0"
+    "@cornerstonejs/adapters": "^0.4.1",
+    "@cornerstonejs/core": "^0.33.2",
+    "@cornerstonejs/tools": "^0.50.2"
   }
 }

extensions/cornerstone/package.json

@@ -43,10 +43,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^0.3.1",
-    "@cornerstonejs/core": "^0.32.0",
-    "@cornerstonejs/streaming-image-volume-loader": "^0.13.0",
-    "@cornerstonejs/tools": "^0.48.0",
+    "@cornerstonejs/adapters": "^0.4.1",
+    "@cornerstonejs/core": "^0.33.2",
+    "@cornerstonejs/streaming-image-volume-loader": "^0.14.1",
+    "@cornerstonejs/tools": "^0.50.2",
     "@kitware/vtk.js": "26.5.6",
     "html2canvas": "^1.4.1",
     "lodash.debounce": "4.0.8",

extensions/measurement-tracking/package.json

@@ -32,8 +32,8 @@
   "peerDependencies": {
     "@ohif/core": "^3.0.0",
     "classnames": "^2.3.2",
-    "@cornerstonejs/core": "^0.32.0",
-    "@cornerstonejs/tools": "^0.48.0",
+    "@cornerstonejs/core": "^0.33.2",
+    "@cornerstonejs/tools": "^0.50.2",
     "@ohif/extension-cornerstone-dicom-sr": "^3.0.0",
     "dcmjs": "^0.29.4",
     "prop-types": "^15.6.2",