fix: various bugs with regard to tracking workflow (#2811)

* fix: various issues with measurement panel * fix: update default tool style for annotations * fix: annotatoin label getting removed * feat: Add backward compatibility for SR hydration with legacy cornerstone * fix: cursors and ellipse ROI max style * fix: ArrowAnnotate SRDisplay * apply review comments * bump package versions * fix: bugin rehydration of SR * fix: e2e tests * fix active viewport thickness and arrowTool ui * add readme for measurement tracking * use uploaded image for readme * add back images * try to fix e2e test * fix: window level presets hotkeys * Update README.md
OHIF · May 31, 2022 · 81b8ecf · 81b8ecf
1 parent 2fe0fb6
commit 81b8ecf
Show file tree

Hide file tree

Showing 51 changed files with 480 additions and 678 deletions.
diff --git a/extensions/cornerstone-3d/package.json b/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.22.1",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",
     "prop-types": "^15.6.2",
@@ -45,9 +45,9 @@
     "@babel/runtime": "7.17.9",
     "lodash.merge": "^4.6.2",
     "lodash.debounce": "4.0.8",
-    "@cornerstonejs/core": "^0.8.1",
-    "@cornerstonejs/tools": "^0.15.0",
-    "@cornerstonejs/streaming-image-volume-loader": "^0.2.26",
+    "@cornerstonejs/core": "^0.10.2",
+    "@cornerstonejs/tools": "^0.17.2",
+    "@cornerstonejs/streaming-image-volume-loader": "^0.3.2",
     "shader-loader": "^1.3.1",
     "@kitware/vtk.js": "^24.10.0",
     "dom-to-image": "^2.6.0",

diff --git a/extensions/cornerstone-3d/src/OHIFCornerstone3DViewport.tsx b/extensions/cornerstone-3d/src/OHIFCornerstone3DViewport.tsx
diff --git a/extensions/cornerstone-3d/src/Viewport/OHIFCornerstone3DViewport.tsx b/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.

diff --git a/extensions/cornerstone-3d/src/commandsModule.js b/extensions/cornerstone-3d/src/commandsModule.js
@@ -6,13 +6,15 @@ import CornerstoneViewportDownloadForm from './utils/CornerstoneViewportDownload
 import { Enums } from '@cornerstonejs/tools';
 
 import { getEnabledElement } from './state';
+import callInputDialog from './utils/callInputDialog';
 
 const commandsModule = ({ servicesManager }) => {
   const {
     ViewportGridService,
     ToolGroupService,
     CineService,
     ToolBarService,
+    UIDialogService,
   } = servicesManager.services;
 
   function _getActiveViewportEnabledElement() {
@@ -26,6 +28,9 @@ const commandsModule = ({ servicesManager }) => {
     getActiveViewportEnabledElement: () => {
       return _getActiveViewportEnabledElement();
     },
+    arrowTextCallback: ({ callback, data }) => {
+      callInputDialog(UIDialogService, data, callback);
+    },
     toggleCine: () => {
       const { viewports } = ViewportGridService.getState();
       const { isCineEnabled } = CineService.getState();
@@ -35,11 +40,10 @@ const commandsModule = ({ servicesManager }) => {
         CineService.setCine({ id: index, isPlaying: false })
       );
     },
-    setWindowLevel({ windowLevel, toolGroupId }) {
-      const { window: windowWidth, level: windowCenter } = windowLevel;
+    setWindowLevel({ window, level, toolGroupId }) {
       // convert to numbers
-      const windowWidthNum = Number(windowWidth);
-      const windowCenterNum = Number(windowCenter);
+      const windowWidthNum = Number(window);
+      const windowCenterNum = Number(level);
 
       const { viewportId } = _getActiveViewportEnabledElement();
       const viewportToolGroupId = ToolGroupService.getToolGroupForViewport(
@@ -268,12 +272,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,
@@ -358,6 +357,11 @@ const commandsModule = ({ servicesManager }) => {
       storeContexts: [],
       options: {},
     },
+    arrowTextCallback: {
+      commandFn: actions.arrowTextCallback,
+      storeContexts: [],
+      options: {},
+    },
   };
 
   return {