@cornerstonejs/tools 0.24.13 → 0.24.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/cjs/utilities/getAnnotationNearPoint.js +6 -0
  2. package/dist/cjs/utilities/getAnnotationNearPoint.js.map +1 -1
  3. package/dist/esm/utilities/getAnnotationNearPoint.js +5 -0
  4. package/dist/esm/utilities/getAnnotationNearPoint.js.map +1 -1
  5. package/dist/umd/index.js +1 -1
  6. package/dist/umd/index.js.map +1 -1
  7. package/package.json +3 -3
package/dist/cjs/utilities/getAnnotationNearPoint.js CHANGED
@@ -52,10 +52,16 @@ function getAnnotationNearPointOnEnabledElement(enabledElement, point, proximity
52
52
  }
53
53
  exports.getAnnotationNearPointOnEnabledElement = getAnnotationNearPointOnEnabledElement;
54
54
  function findAnnotationNearPointByTool(tool, enabledElement, point, proximity) {
55
+ var _a, _b, _c;
55
56
  const annotations = (0, annotationState_1.getAnnotations)(enabledElement.viewport.element, tool.constructor.toolName);
57
+ const currentId = (_b = (_a = enabledElement.viewport) === null || _a === void 0 ? void 0 : _a.getCurrentImageId) === null || _b === void 0 ? void 0 : _b.call(_a);
56
58
  if (annotations === null || annotations === void 0 ? void 0 : annotations.length) {
57
59
  const { element } = enabledElement.viewport;
58
60
  for (const annotation of annotations) {
61
+ const referencedImageId = (_c = annotation.metadata) === null || _c === void 0 ? void 0 : _c.referencedImageId;
62
+ if (currentId && referencedImageId && currentId !== referencedImageId) {
63
+ continue;
64
+ }
59
65
  if (tool.isPointNearTool(element, annotation, point, proximity, '') ||
60
66
  tool.getHandleNearImagePoint(element, annotation, point, proximity)) {
61
67
  return annotation;
package/dist/cjs/utilities/getAnnotationNearPoint.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getAnnotationNearPoint.js","sourceRoot":"","sources":["../../../src/utilities/getAnnotationNearPoint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAwD;AAKxD,mFAA+E;AAC/E,4EAA8D;AAW9D,SAAS,sBAAsB,CAC7B,OAAuB,EACvB,WAAyB,EACzB,SAAS,GAAG,CAAC;IAIb,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,OAAO,sCAAsC,CAC3C,cAAc,EACd,WAAW,EACX,SAAS,CACV,CAAC;AACJ,CAAC;AAoFQ,wDAAsB;AAxE/B,SAAS,sCAAsC,CAC7C,cAAqC,EACrC,KAAmB,EACnB,SAAiB;IAIjB,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IACzD,MAAM,SAAS,GAAG,gBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,KAAK,GAAG,6BAA6B,CACzC,KAAK,CAAC,IAAI,CAAC,EACX,cAAc,EACd,KAAK,EACL,SAAS,CACV,CAAC;QACF,IAAI,KAAK,EAAE;YACT,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAyCgC,wFAAsC;AA3BvE,SAAS,6BAA6B,CACpC,IAAoB,EACpB,cAAqC,EACrC,KAAmB,EACnB,SAAiB;IAKjB,MAAM,WAAW,GAAG,IAAA,gCAAc,EAChC,cAAc,CAAC,QAAQ,CAAC,OAAO,EAC9B,IAAI,CAAC,WAA+B,CAAC,QAAQ,CAC/C,CAAC;IACF,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE;QACvB,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAC;QAC5C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,IACE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC;gBAC/D,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,EACnE;gBACA,OAAO,UAAU,CAAC;aACnB;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"getAnnotationNearPoint.js","sourceRoot":"","sources":["../../../src/utilities/getAnnotationNearPoint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAwD;AAKxD,mFAA+E;AAC/E,4EAA8D;AAW9D,SAAS,sBAAsB,CAC7B,OAAuB,EACvB,WAAyB,EACzB,SAAS,GAAG,CAAC;IAIb,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,OAAO,sCAAsC,CAC3C,cAAc,EACd,WAAW,EACX,SAAS,CACV,CAAC;AACJ,CAAC;AA0FQ,wDAAsB;AA9E/B,SAAS,sCAAsC,CAC7C,cAAqC,EACrC,KAAmB,EACnB,SAAiB;IAIjB,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IACzD,MAAM,SAAS,GAAG,gBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,KAAK,GAAG,6BAA6B,CACzC,KAAK,CAAC,IAAI,CAAC,EACX,cAAc,EACd,KAAK,EACL,SAAS,CACV,CAAC;QACF,IAAI,KAAK,EAAE;YACT,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA+CgC,wFAAsC;AAjCvE,SAAS,6BAA6B,CACpC,IAAoB,EACpB,cAAqC,EACrC,KAAmB,EACnB,SAAiB;;IAKjB,MAAM,WAAW,GAAG,IAAA,gCAAc,EAChC,cAAc,CAAC,QAAQ,CAAC,OAAO,EAC9B,IAAI,CAAC,WAA+B,CAAC,QAAQ,CAC/C,CAAC;IACF,MAAM,SAAS,GAAG,MAAA,MAAA,cAAc,CAAC,QAAQ,0CAAE,iBAAiB,kDAAI,CAAC;IACjE,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE;QACvB,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAC;QAC5C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAM,iBAAiB,GAAG,MAAA,UAAU,CAAC,QAAQ,0CAAE,iBAAiB,CAAC;YACjE,IAAI,SAAS,IAAI,iBAAiB,IAAI,SAAS,KAAK,iBAAiB,EAAE;gBACrE,SAAS;aACV;YAED,IACE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC;gBAC/D,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,EACnE;gBACA,OAAO,UAAU,CAAC;aACnB;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
package/dist/esm/utilities/getAnnotationNearPoint.js CHANGED
@@ -25,9 +25,14 @@ function getAnnotationNearPointOnEnabledElement(enabledElement, point, proximity
25
25
  }
26
26
  function findAnnotationNearPointByTool(tool, enabledElement, point, proximity) {
27
27
  const annotations = getAnnotations(enabledElement.viewport.element, tool.constructor.toolName);
28
+ const currentId = enabledElement.viewport?.getCurrentImageId?.();
28
29
  if (annotations?.length) {
29
30
  const { element } = enabledElement.viewport;
30
31
  for (const annotation of annotations) {
32
+ const referencedImageId = annotation.metadata?.referencedImageId;
33
+ if (currentId && referencedImageId && currentId !== referencedImageId) {
34
+ continue;
35
+ }
31
36
  if (tool.isPointNearTool(element, annotation, point, proximity, '') ||
32
37
  tool.getHandleNearImagePoint(element, annotation, point, proximity)) {
33
38
  return annotation;
package/dist/esm/utilities/getAnnotationNearPoint.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getAnnotationNearPoint.js","sourceRoot":"","sources":["../../../src/utilities/getAnnotationNearPoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAKxD,OAAO,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,gBAAgB,MAAM,2BAA2B,CAAC;AAW9D,SAAS,sBAAsB,CAC7B,OAAuB,EACvB,WAAyB,EACzB,SAAS,GAAG,CAAC;IAIb,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,OAAO,sCAAsC,CAC3C,cAAc,EACd,WAAW,EACX,SAAS,CACV,CAAC;AACJ,CAAC;AAYD,SAAS,sCAAsC,CAC7C,cAAqC,EACrC,KAAmB,EACnB,SAAiB;IAIjB,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IACzD,MAAM,SAAS,GAAG,gBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,KAAK,GAAG,6BAA6B,CACzC,KAAK,CAAC,IAAI,CAAC,EACX,cAAc,EACd,KAAK,EACL,SAAS,CACV,CAAC;QACF,IAAI,KAAK,EAAE;YACT,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAcD,SAAS,6BAA6B,CACpC,IAAoB,EACpB,cAAqC,EACrC,KAAmB,EACnB,SAAiB;IAKjB,MAAM,WAAW,GAAG,cAAc,CAChC,cAAc,CAAC,QAAQ,CAAC,OAAO,EAC9B,IAAI,CAAC,WAA+B,CAAC,QAAQ,CAC/C,CAAC;IACF,IAAI,WAAW,EAAE,MAAM,EAAE;QACvB,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAC;QAC5C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,IACE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC;gBAC/D,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,EACnE;gBACA,OAAO,UAAU,CAAC;aACnB;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,OAAO,EAAE,sBAAsB,EAAE,sCAAsC,EAAE,CAAC"}
1
+ {"version":3,"file":"getAnnotationNearPoint.js","sourceRoot":"","sources":["../../../src/utilities/getAnnotationNearPoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAKxD,OAAO,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,gBAAgB,MAAM,2BAA2B,CAAC;AAW9D,SAAS,sBAAsB,CAC7B,OAAuB,EACvB,WAAyB,EACzB,SAAS,GAAG,CAAC;IAIb,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,OAAO,sCAAsC,CAC3C,cAAc,EACd,WAAW,EACX,SAAS,CACV,CAAC;AACJ,CAAC;AAYD,SAAS,sCAAsC,CAC7C,cAAqC,EACrC,KAAmB,EACnB,SAAiB;IAIjB,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IACzD,MAAM,SAAS,GAAG,gBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,KAAK,GAAG,6BAA6B,CACzC,KAAK,CAAC,IAAI,CAAC,EACX,cAAc,EACd,KAAK,EACL,SAAS,CACV,CAAC;QACF,IAAI,KAAK,EAAE;YACT,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAcD,SAAS,6BAA6B,CACpC,IAAoB,EACpB,cAAqC,EACrC,KAAmB,EACnB,SAAiB;IAKjB,MAAM,WAAW,GAAG,cAAc,CAChC,cAAc,CAAC,QAAQ,CAAC,OAAO,EAC9B,IAAI,CAAC,WAA+B,CAAC,QAAQ,CAC/C,CAAC;IACF,MAAM,SAAS,GAAG,cAAc,CAAC,QAAQ,EAAE,iBAAiB,EAAE,EAAE,CAAC;IACjE,IAAI,WAAW,EAAE,MAAM,EAAE;QACvB,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAC;QAC5C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAM,iBAAiB,GAAG,UAAU,CAAC,QAAQ,EAAE,iBAAiB,CAAC;YACjE,IAAI,SAAS,IAAI,iBAAiB,IAAI,SAAS,KAAK,iBAAiB,EAAE;gBACrE,SAAS;aACV;YAED,IACE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC;gBAC/D,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,EACnE;gBACA,OAAO,UAAU,CAAC;aACnB;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,OAAO,EAAE,sBAAsB,EAAE,sCAAsC,EAAE,CAAC"}