@cornerstonejs/tools 1.13.0 → 1.13.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "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.13.0",
+    "@cornerstonejs/core": "^1.13.2",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
@@ -52,5 +52,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "64173701acdeb7097e6ae4122606138065ebcecc"
+  "gitHead": "b41b433d7c4062667a7b51ca8ad37c4ff939ba09"
 }

package/src/drawingSvg/drawCircle.ts

@@ -3,8 +3,8 @@ import { SVGDrawingHelper } from '../types';
 
 import _getHash from './_getHash';
 
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
 
 function drawCircle(
   svgDrawingHelper: SVGDrawingHelper,
@@ -45,7 +45,7 @@ function drawCircle(
   };
 
   if (existingCircleElement) {
-    _setAttributesIfNecessary(attributes, existingCircleElement);
+    setAttributesIfNecessary(attributes, existingCircleElement);
 
     svgDrawingHelper.setNodeTouched(svgNodeHash);
   } else {
@@ -55,7 +55,7 @@ function drawCircle(
       newCircleElement.setAttribute('data-id', dataId);
     }
 
-    _setNewAttributesIfValid(attributes, newCircleElement);
+    setNewAttributesIfValid(attributes, newCircleElement);
 
     svgDrawingHelper.appendNode(newCircleElement, svgNodeHash);
   }

package/src/drawingSvg/drawEllipse.ts

@@ -2,8 +2,8 @@ import type { Types } from '@cornerstonejs/core';
 import { SVGDrawingHelper } from '../types';
 
 import _getHash from './_getHash';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
 
 function drawEllipse(
   svgDrawingHelper: SVGDrawingHelper,
@@ -52,7 +52,7 @@ function drawEllipse(
   };
 
   if (existingEllipse) {
-    _setAttributesIfNecessary(attributes, existingEllipse);
+    setAttributesIfNecessary(attributes, existingEllipse);
 
     svgDrawingHelper.setNodeTouched(svgNodeHash);
   } else {
@@ -62,7 +62,7 @@ function drawEllipse(
       svgEllipseElement.setAttribute('data-id', dataId);
     }
 
-    _setNewAttributesIfValid(attributes, svgEllipseElement);
+    setNewAttributesIfValid(attributes, svgEllipseElement);
 
     svgDrawingHelper.appendNode(svgEllipseElement, svgNodeHash);
   }

package/src/drawingSvg/drawHandles.ts

@@ -1,8 +1,8 @@
 import type { Types } from '@cornerstonejs/core';
 
 import _getHash from './_getHash';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
 import { SVGDrawingHelper } from '../types';
 
 function drawHandles(
@@ -75,13 +75,13 @@ function drawHandles(
     const existingHandleElement = svgDrawingHelper.getSvgNode(svgNodeHash);
 
     if (existingHandleElement) {
-      _setAttributesIfNecessary(attributes, existingHandleElement);
+      setAttributesIfNecessary(attributes, existingHandleElement);
 
       svgDrawingHelper.setNodeTouched(svgNodeHash);
     } else {
       const newHandleElement = document.createElementNS(svgns, type);
 
-      _setNewAttributesIfValid(attributes, newHandleElement);
+      setNewAttributesIfValid(attributes, newHandleElement);
 
       svgDrawingHelper.appendNode(newHandleElement, svgNodeHash);
     }

package/src/drawingSvg/drawLine.ts

@@ -1,8 +1,8 @@
 import type { Types } from '@cornerstonejs/core';
 
 import _getHash from './_getHash';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
 import { SVGDrawingHelper } from '../types';
 
 export default function drawLine(
@@ -53,7 +53,7 @@ export default function drawLine(
 
   if (existingLine) {
     // This is run to avoid re-rendering annotations that actually haven't changed
-    _setAttributesIfNecessary(attributes, existingLine);
+    setAttributesIfNecessary(attributes, existingLine);
 
     svgDrawingHelper.setNodeTouched(svgNodeHash);
   } else {
@@ -63,7 +63,7 @@ export default function drawLine(
       newLine.setAttribute('data-id', dataId);
     }
 
-    _setNewAttributesIfValid(attributes, newLine);
+    setNewAttributesIfValid(attributes, newLine);
 
     svgDrawingHelper.appendNode(newLine, svgNodeHash);
   }

package/src/drawingSvg/drawPolyline.ts

@@ -1,7 +1,7 @@
 import type { Types } from '@cornerstonejs/core';
 import _getHash from './_getHash';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
 import { SVGDrawingHelper } from '../types';
 
 /**
@@ -67,13 +67,13 @@ export default function drawPolyline(
 
   if (existingPolyLine) {
     // This is run to avoid re-rendering annotations that actually haven't changed
-    _setAttributesIfNecessary(attributes, existingPolyLine);
+    setAttributesIfNecessary(attributes, existingPolyLine);
 
     svgDrawingHelper.setNodeTouched(svgNodeHash);
   } else {
     const newPolyLine = document.createElementNS(svgns, 'polyline');
 
-    _setNewAttributesIfValid(attributes, newPolyLine);
+    setNewAttributesIfValid(attributes, newPolyLine);
 
     svgDrawingHelper.appendNode(newPolyLine, svgNodeHash);
   }

package/src/drawingSvg/drawRect.ts

@@ -1,8 +1,8 @@
 import type { Types } from '@cornerstonejs/core';
 
 import _getHash from './_getHash';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
-import _setNewAttributesIfValid from './_setNewAttributesIfValid';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
 import { SVGDrawingHelper } from '../types';
 
 // <rect x="120" y="100" width="100" height="100" />
@@ -53,7 +53,7 @@ export default function drawRect(
   };
 
   if (existingRect) {
-    _setAttributesIfNecessary(attributes, existingRect);
+    setAttributesIfNecessary(attributes, existingRect);
 
     svgDrawingHelper.setNodeTouched(svgNodeHash);
   } else {
@@ -63,7 +63,7 @@ export default function drawRect(
       svgRectElement.setAttribute('data-id', dataId);
     }
 
-    _setNewAttributesIfValid(attributes, svgRectElement);
+    setNewAttributesIfValid(attributes, svgRectElement);
 
     svgDrawingHelper.appendNode(svgRectElement, svgNodeHash);
   }

package/src/drawingSvg/drawTextBox.ts

@@ -2,7 +2,7 @@ import type { Types } from '@cornerstonejs/core';
 import { SVGDrawingHelper } from '../types';
 
 import _getHash from './_getHash';
-import _setAttributesIfNecessary from './_setAttributesIfNecessary';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
 
 /**
  * Draws a textBox.
@@ -100,8 +100,8 @@ function _drawTextGroup(
     };
 
     // Todo: for some reason this does not work to not re-render the textBox
-    _setAttributesIfNecessary(textAttributes, textElement);
-    _setAttributesIfNecessary(textGroupAttributes, existingTextGroup);
+    setAttributesIfNecessary(textAttributes, textElement);
+    setAttributesIfNecessary(textGroupAttributes, existingTextGroup);
 
     textGroupBoundingBox = _drawTextBackground(existingTextGroup, background);
 
@@ -205,7 +205,7 @@ function _drawTextBackground(group: SVGGElement, color: string) {
     fill: color,
   };
 
-  _setAttributesIfNecessary(attributes, element);
+  setAttributesIfNecessary(attributes, element);
 
   return bBox;
 }

package/src/drawingSvg/index.ts

@@ -8,6 +8,8 @@ import drawLinkedTextBox from './drawLinkedTextBox';
 import drawRect from './drawRect';
 import drawTextBox from './drawTextBox';
 import drawArrow from './drawArrow';
+import setAttributesIfNecessary from './setAttributesIfNecessary';
+import setNewAttributesIfValid from './setNewAttributesIfValid';
 
 export {
   draw,
@@ -20,4 +22,6 @@ export {
   drawRect,
   drawTextBox,
   drawArrow,
+  setAttributesIfNecessary,
+  setNewAttributesIfValid,
 };

package/src/drawingSvg/{_setAttributesIfNecessary.ts → setAttributesIfNecessary.ts}

@@ -1,4 +1,4 @@
-export function _setAttributesIfNecessary(attributes, svgNode) {
+export function setAttributesIfNecessary(attributes, svgNode) {
   Object.keys(attributes).forEach((key) => {
     const currentValue = svgNode.getAttribute(key);
     const newValue = attributes[key];
@@ -10,4 +10,4 @@ export function _setAttributesIfNecessary(attributes, svgNode) {
   });
 }
 
-export default _setAttributesIfNecessary;
+export default setAttributesIfNecessary;

package/src/drawingSvg/{_setNewAttributesIfValid.ts → setNewAttributesIfValid.ts}

@@ -1,4 +1,4 @@
-export function _setNewAttributesIfValid(attributes, svgNode) {
+export function setNewAttributesIfValid(attributes, svgNode) {
   Object.keys(attributes).forEach((key) => {
     const newValue = attributes[key];
     if (newValue !== undefined && newValue !== '') {
@@ -7,4 +7,4 @@ export function _setNewAttributesIfValid(attributes, svgNode) {
   });
 }
 
-export default _setNewAttributesIfValid;
+export default setNewAttributesIfValid;

package/src/index.ts

@@ -23,6 +23,7 @@ import * as segmentation from './stateManagement/segmentation';
 import {
   BaseTool,
   AnnotationTool,
+  AnnotationDisplayTool,
   PanTool,
   TrackballRotateTool,
   DragProbeTool,
@@ -71,6 +72,7 @@ export {
   // Base Tools
   BaseTool,
   AnnotationTool,
+  AnnotationDisplayTool,
   // Manipulation Tools
   PanTool,
   TrackballRotateTool,

package/src/tools/base/index.ts

@@ -1,4 +1,5 @@
 import BaseTool from './BaseTool';
 import AnnotationTool from './AnnotationTool';
+import AnnotationDisplayTool from './AnnotationDisplayTool';
 
-export { BaseTool, AnnotationTool };
+export { BaseTool, AnnotationTool, AnnotationDisplayTool };

package/src/tools/index.ts

@@ -1,4 +1,4 @@
-import { BaseTool, AnnotationTool } from './base';
+import { BaseTool, AnnotationTool, AnnotationDisplayTool } from './base';
 import PanTool from './PanTool';
 import TrackballRotateTool from './TrackballRotateTool';
 import WindowLevelTool from './WindowLevelTool';
@@ -43,6 +43,7 @@ export {
   // ~~ BASE
   BaseTool,
   AnnotationTool,
+  AnnotationDisplayTool,
   // Manipulation Tools
   PanTool,
   TrackballRotateTool,

package/dist/cjs/drawingSvg/_setAttributesIfNecessary.d.ts

@@ -1,2 +0,0 @@
-export declare function _setAttributesIfNecessary(attributes: any, svgNode: any): void;
-export default _setAttributesIfNecessary;

package/dist/cjs/drawingSvg/_setAttributesIfNecessary.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_setAttributesIfNecessary.js","sourceRoot":"","sources":["../../../src/drawingSvg/_setAttributesIfNecessary.ts"],"names":[],"mappings":";;;AAAA,SAAgB,yBAAyB,CAAC,UAAU,EAAE,OAAO;IAC3D,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACtC,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE,EAAE;YAC7C,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;SAC9B;aAAM,IAAI,YAAY,KAAK,QAAQ,EAAE;YACpC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAVD,8DAUC;AAED,kBAAe,yBAAyB,CAAC"}

package/dist/cjs/drawingSvg/_setNewAttributesIfValid.d.ts

@@ -1,2 +0,0 @@
-export declare function _setNewAttributesIfValid(attributes: any, svgNode: any): void;
-export default _setNewAttributesIfValid;

package/dist/cjs/drawingSvg/_setNewAttributesIfValid.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_setNewAttributesIfValid.js","sourceRoot":"","sources":["../../../src/drawingSvg/_setNewAttributesIfValid.ts"],"names":[],"mappings":";;;AAAA,SAAgB,wBAAwB,CAAC,UAAU,EAAE,OAAO;IAC1D,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACtC,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE,EAAE;YAC7C,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,4DAOC;AAED,kBAAe,wBAAwB,CAAC"}

package/dist/esm/drawingSvg/_setAttributesIfNecessary.d.ts

@@ -1,2 +0,0 @@
-export declare function _setAttributesIfNecessary(attributes: any, svgNode: any): void;
-export default _setAttributesIfNecessary;

package/dist/esm/drawingSvg/_setAttributesIfNecessary.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_setAttributesIfNecessary.js","sourceRoot":"","sources":["../../../src/drawingSvg/_setAttributesIfNecessary.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,yBAAyB,CAAC,UAAU,EAAE,OAAO;IAC3D,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACtC,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE,EAAE;YAC7C,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;SAC9B;aAAM,IAAI,YAAY,KAAK,QAAQ,EAAE;YACpC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,eAAe,yBAAyB,CAAC"}

package/dist/esm/drawingSvg/_setNewAttributesIfValid.d.ts

@@ -1,2 +0,0 @@
-export declare function _setNewAttributesIfValid(attributes: any, svgNode: any): void;
-export default _setNewAttributesIfValid;

package/dist/esm/drawingSvg/_setNewAttributesIfValid.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_setNewAttributesIfValid.js","sourceRoot":"","sources":["../../../src/drawingSvg/_setNewAttributesIfValid.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,wBAAwB,CAAC,UAAU,EAAE,OAAO;IAC1D,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACtC,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE,EAAE;YAC7C,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,eAAe,wBAAwB,CAAC"}