[OHIF-295] - Esc button should stop the creation of a measurement or annotation (#1883)

* WIP, need to fix arrow making measurement

* Update cornerstoneTools to fix cst arrow annotate event bug.

extensions/cornerstone/package.json

@@ -33,7 +33,7 @@
     "@ohif/ui": "^0.50.0",
     "cornerstone-core": "^2.3.0",
     "cornerstone-math": "^0.1.8",
-    "cornerstone-tools": "4.18.0",
+    "cornerstone-tools": "4.18.1",
     "cornerstone-wado-image-loader": "^3.1.2",
     "dcmjs": "0.14.2",
     "dicom-parser": "^1.8.3",

extensions/cornerstone/src/commandsModule.js

@@ -79,6 +79,21 @@ const commandsModule = ({ servicesManager }) => {
         cornerstone.setViewport(enabledElement, viewport);
       }
     },
+    cancelMeasurement: () => {
+      const enabledElement = _getActiveViewportsEnabledElement();
+
+      if (enabledElement) {
+        debugger;
+
+        const cancelActiveManipulatorsForElement = cornerstoneTools.getModule(
+          'manipulatorState'
+        ).setters.cancelActiveManipulatorsForElement;
+
+        cancelActiveManipulatorsForElement(enabledElement);
+
+        cornerstone.updateImage(enabledElement);
+      }
+    },
     // TODO: this is receiving `evt` from `ToolbarRow`. We could use it to have
     //       better mouseButtonMask sets.
     setToolActive: ({ toolName }) => {
@@ -349,6 +364,11 @@ const commandsModule = ({ servicesManager }) => {
       storeContexts: [],
       options: {},
     },
+    cancelMeasurement: {
+      commandFn: actions.cancelMeasurement,
+      storeContexts: [],
+      options: {},
+    },
     flipViewportVertical: {
       commandFn: actions.flipViewportVertical,
       storeContexts: [],

extensions/dicom-rt/package.json

@@ -30,7 +30,7 @@
   "peerDependencies": {
     "@ohif/core": "^0.50.0",
     "cornerstone-core": "^2.2.8",
-    "cornerstone-tools": "4.18.0",
+    "cornerstone-tools": "4.18.1",
     "dcmjs": "0.14.2",
     "prop-types": "^15.6.2",
     "react": "^16.8.6",

extensions/dicom-segmentation/package.json

@@ -30,7 +30,7 @@
   "peerDependencies": {
     "@ohif/core": "^0.50.0",
     "cornerstone-core": "^2.2.8",
-    "cornerstone-tools": "4.18.0",
+    "cornerstone-tools": "4.18.1",
     "dcmjs": "0.14.2",
     "prop-types": "^15.6.2",
     "react": "^16.8.6",

extensions/dicom-sr/package.json

@@ -33,7 +33,7 @@
     "@ohif/ui": "^0.50.0",
     "cornerstone-core": "^2.3.0",
     "cornerstone-math": "^0.1.8",
-    "cornerstone-tools": "4.18.0",
+    "cornerstone-tools": "4.18.1",
     "cornerstone-wado-image-loader": "^3.1.2",
     "dcmjs": "0.14.2",
     "dicom-parser": "^1.8.3",

extensions/measurement-tracking/package.json

@@ -28,7 +28,7 @@
   },
   "peerDependencies": {
     "@ohif/core": "^0.50.0",
-    "cornerstone-tools": "4.18.0",
+    "cornerstone-tools": "4.18.1",
     "dcmjs": "0.14.2",
     "prop-types": "^15.6.2",
     "react": "^16.13.1",

extensions/vtk/package.json

@@ -57,7 +57,7 @@
     "@ohif/core": "^2.9.6",
     "@ohif/ui": "^2.0.0",
     "cornerstone-core": "^2.3.0",
-    "cornerstone-tools": "4.18.0",
+    "cornerstone-tools": "4.18.1",
     "cornerstone-wado-image-loader": "^3.1.2",
     "dicom-parser": "^1.8.3",
     "gh-pages": "^2.0.1",