feat: Add White Labelling, Hanging Protocols, and tons of Extensions / Mode fixes

* modified

* new files in existing extensions/libraries/modes

* fixed bugs and tests

* Clean up

* fix: viewport display fixed

* Fixed configs for deployment

* Removed unnecessary files and functions

* Fixed default HP module

* Added white labelling

* Fixed hash routing

* Removed unnecessary routers

Co-authored-by: Alireza Sedghi <ar.sedghi@gmail.com>

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

@@ -12,7 +12,6 @@ import promptTrackNewSeries from './promptTrackNewSeries';
 import promptTrackNewStudy from './promptTrackNewStudy';
 import promptSaveReport from './promptSaveReport';
 import promptHydrateStructuredReport from './promptHydrateStructuredReport';
-import hydrateStructuredReport from './_hydrateStructuredReport.js';
 
 const TrackedMeasurementsContext = React.createContext();
 TrackedMeasurementsContext.displayName = 'TrackedMeasurementsContext';
@@ -99,6 +98,7 @@ function TrackedMeasurementsContextProvider(
     }),
     promptHydrateStructuredReport: promptHydrateStructuredReport.bind(null, {
       servicesManager,
+      extensionManager
     }),
   });
 

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

@@ -1,7 +1,7 @@
 import cornerstoneTools from 'cornerstone-tools';
 import OHIF, { DicomMetadataStore } from '@ohif/core';
 import getLabelFromDCMJSImportedToolData from './utils/getLabelFromDCMJSImportedToolData';
-import getToolStateToCornerstoneMeasurementSchema from './getToolStateToCornerstoneMeasurementSchema';
+import getCornerstoneToolStateToMeasurementSchema from './getCornerstoneToolStateToMeasurementSchema';
 import { adapters } from 'dcmjs';
 
 const { guid } = OHIF.utils;
