feat: add support to scoord3d (#5016)

Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>

extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.tsx

@@ -21,7 +21,16 @@ const TrackedMeasurementsContext = React.createContext();
 TrackedMeasurementsContext.displayName = 'TrackedMeasurementsContext';
 const useTrackedMeasurements = () => useContext(TrackedMeasurementsContext);
 
-const SR_SOPCLASSHANDLERID = '@ohif/extension-cornerstone-dicom-sr.sopClassHandlerModule.dicom-sr';
+const SR_SOP_CLASS_HANDLER_ID =
+  '@ohif/extension-cornerstone-dicom-sr.sopClassHandlerModule.dicom-sr';
+const COMPREHENSIVE_3D_SR_SOP_CLASS_HANDLER_ID =
+  '@ohif/extension-cornerstone-dicom-sr.sopClassHandlerModule.dicom-sr-3d';
+
+const hasValidSOPClassHandlerId = displaySet => {
+  return [SR_SOP_CLASS_HANDLER_ID, COMPREHENSIVE_3D_SR_SOP_CLASS_HANDLER_ID].includes(
+    displaySet.SOPClassHandlerId
+  );
+};
 
 /**
  *
@@ -320,18 +329,14 @@ function TrackedMeasurementsContextProvider(
         // The issue here is that this handler in TrackedMeasurementsContext
         // ends up occurring before the Viewport is created, so the displaySet
         // is not loaded yet, and isRehydratable is undefined unless we call load().
-        if (
-          displaySet.SOPClassHandlerId === SR_SOPCLASSHANDLERID &&
-          !displaySet.isLoaded &&
-          displaySet.load
-        ) {
+        if (hasValidSOPClassHandlerId(displaySet) && !displaySet.isLoaded && displaySet.load) {
           await displaySet.load();
         }
 
         // Magic string
         // load function added by our sopClassHandler module
         if (
-          displaySet.SOPClassHandlerId === SR_SOPCLASSHANDLERID &&
+          hasValidSOPClassHandlerId(displaySet) &&
           displaySet.isRehydratable === true &&
           !displaySet.isHydrated
         ) {

extensions/measurement-tracking/src/getViewportModule.tsx

@@ -29,7 +29,7 @@ function getViewportModule({ servicesManager, commandsManager, extensionManager
     {
       name: 'cornerstone-tracked',
       component: ExtendedOHIFCornerstoneTrackingViewport,
-      isReferenceViewable: props => utils.isReferenceViewable({ ...props, servicesManager }),
+      isReferenceViewable: utils.isReferenceViewable.bind(null, servicesManager),
     },
   ];
 }

extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking.tsx

@@ -13,8 +13,7 @@ import {
 import { useTrackedMeasurements } from '../getContextModule';
 import { UntrackSeriesModal } from './PanelStudyBrowserTracking/untrackSeriesModal';
 
-const { filterAnd, filterPlanarMeasurement, filterMeasurementsBySeriesUID } =
-  utils.MeasurementFilters;
+const { filterMeasurementsBySeriesUID, filterAny } = utils.MeasurementFilters;
 
 function PanelMeasurementTableTracking(props) {
   const [viewportGrid] = useViewportGrid();
@@ -23,9 +22,7 @@ function PanelMeasurementTableTracking(props) {
 
   const [trackedMeasurements, sendTrackedMeasurementsEvent] = useTrackedMeasurements();
   const { trackedStudy, trackedSeries } = trackedMeasurements.context;
-  const measurementFilter = trackedStudy
-    ? filterAnd(filterPlanarMeasurement, filterMeasurementsBySeriesUID(trackedSeries))
-    : filterPlanarMeasurement;
+  const measurementFilter = trackedStudy ? filterMeasurementsBySeriesUID(trackedSeries) : filterAny;
 
   const onUntrackConfirm = () => {
     sendTrackedMeasurementsEvent('UNTRACK_ALL', {});

extensions/measurement-tracking/src/viewports/TrackedCornerstoneViewport.tsx

@@ -35,25 +35,10 @@ function TrackedCornerstoneViewport(
   const { SeriesInstanceUID } = displaySet;
 
   const updateIsTracked = useCallback(() => {
-    const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
-
-    if (viewport instanceof BaseVolumeViewport) {
-      // A current image id will only exist for volume viewports that can have measurements tracked.
-      // Typically these are those volume viewports for the series of acquisition.
-      const currentImageId = viewport?.getCurrentImageId();
-
-      if (!currentImageId) {
-        if (isTracked) {
-          setIsTracked(false);
-        }
-        return;
-      }
-    }
-
     if (trackedSeries.includes(SeriesInstanceUID) !== isTracked) {
       setIsTracked(!isTracked);
     }
-  }, [isTracked, trackedMeasurements, viewportId, SeriesInstanceUID]);
+  }, [isTracked, SeriesInstanceUID, trackedSeries]);
 
   const onElementEnabled = useCallback(
     evt => {