fix: Measurement Tracking: Various UI and functionality improvements (#4481)

extensions/cornerstone/package.json

@@ -38,7 +38,7 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
     "@cornerstonejs/codec-openjpeg": "^1.2.4",
     "@cornerstonejs/codec-openjph": "^2.4.5",
-    "@cornerstonejs/dicom-image-loader": "^2.2.1",
+    "@cornerstonejs/dicom-image-loader": "^2.2.3",
     "@icr/polyseg-wasm": "^0.4.0",
     "@ohif/core": "3.9.0-beta.110",
     "@ohif/ui": "3.9.0-beta.110",
@@ -55,9 +55,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^2.2.1",
-    "@cornerstonejs/core": "^2.2.1",
-    "@cornerstonejs/tools": "^2.2.1",
+    "@cornerstonejs/adapters": "^2.2.3",
+    "@cornerstonejs/core": "^2.2.3",
+    "@cornerstonejs/tools": "^2.2.3",
     "@icr/polyseg-wasm": "^0.4.0",
     "@kitware/vtk.js": "32.1.0",
     "html2canvas": "^1.4.1",

extensions/cornerstone/src/getPanelModule.tsx

@@ -3,6 +3,7 @@ import React from 'react';
 import { Toolbox } from '@ohif/ui-next';
 import PanelSegmentation from './panels/PanelSegmentation';
 import ActiveViewportWindowLevel from './components/ActiveViewportWindowLevel';
+import PanelMeasurementTable from './panels/PanelMeasurement';
 
 const getPanelModule = ({ commandsManager, servicesManager, extensionManager }: withAppTypes) => {
   const wrappedPanelSegmentation = ({ configuration }) => {
@@ -56,6 +57,19 @@ const getPanelModule = ({ commandsManager, servicesManager, extensionManager }:
     );
   };
 
+  const wrappedPanelMeasurement = ({ configuration }) => {
+    return (
+      <PanelMeasurementTable
+        commandsManager={commandsManager}
+        servicesManager={servicesManager}
+        extensionManager={extensionManager}
+        configuration={{
+          ...configuration,
+        }}
+      />
+    );
+  };
+
   return [
     {
       name: 'activeViewportWindowLevel',
@@ -63,6 +77,13 @@ const getPanelModule = ({ commandsManager, servicesManager, extensionManager }:
         return <ActiveViewportWindowLevel servicesManager={servicesManager} />;
       },
     },
+    {
+      name: 'panelMeasurement',
+      iconName: 'tab-linear',
+      iconLabel: 'Measure',
+      label: 'Measurement',
+      component: wrappedPanelMeasurement,
+    },
     {
       name: 'panelSegmentation',
       iconName: 'tab-segmentation',

extensions/cornerstone/src/initMeasurementService.ts

@@ -330,6 +330,9 @@ const connectMeasurementServiceToTools = (measurementService, cornerstoneViewpor
       }
       removeAnnotation(uid);
     }
+
+    // trigger a render
+    cornerstoneViewportService.getRenderingEngine().render();
   });
 
   measurementService.subscribe(

extensions/cornerstone/src/services/SyncGroupService/SyncGroupService.ts

@@ -148,6 +148,11 @@ export default class SyncGroupService {
       const { type, target = true, source = true, options = {}, id = type } = syncGroupObj;
 
       const synchronizer = this._getOrCreateSynchronizer(type, id, options);
+
+      if (!synchronizer) {
+        return;
+      }
+
       synchronizer.setOptions(viewportId, options);
 
       const viewportInfo = { viewportId, renderingEngineId };

extensions/cornerstone/src/services/ViewportService/CornerstoneViewportService.ts

@@ -763,9 +763,11 @@ class CornerstoneViewportService extends PubSubService implements IViewportServi
       });
     }
 
-    if (!volumesNotLoaded.length) {
-      return;
-    }
+    // It's crucial not to return here because the volume may be loaded,
+    // but the viewport also needs to set the volume.
+    // if (!volumesNotLoaded.length) {
+    //   return;
+    // }
 
     // This returns the async continuation only
     return this.setVolumesForViewport(viewport, volumeInputArray, presentations);