feat: new Total Metabolic Tumor Volume tmtv (#2866)

* fix: ptDisplaySet metadata problem

* fix: typo in xhrHeader field

* fix: temporary fix for crosshairs on reload data

* fix hotkey bug for input fields

* upgrade docusarusu to stable release

* circle ci node upgrade

* cypress node upgrade

* bump node in netlify

* bump node version

* remove versioned docs

* update resources

* fix: webpack injection of plugins

* fix meaningful label for panels

* add reviews and fix cli for creation

* copy over chunks if exists in the build

* edit templates

* edit templates

* fix yarn lock

* fix(plugin):Deploy on windows is broken

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

extensions/cornerstone/package.json

@@ -29,7 +29,7 @@
   "peerDependencies": {
     "@ohif/core": "^3.0.0",
     "@ohif/ui": "^2.0.0",
-    "cornerstone-wado-image-loader": "^4.2.0",
+    "cornerstone-wado-image-loader": "^4.2.1",
     "dcmjs": "^0.24.5",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",
@@ -43,9 +43,9 @@
   },
   "dependencies": {
     "@babel/runtime": "7.17.9",
-    "@cornerstonejs/core": "^0.13.11",
-    "@cornerstonejs/streaming-image-volume-loader": "^0.4.10",
-    "@cornerstonejs/tools": "^0.20.15",
+    "@cornerstonejs/core": "^0.14.4",
+    "@cornerstonejs/streaming-image-volume-loader": "^0.4.16",
+    "@cornerstonejs/tools": "^0.21.7",
     "@kitware/vtk.js": "^24.18.7",
     "dom-to-image": "^2.6.0",
     "lodash.debounce": "4.0.8",

extensions/cornerstone/src/Viewport/OHIFCornerstoneViewport.tsx

@@ -195,9 +195,11 @@ const OHIFCornerstoneViewport = React.memo(props => {
             DisplaySetService
           );
 
+          const keepCamera = true;
           CornerstoneViewportService.updateViewport(
             viewportIndex,
-            newViewportData
+            newViewportData,
+            keepCamera
           );
 
           setViewportData(newViewportData);

extensions/cornerstone/src/Viewport/Overlays/CornerstoneOverlays.tsx

@@ -41,7 +41,7 @@ function CornerstoneOverlays(props) {
       viewportIndex
     );
 
-    if (viewportInfo?.viewportOptions?.customViewportOptions?.hideOverlays) {
+    if (viewportInfo?.viewportOptions?.customViewportProps?.hideOverlays) {
       return null;
     }
   }

extensions/cornerstone/src/commandsModule.js

@@ -115,19 +115,18 @@ const commandsModule = ({ servicesManager }) => {
       const renderingEngine = CornerstoneViewportService.getRenderingEngine();
       const viewport = renderingEngine.getViewport(viewportId);
 
-      const lower = windowCenterNum - windowWidthNum / 2.0;
-      const upper = windowCenterNum + windowWidthNum / 2.0;
+      const { lower, upper } = csUtils.windowLevel.toLowHighRange(
+        windowWidthNum,
+        windowCenterNum
+      );
 
-      if (viewport instanceof StackViewport) {
-        viewport.setProperties({
-          voiRange: {
-            upper,
-            lower,
-          },
-        });
-
-        viewport.render();
-      }
+      viewport.setProperties({
+        voiRange: {
+          upper,
+          lower,
+        },
+      });
+      viewport.render();
     },
     toggleCrosshairs({ toolGroupId, toggledState }) {
       const toolName = 'Crosshairs';

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

@@ -166,14 +166,12 @@ class CornerstoneViewportService implements IViewportService {
     const viewportInfo = this.viewportsInfo.get(viewportIndex);
     viewportInfo.setRenderingEngineId(renderingEngine.id);
 
-    const {
-      viewportOptions,
-      displaySetOptions,
-    } = this._getViewportAndDisplaySetOptions(
-      publicViewportOptions,
-      publicDisplaySetOptions,
-      viewportInfo
-    );
+    const { viewportOptions, displaySetOptions } =
+      this._getViewportAndDisplaySetOptions(
+        publicViewportOptions,
+        publicDisplaySetOptions,
+        viewportInfo
+      );
 
     viewportInfo.setViewportOptions(viewportOptions);
     viewportInfo.setDisplaySetOptions(displaySetOptions);
@@ -400,48 +398,57 @@ class CornerstoneViewportService implements IViewportService {
       volume.load();
     });
 
-    this.setVolumesForViewport(viewport, volumeInputArray);
+    // This returns the async continuation only
+    return this.setVolumesForViewport(viewport, volumeInputArray);
   }
 
-  public setVolumesForViewport(viewport, volumeInputArray) {
-    viewport.setVolumes(volumeInputArray).then(() => {
-      const viewportInfo = this.getViewportInfo(viewport.id);
-      const initialImageOptions = viewportInfo.getInitialImageOptions();
+  public async setVolumesForViewport(viewport, volumeInputArray) {
+    await viewport.setVolumes(volumeInputArray);
 
-      if (
-        initialImageOptions &&
-        (initialImageOptions.preset !== undefined ||
-          initialImageOptions.index !== undefined)
-      ) {
-        const { index, preset } = initialImageOptions;
+    const viewportInfo = this.getViewportInfo(viewport.id);
+    const initialImageOptions = viewportInfo.getInitialImageOptions();
 
-        const { numberOfSlices } = csUtils.getImageSliceDataForVolumeViewport(
-          viewport
-        );
+    if (
+      initialImageOptions &&
+      (initialImageOptions.preset !== undefined ||
+        initialImageOptions.index !== undefined)
+    ) {
+      const { index, preset } = initialImageOptions;
 
-        const imageIndex = this._getInitialImageIndex(
-          numberOfSlices,
-          index,
-          preset
-        );
+      const { numberOfSlices } =
+        csUtils.getImageSliceDataForVolumeViewport(viewport);
 
-        csToolsUtils.jumpToSlice(viewport.element, {
-          imageIndex,
-        });
-      }
+      const imageIndex = this._getInitialImageIndex(
+        numberOfSlices,
+        index,
+        preset
+      );
 
-      viewport.render();
-    });
+      csToolsUtils.jumpToSlice(viewport.element, {
+        imageIndex,
+      });
+    }
+
+    viewport.render();
   }
 
-  public updateViewport(viewportIndex, viewportData) {
+  // Todo: keepCamera is an interim solution until we have a better solution for
+  // keeping the camera position when the viewport data is changed
+  public updateViewport(viewportIndex, viewportData, keepCamera = false) {
     const viewportInfo = this.getViewportInfoByIndex(viewportIndex);
 
     const viewportId = viewportInfo.getViewportId();
     const viewport = this.getCornerstoneViewport(viewportId);
+    const viewportCamera = viewport.getCamera();
 
     if (viewport instanceof VolumeViewport) {
-      this._setVolumeViewport(viewport, viewportData, viewportInfo);
+      this._setVolumeViewport(viewport, viewportData, viewportInfo).then(() => {
+        if (keepCamera) {
+          viewport.setCamera(viewportCamera);
+          viewport.render();
+        }
+      });
+
       return;
     }
 

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

@@ -19,7 +19,7 @@ export type ViewportOptions = {
   initialView?: string;
   syncGroups?: SyncGroup[];
   initialImageOptions?: InitialImageOptions;
-  customViewportOptions?: Record<string, unknown>;
+  customViewportProps?: Record<string, unknown>;
 };
 
 export type PublicViewportOptions = {
@@ -31,7 +31,7 @@ export type PublicViewportOptions = {
   initialView?: string;
   syncGroups?: SyncGroup[];
   initialImageOptions?: InitialImageOptions;
-  customViewportOptions?: Record<string, unknown>;
+  customViewportProps?: Record<string, unknown>;
 };
 
 export type PublicDisplaySetOptions = {

extensions/cornerstone/src/utils/measurementServiceMappings/Bidirectional.js

@@ -172,8 +172,8 @@ function getDisplayText(mappedAnnotations, displaySet) {
 
   // Area is the same for all series
   const { length, width, SeriesNumber, SOPInstanceUID } = mappedAnnotations[0];
-  const roundedLength = utils.roundNumber(length, 1);
-  const roundedWidth = utils.roundNumber(width, 1);
+  const roundedLength = utils.roundNumber(length, 2);
+  const roundedWidth = utils.roundNumber(width, 2);
 
   const instance = displaySet.images.find(
     image => image.SOPInstanceUID === SOPInstanceUID