fix: various bugs with regard to tracking workflow

extensions/cornerstone-3d/package.json

@@ -30,7 +30,7 @@
     "@ohif/core": "^3.0.0",
     "@ohif/ui": "^2.0.0",
     "cornerstone-wado-image-loader": "^4.1.2",
-    "dcmjs": "0.22.0",
+    "dcmjs": "0.24.0",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",
     "prop-types": "^15.6.2",

extensions/cornerstone-3d/src/Viewport/OHIFCornerstone3DViewport.tsx

@@ -437,11 +437,9 @@ function _jumpToMeasurement(
   viewportGridService.setActiveViewportIndex(viewportIndex);
 
   if (targetElement !== null) {
-    const metadata = {
-      ...measurement.metadata,
-      imageIdIndex,
-    };
-    cs3DTools.utilities.jumpToSlice(targetElement, metadata);
+    cs3DTools.utilities.jumpToSlice(targetElement, {
+      imageIndex: imageIdIndex,
+    });
 
     cs3DTools.annotation.selection.setAnnotationSelected(measurement.uid);
     // Jump to measurement consumed, remove.

extensions/cornerstone-3d/src/commandsModule.js

@@ -268,12 +268,7 @@ const commandsModule = ({ servicesManager }) => {
 
       const { viewport } = enabledElement;
 
-      let options = {};
-      if (viewport instanceof cornerstone3D.StackViewport) {
-        options = { direction };
-      } else {
-        throw new Error('scroll: volume viewport is not supported yet');
-      }
+      const options = { delta: direction };
 
       cornerstone3DTools.utilities.stackScrollTool.scrollThroughStack(
         viewport,

extensions/cornerstone-3d/src/init.js

@@ -7,6 +7,7 @@ import {
   eventTarget,
   EVENTS,
   imageLoadPoolManager,
+  Settings,
 } from '@cornerstonejs/core';
 import { Enums, utilities } from '@cornerstonejs/tools';
 
@@ -36,6 +37,9 @@ export default async function init({
   await cs3DInit();
   initCornerstoneTools();
 
+  // Don't use cursors in viewports
+  Settings.getRuntimeSettings().set('useCursors', false);
+
   const {
     UserAuthenticationService,
     ToolGroupService,

extensions/cornerstone-3d/src/initCornerstoneTools.js

@@ -37,6 +37,20 @@ export default function initCornerstone3DTools(configuration = {}) {
   cornerstone3DTools.addTool(AngleTool);
   cornerstone3DTools.addTool(MagnifyTool);
   // cornerstone3DTools.addTool(CrosshairsTool);
+
+  // Modify annotation tools to use dashed lines on SR
+  const annotationStyle = {
+    textBoxFontSize: '15px',
+    lineWidth: '1.5',
+  };
+
+  const defaultStyles = cornerstone3DTools.annotation.config.style.getDefaultToolStyles();
+  cornerstone3DTools.annotation.config.style.setDefaultToolStyles({
+    global: {
+      ...defaultStyles.global,
+      ...annotationStyle,
+    },
+  });
 }
 
 const toolNames = {

extensions/cornerstone-3d/src/initMeasurementService.js

@@ -212,12 +212,12 @@ const connectMeasurementServiceToTools = (
         return;
       }
 
-      const { id, label } = measurement;
+      const { uid, label } = measurement;
 
-      const sourceAnnotation = annotation.state.getAnnotation(id);
+      const sourceAnnotation = annotation.state.getAnnotation(uid);
 
       if (sourceAnnotation) {
-        sourceAnnotation.label = label;
+        sourceAnnotation.data.label = label;
         if (sourceAnnotation.hasOwnProperty('text')) {
           // Deal with the weird case of ArrowAnnotate.
           sourceAnnotation.text = label;