@cornerstonejs/tools 1.25.0 → 1.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/esm/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.25.0",
+    "@cornerstonejs/core": "^1.26.0",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
@@ -52,5 +52,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "d3a8801264dd9284a1839aa74ec4d3685240e163"
+  "gitHead": "df9b69e21ab5dd9ccb33eaca7508abcb9f031e00"
 }

package/src/drawingSvg/drawRedactionRect.ts

@@ -0,0 +1,62 @@
+import _getHash from './_getHash';
+import _setAttributesIfNecessary from './setAttributesIfNecessary';
+import _setNewAttributesIfValid from './setNewAttributesIfValid';
+
+// <rect x="120" y="100" width="100" height="100" />
+export default function drawRedactionRect(
+  svgDrawingHelper: any,
+  annotationUID: string,
+  rectangleUID: string,
+  start: any,
+  end: any,
+  options = {}
+): void {
+  const {
+    color,
+    width: _width,
+    lineWidth,
+    lineDash,
+  } = Object.assign(
+    {
+      color: 'dodgerblue',
+      width: '2',
+      lineWidth: undefined,
+      lineDash: undefined,
+    },
+    options
+  );
+
+  // for supporting both lineWidth and width options
+  const strokeWidth = lineWidth || _width;
+
+  const svgns = 'http://www.w3.org/2000/svg';
+  const svgNodeHash = _getHash(annotationUID, 'rect', rectangleUID);
+  const existingRect = svgDrawingHelper.getSvgNode(svgNodeHash);
+
+  const tlhc = [Math.min(start[0], end[0]), Math.min(start[1], end[1])];
+  const width = Math.abs(start[0] - end[0]);
+  const height = Math.abs(start[1] - end[1]);
+
+  const attributes = {
+    x: `${tlhc[0]}`,
+    y: `${tlhc[1]}`,
+    width: `${width}`,
+    height: `${height}`,
+    stroke: color,
+    fill: 'black',
+    'stroke-width': strokeWidth,
+    'stroke-dasharray': lineDash,
+  };
+
+  if (existingRect) {
+    _setAttributesIfNecessary(attributes, existingRect);
+
+    svgDrawingHelper.setNodeTouched(svgNodeHash);
+  } else {
+    const svgRectElement = document.createElementNS(svgns, 'rect');
+
+    _setNewAttributesIfValid(attributes, svgRectElement);
+
+    svgDrawingHelper.appendNode(svgRectElement, svgNodeHash);
+  }
+}

package/src/drawingSvg/index.ts

@@ -8,6 +8,7 @@ import drawLinkedTextBox from './drawLinkedTextBox';
 import drawRect from './drawRect';
 import drawTextBox from './drawTextBox';
 import drawArrow from './drawArrow';
+import drawRedactionRect from './drawRedactionRect';
 import setAttributesIfNecessary from './setAttributesIfNecessary';
 import setNewAttributesIfValid from './setNewAttributesIfValid';
 
@@ -22,6 +23,7 @@ export {
   drawRect,
   drawTextBox,
   drawArrow,
+  drawRedactionRect,
   setAttributesIfNecessary,
   setNewAttributesIfValid,
 };

package/src/eventListeners/touch/touchStartListener.ts

@@ -28,7 +28,7 @@ const {
   TOUCH_SWIPE,
 } = Events;
 
-interface ITouchTapListnenerState {
+interface ITouchTapListenerState {
   element: HTMLDivElement;
   renderingEngineId: string;
   viewportId: string;
@@ -110,7 +110,7 @@ const defaultState: ITouchStartListenerState = {
 // as pen, left/right handed, index finger vs thumb, etc. These current values
 // assume thumb usage for single finger and index/middle finger for two finger
 // gestures in an attempt to cover the 90% use case.
-const defaultTapState: ITouchTapListnenerState = {
+const defaultTapState: ITouchTapListenerState = {
   renderingEngineId: undefined,
   viewportId: undefined,
   element: null,
@@ -127,18 +127,11 @@ const defaultTapState: ITouchTapListnenerState = {
 };
 
 let state: ITouchStartListenerState = JSON.parse(JSON.stringify(defaultState));
-let tapState: ITouchTapListnenerState = JSON.parse(
+let tapState: ITouchTapListenerState = JSON.parse(
   JSON.stringify(defaultTapState)
 );
 
 function triggerEventCallback(ele, name, eventDetail) {
-  if (runtimeSettings.get('debug')) {
-    if (name === 'CORNERSTONE_TOOLS_TOUCH_DRAG') {
-      console.debug(name);
-    } else {
-      console.debug(name, eventDetail);
-    }
-  }
   return triggerEvent(ele, name, eventDetail);
 }
 

package/src/index.ts

@@ -64,9 +64,12 @@ import {
   SegmentationIntersectionTool,
 } from './tools';
 
+import VideoRedactionTool from './tools/annotation/VideoRedactionTool';
+
 import * as Enums from './enums';
 
 export {
+  VideoRedactionTool,
   //
   init,
   destroy,

package/src/tools/ZoomTool.ts

@@ -145,10 +145,10 @@ class ZoomTool extends BaseTool {
     const size = [element.clientWidth, element.clientHeight];
     const { parallelScale, focalPoint, position } = camera;
 
-    const zoomScale = 1.5 / size[1];
+    const zoomScale = 5 / size[1];
     const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
 
-    let parallelScaleToSet = (1.0 - k) * parallelScale;
+    const parallelScaleToSet = (1.0 - k) * parallelScale;
 
     let focalPointToSet = focalPoint;
     let positionToSet = position;
@@ -163,14 +163,6 @@ class ZoomTool extends BaseTool {
         focalPoint,
         this.initialMousePosWorld
       );
-      // const initialYDistanceBetweenInitialAndFocalPoint;
-
-      // we need to move in the direction of the vector between the focal point
-      // and the initial mouse position by some amount until ultimately we
-      // reach the mouse position at the focal point
-      const zoomScale = 5 / size[1];
-      const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
-      parallelScaleToSet = (1.0 - k) * parallelScale;
 
       positionToSet = vec3.scaleAndAdd(
         vec3.create(),