OHIF with Cornerstone3D 2.0 (#4347)

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

@@ -1,17 +1,16 @@
-import React, { useContext, useEffect } from 'react';
+import React, { useContext, useEffect, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { Machine } from 'xstate';
 import { useMachine } from '@xstate/react';
 import { useViewportGrid } from '@ohif/ui';
+import { promptLabelAnnotation, promptSaveReport } from '@ohif/extension-default';
 import { machineConfiguration, defaultOptions, RESPONSE } from './measurementTrackingMachine';
 import promptBeginTracking from './promptBeginTracking';
 import promptTrackNewSeries from './promptTrackNewSeries';
 import promptTrackNewStudy from './promptTrackNewStudy';
-import promptSaveReport from './promptSaveReport';
 import promptHydrateStructuredReport from './promptHydrateStructuredReport';
 import hydrateStructuredReport from './hydrateStructuredReport';
 import { useAppConfig } from '@state';
-import promptLabelAnnotation from './promptLabelAnnotation';
 
 const TrackedMeasurementsContext = React.createContext();
 TrackedMeasurementsContext.displayName = 'TrackedMeasurementsContext';
@@ -96,17 +95,18 @@ function TrackedMeasurementsContextProvider(
 
       const trackedMeasurement = trackedMeasurements[0];
       const referencedDisplaySetUID = trackedMeasurement.displaySetInstanceUID;
-      const viewport = cornerstoneViewportService.getCornerstoneViewport(activeViewportId);
-      const imageIndex = viewport.getCurrentImageIdIndex();
+
+      // update the previously stored positionPresentation with the new viewportId
+      // presentation so that when we put the referencedDisplaySet back in the viewport
+      // it will be in the correct position zoom and pan
+      commandsManager.runCommand('updateStoredPositionPresentation', {
+        viewportId: activeViewportId,
+        displaySetInstanceUID: referencedDisplaySetUID,
+      });
 
       viewportGridService.setDisplaySetsForViewport({
         viewportId: activeViewportId,
         displaySetInstanceUIDs: [referencedDisplaySetUID],
-        viewportOptions: {
-          initialImageOptions: {
-            index: imageIndex,
-          },
-        },
       });
     },
     showStructuredReportDisplaySetInActiveViewport: (ctx, evt) => {
@@ -196,7 +196,9 @@ function TrackedMeasurementsContextProvider(
   // - Fix viewport border resize
   // - created/destroyed hooks for extensions (cornerstone measurement subscriptions in it's `init`)
 
-  const measurementTrackingMachine = Machine(machineConfiguration, machineOptions);
+  const measurementTrackingMachine = useMemo(() => {
+    return Machine(machineConfiguration, machineOptions);
+  }, []); // Empty dependency array ensures this is only created once
 
   const [trackedMeasurements, sendTrackedMeasurementsEvent] = useMachine(
     measurementTrackingMachine

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

@@ -1,4 +1,3 @@
-import { hydrateStructuredReport } from '@ohif/extension-cornerstone-dicom-sr';
 import { assign } from 'xstate';
 
 const RESPONSE = {

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

@@ -1,33 +0,0 @@
-function promptLabelAnnotation({ servicesManager, extensionManager }, ctx, evt) {
-  const { measurementService, customizationService } = servicesManager.services;
-  const { viewportId, StudyInstanceUID, SeriesInstanceUID, measurementId } = evt;
-  const utilityModule = extensionManager.getModuleEntry(
-    '@ohif/extension-cornerstone.utilityModule.common'
-  );
-  const { showLabelAnnotationPopup } = utilityModule.exports;
-  return new Promise(async function (resolve) {
-    const labelConfig = customizationService.get('measurementLabels');
-    const measurement = measurementService.getMeasurement(measurementId);
-    const value = await showLabelAnnotationPopup(
-      measurement,
-      servicesManager.services.uiDialogService,
-      labelConfig
-    );
-
-    measurementService.update(
-      measurementId,
-      {
-        ...value,
-      },
-      true
-    );
-
-    resolve({
-      StudyInstanceUID,
-      SeriesInstanceUID,
-      viewportId,
-    });
-  });
-}
-
-export default promptLabelAnnotation;

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

@@ -1,74 +0,0 @@
-import { createReportAsync, createReportDialogPrompt } from '@ohif/extension-default';
-import getNextSRSeriesNumber from '../../_shared/getNextSRSeriesNumber';
-import RESPONSE from '../../_shared/PROMPT_RESPONSES';
-
-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;
-  const StudyInstanceUID = evt?.data?.StudyInstanceUID;
-  const SeriesInstanceUID = evt?.data?.SeriesInstanceUID;
-
-  const { trackedStudy, trackedSeries } = ctx;
-  let displaySetInstanceUIDs;
-
-  try {
-    const promptResult = await createReportDialogPrompt(uiDialogService, {
-      extensionManager,
-    });
-
-    if (promptResult.action === RESPONSE.CREATE_REPORT) {
-      const dataSources = extensionManager.getDataSources();
-      const dataSource = dataSources[0];
-      const measurements = measurementService.getMeasurements();
-      const trackedMeasurements = measurements
-        .filter(
-          m => trackedStudy === m.referenceStudyUID && trackedSeries.includes(m.referenceSeriesUID)
-        )
-        .filter(m => m.referencedImageId != null);
-
-      const SeriesDescription =
-        // isUndefinedOrEmpty
-        promptResult.value === undefined || promptResult.value === ''
-          ? 'Research Derived Series' // default
-          : promptResult.value; // provided value
-
-      const SeriesNumber = getNextSRSeriesNumber(displaySetService);
-
-      const getReport = async () => {
-        return commandsManager.runCommand(
-          'storeMeasurements',
-          {
-            measurementData: trackedMeasurements,
-            dataSource,
-            additionalFindingTypes: ['ArrowAnnotate'],
-            options: {
-              SeriesDescription,
-              SeriesNumber,
-            },
-          },
-          'CORNERSTONE_STRUCTURED_REPORT'
-        );
-      };
-      displaySetInstanceUIDs = await createReportAsync({
-        servicesManager,
-        getReport,
-      });
-    } else if (promptResult.action === RESPONSE.CANCEL) {
-      // Do nothing
-    }
-
-    return {
-      userResponse: promptResult.action,
-      createdDisplaySetInstanceUIDs: displaySetInstanceUIDs,
-      StudyInstanceUID,
-      SeriesInstanceUID,
-      viewportId,
-      isBackupSave,
-    };
-  } catch (error) {
-    return null;
-  }
-}
-
-export default promptSaveReport;