@@ -15,6 +15,7 @@ export default function _hydrateStructuredReport(
   { servicesManager, extensionManager },
   displaySetInstanceUID
 ) {
+  const dataSource = extensionManager.getActiveDataSource()[0];
   const { MeasurementService, DisplaySetService } = servicesManager.services;
 
   const displaySet = DisplaySetService.getDisplaySetByUID(
@@ -114,14 +115,23 @@ export default function _hydrateStructuredReport(
 
       data.id = guid();
 
-      _addToolDataToCornerstoneTools(data, toolType, imageId);
+      const instance = cornerstone.metaData.get('instance', imageId);
+      const {
+        SOPInstanceUID,
+        FrameOfReferenceUID,
+        SeriesInstanceUID,
+        StudyInstanceUID,
+      } = instance;
 
       // Let the measurement service know we added to toolState
-      const toMeasurementSchema = getToolStateToCornerstoneMeasurementSchema(
+      const toMeasurementSchema = getCornerstoneToolStateToMeasurementSchema(
         toolType,
         MeasurementService,
         DisplaySetService,
-        imageId
+        SOPInstanceUID,
+        FrameOfReferenceUID,
+        SeriesInstanceUID,
+        StudyInstanceUID
       );
 
       const source = MeasurementService.getSource('CornerstoneTools', '4');
@@ -132,7 +142,8 @@ export default function _hydrateStructuredReport(
         source,
         toolType,
         data,
-        toMeasurementSchema
+        toMeasurementSchema,
+        dataSource
       );
 
       if (!imageIds.includes(imageId)) {
@@ -148,24 +159,3 @@ export default function _hydrateStructuredReport(
     SeriesInstanceUIDs,
   };
 }
-
-function _addToolDataToCornerstoneTools(data, toolType, imageId) {
-  const toolState = globalImageIdSpecificToolStateManager.saveToolState();
-
-  if (toolState[imageId] === undefined) {
-    toolState[imageId] = {};
-  }
-
-  const imageIdToolState = toolState[imageId];
-
-  // If we don't have tool state for this type of tool, add an empty object
-  if (imageIdToolState[toolType] === undefined) {
-    imageIdToolState[toolType] = {
-      data: [],
-    };
-  }
-
-  const toolData = imageIdToolState[toolType];
-
-  toolData.data.push(data);
-}

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

@@ -1,8 +1,11 @@
-export default function getToolStateToCornerstoneMeasurementSchema(
+export default function getCornerstoneToolStateToMeasurementSchema(
   toolType,
   MeasurementService,
   DisplaySetService,
-  imageId
+  SOPInstanceUID,
+  FrameOfReferenceUID,
+  SeriesInstanceUID,
+  StudyInstanceUID
 ) {
   const _getValueTypeFromToolType = toolType => {
     const {
@@ -31,7 +34,10 @@ export default function getToolStateToCornerstoneMeasurementSchema(
       return measurementData =>
         Length(
           measurementData,
-          imageId,
+          SOPInstanceUID,
+          FrameOfReferenceUID,
+          SeriesInstanceUID,
+          StudyInstanceUID,
           DisplaySetService,
           _getValueTypeFromToolType
         );
@@ -39,7 +45,10 @@ export default function getToolStateToCornerstoneMeasurementSchema(
       return measurementData =>
         Bidirectional(
           measurementData,
-          imageId,
+          SOPInstanceUID,
+          FrameOfReferenceUID,
+          SeriesInstanceUID,
+          StudyInstanceUID,
           DisplaySetService,
           _getValueTypeFromToolType
         );
@@ -47,7 +56,10 @@ export default function getToolStateToCornerstoneMeasurementSchema(
       return measurementData =>
         EllipticalRoi(
           measurementData,
-          imageId,
+          SOPInstanceUID,
+          FrameOfReferenceUID,
+          SeriesInstanceUID,
+          StudyInstanceUID,
           DisplaySetService,
           _getValueTypeFromToolType
         );
@@ -55,7 +67,10 @@ export default function getToolStateToCornerstoneMeasurementSchema(
       return measurementData =>
         ArrowAnnotate(
           measurementData,
-          imageId,
+          SOPInstanceUID,
+          FrameOfReferenceUID,
+          SeriesInstanceUID,
+          StudyInstanceUID,
           DisplaySetService,
           _getValueTypeFromToolType
         );
@@ -64,18 +79,14 @@ export default function getToolStateToCornerstoneMeasurementSchema(
 
 function Length(
   measurementData,
-  imageId,
+  SOPInstanceUID,
+  FrameOfReferenceUID,
+  SeriesInstanceUID,
+  StudyInstanceUID,
   DisplaySetService,
   _getValueTypeFromToolType
 ) {
   const tool = measurementData.toolType || measurementData.toolName;
-  const instance = cornerstone.metaData.get('instance', imageId);
-  const {
-    SOPInstanceUID,
-    FrameOfReferenceUID,
-    SeriesInstanceUID,
-    StudyInstanceUID,
-  } = instance;
 
   const displaySetInstanceUID = _getDisplaySetInstanceUID(
     DisplaySetService,
@@ -113,18 +124,15 @@ function Length(
 
 function Bidirectional(
   measurementData,
-  imageId,
+  SOPInstanceUID,
+  FrameOfReferenceUID,
+  SeriesInstanceUID,
+  StudyInstanceUID,
   DisplaySetService,
   _getValueTypeFromToolType
 ) {
   const tool = measurementData.toolType || measurementData.toolName;
-  const instance = cornerstone.metaData.get('instance', imageId);
-  const {
-    SOPInstanceUID,
-    FrameOfReferenceUID,
-    SeriesInstanceUID,
-    StudyInstanceUID,
-  } = instance;
+
   const displaySetInstanceUID = _getDisplaySetInstanceUID(
     DisplaySetService,
     SeriesInstanceUID,
@@ -155,18 +163,14 @@ function Bidirectional(
 
 function EllipticalRoi(
   measurementData,
-  imageId,
+  SOPInstanceUID,
+  FrameOfReferenceUID,
+  SeriesInstanceUID,
+  StudyInstanceUID,
   DisplaySetService,
   _getValueTypeFromToolType
 ) {
   const tool = measurementData.toolType || measurementData.toolName;
-  const instance = cornerstone.metaData.get('instance', imageId);
-  const {
-    SOPInstanceUID,
-    FrameOfReferenceUID,
-    SeriesInstanceUID,
-    StudyInstanceUID,
-  } = instance;
 
   const displaySetInstanceUID = _getDisplaySetInstanceUID(
     DisplaySetService,
@@ -222,18 +226,14 @@ function EllipticalRoi(
 
 function ArrowAnnotate(
   measurementData,
-  imageId,
+  SOPInstanceUID,
+  FrameOfReferenceUID,
+  SeriesInstanceUID,
+  StudyInstanceUID,
   DisplaySetService,
   _getValueTypeFromToolType
 ) {
   const tool = measurementData.toolType || measurementData.toolName;
-  const instance = cornerstone.metaData.get('instance', imageId);
-  const {
-    SOPInstanceUID,
-    FrameOfReferenceUID,
-    SeriesInstanceUID,
-    StudyInstanceUID,
-  } = instance;
 
   const displaySetInstanceUID = _getDisplaySetInstanceUID(
     DisplaySetService,

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

@@ -6,7 +6,7 @@ const RESPONSE = {
   SET_STUDY_AND_SERIES: 3,
 };
 
-function promptUser({ servicesManager }, ctx, evt) {
+function promptUser({ servicesManager, extensionManager }, ctx, evt) {
   const { UIViewportDialogService } = servicesManager.services;
   const { viewportIndex, StudyInstanceUID, SeriesInstanceUID } = evt;