@cornerstonejs/tools 1.31.0 → 1.32.1

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 (167) hide show
  1. package/dist/cjs/index.d.ts +2 -2
  2. package/dist/cjs/index.js +3 -2
  3. package/dist/cjs/index.js.map +1 -1
  4. package/dist/cjs/stateManagement/annotation/AnnotationGroup.d.ts +18 -0
  5. package/dist/cjs/stateManagement/annotation/AnnotationGroup.js +73 -0
  6. package/dist/cjs/stateManagement/annotation/AnnotationGroup.js.map +1 -0
  7. package/dist/cjs/stateManagement/annotation/annotationState.js +1 -1
  8. package/dist/cjs/stateManagement/annotation/annotationState.js.map +1 -1
  9. package/dist/cjs/stateManagement/annotation/index.d.ts +2 -1
  10. package/dist/cjs/stateManagement/annotation/index.js +3 -1
  11. package/dist/cjs/stateManagement/annotation/index.js.map +1 -1
  12. package/dist/cjs/store/ToolGroupManager/ToolGroup.d.ts +1 -0
  13. package/dist/cjs/store/ToolGroupManager/ToolGroup.js +3 -1
  14. package/dist/cjs/store/ToolGroupManager/ToolGroup.js.map +1 -1
  15. package/dist/cjs/synchronizers/callbacks/stackImageSyncCallback.js +1 -1
  16. package/dist/cjs/synchronizers/callbacks/stackImageSyncCallback.js.map +1 -1
  17. package/dist/cjs/tools/annotation/KeyImageTool.d.ts +62 -0
  18. package/dist/cjs/tools/annotation/KeyImageTool.js +212 -0
  19. package/dist/cjs/tools/annotation/KeyImageTool.js.map +1 -0
  20. package/dist/cjs/tools/annotation/PlanarFreehandROITool.js +2 -5
  21. package/dist/cjs/tools/annotation/PlanarFreehandROITool.js.map +1 -1
  22. package/dist/cjs/tools/annotation/ProbeTool.js +15 -4
  23. package/dist/cjs/tools/annotation/ProbeTool.js.map +1 -1
  24. package/dist/cjs/tools/annotation/VideoRedactionTool.js +4 -1
  25. package/dist/cjs/tools/annotation/VideoRedactionTool.js.map +1 -1
  26. package/dist/cjs/tools/base/AnnotationDisplayTool.js +4 -2
  27. package/dist/cjs/tools/base/AnnotationDisplayTool.js.map +1 -1
  28. package/dist/cjs/tools/base/AnnotationTool.js +2 -7
  29. package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
  30. package/dist/cjs/tools/base/BaseTool.js +9 -1
  31. package/dist/cjs/tools/base/BaseTool.js.map +1 -1
  32. package/dist/cjs/tools/index.d.ts +5 -4
  33. package/dist/cjs/tools/index.js +9 -7
  34. package/dist/cjs/tools/index.js.map +1 -1
  35. package/dist/cjs/types/CalculatorTypes.d.ts +1 -1
  36. package/dist/cjs/utilities/annotationFrameRange.d.ts +13 -0
  37. package/dist/cjs/utilities/annotationFrameRange.js +46 -0
  38. package/dist/cjs/utilities/annotationFrameRange.js.map +1 -0
  39. package/dist/cjs/utilities/index.d.ts +2 -1
  40. package/dist/cjs/utilities/index.js +3 -1
  41. package/dist/cjs/utilities/index.js.map +1 -1
  42. package/dist/cjs/utilities/math/basic/BasicStatsCalculator.d.ts +0 -1
  43. package/dist/cjs/utilities/math/basic/BasicStatsCalculator.js +35 -22
  44. package/dist/cjs/utilities/math/basic/BasicStatsCalculator.js.map +1 -1
  45. package/dist/cjs/utilities/math/ellipse/pointInEllipse.d.ts +2 -1
  46. package/dist/cjs/utilities/math/ellipse/pointInEllipse.js.map +1 -1
  47. package/dist/cjs/utilities/math/sphere/pointInSphere.d.ts +1 -1
  48. package/dist/cjs/utilities/math/sphere/pointInSphere.js +3 -3
  49. package/dist/cjs/utilities/math/sphere/pointInSphere.js.map +1 -1
  50. package/dist/cjs/utilities/planar/filterAnnotationsForDisplay.js +19 -2
  51. package/dist/cjs/utilities/planar/filterAnnotationsForDisplay.js.map +1 -1
  52. package/dist/cjs/utilities/pointInShapeCallback.d.ts +6 -5
  53. package/dist/cjs/utilities/pointInShapeCallback.js +27 -26
  54. package/dist/cjs/utilities/pointInShapeCallback.js.map +1 -1
  55. package/dist/cjs/utilities/roundNumber.d.ts +1 -1
  56. package/dist/cjs/utilities/roundNumber.js +3 -0
  57. package/dist/cjs/utilities/roundNumber.js.map +1 -1
  58. package/dist/cjs/utilities/viewport/isViewportPreScaled.js +1 -1
  59. package/dist/cjs/utilities/viewport/isViewportPreScaled.js.map +1 -1
  60. package/dist/esm/index.js +2 -2
  61. package/dist/esm/index.js.map +1 -1
  62. package/dist/esm/stateManagement/annotation/AnnotationGroup.js +70 -0
  63. package/dist/esm/stateManagement/annotation/AnnotationGroup.js.map +1 -0
  64. package/dist/esm/stateManagement/annotation/annotationState.js +1 -1
  65. package/dist/esm/stateManagement/annotation/annotationState.js.map +1 -1
  66. package/dist/esm/stateManagement/annotation/index.js +2 -1
  67. package/dist/esm/stateManagement/annotation/index.js.map +1 -1
  68. package/dist/esm/store/ToolGroupManager/ToolGroup.js +3 -1
  69. package/dist/esm/store/ToolGroupManager/ToolGroup.js.map +1 -1
  70. package/dist/esm/synchronizers/callbacks/stackImageSyncCallback.js +1 -1
  71. package/dist/esm/synchronizers/callbacks/stackImageSyncCallback.js.map +1 -1
  72. package/dist/esm/tools/annotation/KeyImageTool.js +207 -0
  73. package/dist/esm/tools/annotation/KeyImageTool.js.map +1 -0
  74. package/dist/esm/tools/annotation/PlanarFreehandROITool.js +3 -6
  75. package/dist/esm/tools/annotation/PlanarFreehandROITool.js.map +1 -1
  76. package/dist/esm/tools/annotation/ProbeTool.js +17 -6
  77. package/dist/esm/tools/annotation/ProbeTool.js.map +1 -1
  78. package/dist/esm/tools/annotation/VideoRedactionTool.js +4 -1
  79. package/dist/esm/tools/annotation/VideoRedactionTool.js.map +1 -1
  80. package/dist/esm/tools/base/AnnotationDisplayTool.js +4 -2
  81. package/dist/esm/tools/base/AnnotationDisplayTool.js.map +1 -1
  82. package/dist/esm/tools/base/AnnotationTool.js +3 -8
  83. package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
  84. package/dist/esm/tools/base/BaseTool.js +9 -1
  85. package/dist/esm/tools/base/BaseTool.js.map +1 -1
  86. package/dist/esm/tools/index.js +5 -4
  87. package/dist/esm/tools/index.js.map +1 -1
  88. package/dist/esm/utilities/annotationFrameRange.js +43 -0
  89. package/dist/esm/utilities/annotationFrameRange.js.map +1 -0
  90. package/dist/esm/utilities/index.js +2 -1
  91. package/dist/esm/utilities/index.js.map +1 -1
  92. package/dist/esm/utilities/math/basic/BasicStatsCalculator.js +35 -22
  93. package/dist/esm/utilities/math/basic/BasicStatsCalculator.js.map +1 -1
  94. package/dist/esm/utilities/math/ellipse/pointInEllipse.js.map +1 -1
  95. package/dist/esm/utilities/math/sphere/pointInSphere.js +3 -3
  96. package/dist/esm/utilities/math/sphere/pointInSphere.js.map +1 -1
  97. package/dist/esm/utilities/planar/filterAnnotationsForDisplay.js +19 -2
  98. package/dist/esm/utilities/planar/filterAnnotationsForDisplay.js.map +1 -1
  99. package/dist/esm/utilities/pointInShapeCallback.js +27 -26
  100. package/dist/esm/utilities/pointInShapeCallback.js.map +1 -1
  101. package/dist/esm/utilities/roundNumber.js +3 -0
  102. package/dist/esm/utilities/roundNumber.js.map +1 -1
  103. package/dist/esm/utilities/viewport/isViewportPreScaled.js +1 -1
  104. package/dist/esm/utilities/viewport/isViewportPreScaled.js.map +1 -1
  105. package/dist/types/index.d.ts +2 -2
  106. package/dist/types/index.d.ts.map +1 -1
  107. package/dist/types/stateManagement/annotation/AnnotationGroup.d.ts +19 -0
  108. package/dist/types/stateManagement/annotation/AnnotationGroup.d.ts.map +1 -0
  109. package/dist/types/stateManagement/annotation/index.d.ts +2 -1
  110. package/dist/types/stateManagement/annotation/index.d.ts.map +1 -1
  111. package/dist/types/store/ToolGroupManager/ToolGroup.d.ts +1 -0
  112. package/dist/types/store/ToolGroupManager/ToolGroup.d.ts.map +1 -1
  113. package/dist/types/synchronizers/callbacks/stackImageSyncCallback.d.ts.map +1 -1
  114. package/dist/types/tools/annotation/KeyImageTool.d.ts +63 -0
  115. package/dist/types/tools/annotation/KeyImageTool.d.ts.map +1 -0
  116. package/dist/types/tools/annotation/PlanarFreehandROITool.d.ts.map +1 -1
  117. package/dist/types/tools/annotation/ProbeTool.d.ts.map +1 -1
  118. package/dist/types/tools/annotation/VideoRedactionTool.d.ts.map +1 -1
  119. package/dist/types/tools/base/AnnotationDisplayTool.d.ts.map +1 -1
  120. package/dist/types/tools/base/AnnotationTool.d.ts.map +1 -1
  121. package/dist/types/tools/base/BaseTool.d.ts.map +1 -1
  122. package/dist/types/tools/index.d.ts +5 -4
  123. package/dist/types/tools/index.d.ts.map +1 -1
  124. package/dist/types/types/CalculatorTypes.d.ts +1 -1
  125. package/dist/types/types/CalculatorTypes.d.ts.map +1 -1
  126. package/dist/types/utilities/annotationFrameRange.d.ts +14 -0
  127. package/dist/types/utilities/annotationFrameRange.d.ts.map +1 -0
  128. package/dist/types/utilities/index.d.ts +2 -1
  129. package/dist/types/utilities/index.d.ts.map +1 -1
  130. package/dist/types/utilities/math/basic/BasicStatsCalculator.d.ts +0 -1
  131. package/dist/types/utilities/math/basic/BasicStatsCalculator.d.ts.map +1 -1
  132. package/dist/types/utilities/math/ellipse/pointInEllipse.d.ts +2 -1
  133. package/dist/types/utilities/math/ellipse/pointInEllipse.d.ts.map +1 -1
  134. package/dist/types/utilities/math/sphere/pointInSphere.d.ts +1 -1
  135. package/dist/types/utilities/math/sphere/pointInSphere.d.ts.map +1 -1
  136. package/dist/types/utilities/planar/filterAnnotationsForDisplay.d.ts.map +1 -1
  137. package/dist/types/utilities/pointInShapeCallback.d.ts +6 -5
  138. package/dist/types/utilities/pointInShapeCallback.d.ts.map +1 -1
  139. package/dist/types/utilities/roundNumber.d.ts +1 -1
  140. package/dist/types/utilities/roundNumber.d.ts.map +1 -1
  141. package/dist/umd/index.js +1 -1
  142. package/dist/umd/index.js.map +1 -1
  143. package/package.json +3 -3
  144. package/src/index.ts +2 -0
  145. package/src/stateManagement/annotation/AnnotationGroup.ts +120 -0
  146. package/src/stateManagement/annotation/annotationState.ts +1 -1
  147. package/src/stateManagement/annotation/index.ts +2 -0
  148. package/src/store/ToolGroupManager/ToolGroup.ts +10 -1
  149. package/src/synchronizers/callbacks/stackImageSyncCallback.ts +2 -1
  150. package/src/tools/annotation/KeyImageTool.ts +435 -0
  151. package/src/tools/annotation/PlanarFreehandROITool.ts +4 -6
  152. package/src/tools/annotation/ProbeTool.ts +19 -6
  153. package/src/tools/annotation/VideoRedactionTool.ts +10 -1
  154. package/src/tools/base/AnnotationDisplayTool.ts +3 -4
  155. package/src/tools/base/AnnotationTool.ts +3 -6
  156. package/src/tools/base/BaseTool.ts +18 -2
  157. package/src/tools/index.ts +8 -5
  158. package/src/types/CalculatorTypes.ts +1 -1
  159. package/src/utilities/annotationFrameRange.ts +78 -0
  160. package/src/utilities/index.ts +2 -0
  161. package/src/utilities/math/basic/BasicStatsCalculator.ts +51 -23
  162. package/src/utilities/math/ellipse/pointInEllipse.ts +2 -1
  163. package/src/utilities/math/sphere/pointInSphere.ts +4 -7
  164. package/src/utilities/planar/filterAnnotationsForDisplay.ts +29 -3
  165. package/src/utilities/pointInShapeCallback.ts +46 -38
  166. package/src/utilities/roundNumber.ts +7 -1
  167. package/src/utilities/viewport/isViewportPreScaled.ts +1 -1
@@ -14,6 +14,7 @@ import pointInSurroundingSphereCallback from './pointInSurroundingSphereCallback
14
14
  import scroll from './scroll';
15
15
  import roundNumber from './roundNumber';
16
16
  import { pointToString } from './pointToString';
17
+ import annotationFrameRange from './annotationFrameRange';
17
18
  import * as segmentation from './segmentation';
18
19
  import * as drawing from './drawing';
19
20
  import * as math from './math';
@@ -31,4 +32,4 @@ import * as dynamicVolume from './dynamicVolume';
31
32
  import * as polyDataUtils from './polyData/utils';
32
33
  import * as voi from './voi';
33
34
  import { triggerEvent } from '@cornerstonejs/core';
34
- export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnits, getCalibratedScale, segmentation, triggerAnnotationRenderForViewportIds, triggerAnnotationRender, pointInShapeCallback, pointInSurroundingSphereCallback, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, jumpToSlice, viewport, cine, clip, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, scroll, roundNumber, pointToString, polyDataUtils, voi, };
35
+ export { math, planar, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnits, getCalibratedScale, segmentation, triggerAnnotationRenderForViewportIds, triggerAnnotationRender, pointInShapeCallback, pointInSurroundingSphereCallback, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, jumpToSlice, viewport, cine, clip, boundingBox, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, scroll, roundNumber, pointToString, polyDataUtils, voi, annotationFrameRange, };
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.voi = exports.polyDataUtils = exports.pointToString = exports.roundNumber = exports.scroll = exports.stackContextPrefetch = exports.stackPrefetch = exports.planarFreehandROITool = exports.rectangleROITool = exports.boundingBox = exports.clip = exports.cine = exports.viewport = exports.jumpToSlice = exports.getAnnotationNearPointOnEnabledElement = exports.getAnnotationNearPoint = exports.pointInSurroundingSphereCallback = exports.pointInShapeCallback = exports.triggerAnnotationRender = exports.triggerAnnotationRenderForViewportIds = exports.segmentation = exports.getCalibratedScale = exports.getCalibratedLengthUnits = exports.calibrateImageSpacing = exports.triggerEvent = exports.touch = exports.isObject = exports.orientation = exports.throttle = exports.dynamicVolume = exports.debounce = exports.drawing = exports.viewportFilters = exports.planar = exports.math = void 0;
29
+ exports.annotationFrameRange = exports.voi = exports.polyDataUtils = exports.pointToString = exports.roundNumber = exports.scroll = exports.stackContextPrefetch = exports.stackPrefetch = exports.planarFreehandROITool = exports.rectangleROITool = exports.boundingBox = exports.clip = exports.cine = exports.viewport = exports.jumpToSlice = exports.getAnnotationNearPointOnEnabledElement = exports.getAnnotationNearPoint = exports.pointInSurroundingSphereCallback = exports.pointInShapeCallback = exports.triggerAnnotationRender = exports.triggerAnnotationRenderForViewportIds = exports.segmentation = exports.getCalibratedScale = exports.getCalibratedLengthUnits = exports.calibrateImageSpacing = exports.triggerEvent = exports.touch = exports.isObject = exports.orientation = exports.throttle = exports.dynamicVolume = exports.debounce = exports.drawing = exports.viewportFilters = exports.planar = exports.math = void 0;
30
30
  const getAnnotationNearPoint_1 = require("./getAnnotationNearPoint");
31
31
  Object.defineProperty(exports, "getAnnotationNearPoint", { enumerable: true, get: function () { return getAnnotationNearPoint_1.getAnnotationNearPoint; } });
32
32
  Object.defineProperty(exports, "getAnnotationNearPointOnEnabledElement", { enumerable: true, get: function () { return getAnnotationNearPoint_1.getAnnotationNearPointOnEnabledElement; } });
@@ -60,6 +60,8 @@ const roundNumber_1 = __importDefault(require("./roundNumber"));
60
60
  exports.roundNumber = roundNumber_1.default;
61
61
  const pointToString_1 = require("./pointToString");
62
62
  Object.defineProperty(exports, "pointToString", { enumerable: true, get: function () { return pointToString_1.pointToString; } });
63
+ const annotationFrameRange_1 = __importDefault(require("./annotationFrameRange"));
64
+ exports.annotationFrameRange = annotationFrameRange_1.default;
63
65
  const segmentation = __importStar(require("./segmentation"));
64
66
  exports.segmentation = segmentation;
65
67
  const drawing = __importStar(require("./drawing"));
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utilities/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAGkC;AA6DhC,uGA/DA,+CAAsB,OA+DA;AACtB,uHA/DA,+DAAsC,OA+DA;AA3DxC,0DAAkC;AA2ChC,mBA3CK,kBAAQ,CA2CL;AA1CV,0DAAkC;AA4ChC,mBA5CK,kBAAQ,CA4CL;AA3CV,0DAAkC;AA6ChC,mBA7CK,kBAAQ,CA6CL;AA5CV,kDAA0B;AA4DxB,eA5DK,cAAI,CA4DL;AA3DN,oFAA4D;AA8C1D,gCA9CK,+BAAqB,CA8CL;AA7CvB,8EAA4D;AA8C1D,mCA9CK,4BAAwB,CA8CL;AA7C1B,6DAA0D;AA8CxD,mGA9CO,uCAAkB,OA8CP;AA7CpB,oHAA4F;AA+C1F,gDA/CK,+CAAqC,CA+CL;AA9CvC,wFAAgE;AA+C9D,kCA/CK,iCAAuB,CA+CL;AA9CzB,yEAAiD;AAmD/C,sBAnDK,qBAAW,CAmDL;AAjDb,kFAA0D;AA6CxD,+BA7CK,8BAAoB,CA6CL;AA5CtB,0GAAkF;AA6ChF,2CA7CK,0CAAgC,CA6CL;AA5ClC,sDAA8B;AAwD5B,iBAxDK,gBAAM,CAwDL;AAvDR,gEAAwC;AAwDtC,sBAxDK,qBAAW,CAwDL;AAvDb,mDAAgD;AAwD9C,8FAxDO,6BAAa,OAwDP;AArDf,6DAA+C;AAmC7C,oCAAY;AAlCd,mDAAqC;AAuBnC,0BAAO;AAtBT,6CAA+B;AAmB7B,oBAAI;AAlBN,iDAAmC;AAmBjC,wBAAM;AAlBR,mEAAqD;AAmBnD,0CAAe;AAlBjB,2DAA6C;AAuB3C,kCAAW;AAtBb,6CAA+B;AAsC7B,oBAAI;AArCN,2DAA6C;AAuC3C,kCAAW;AAtCb,+EAAiE;AAwC/D,sDAAqB;AAvCvB,qEAAuD;AAsCrD,4CAAgB;AArClB,mDAAsE;AAuCpE,8FAvCO,6BAAa,OAuCP;AACb,qGAxCsB,oCAAoB,OAwCtB;AAvCtB,qDAAuC;AAgCrC,4BAAQ;AA/BV,+CAAiC;AAkB/B,sBAAK;AAjBP,+DAAiD;AAa/C,sCAAa;AAZf,gEAAkD;AAwChD,sCAAa;AAvCf,2CAA6B;AAwC3B,kBAAG;AArCL,8CAAmD;AAajD,6FAbO,mBAAY,OAaP"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utilities/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAGkC;AA8DhC,uGAhEA,+CAAsB,OAgEA;AACtB,uHAhEA,+DAAsC,OAgEA;AA5DxC,0DAAkC;AA4ChC,mBA5CK,kBAAQ,CA4CL;AA3CV,0DAAkC;AA6ChC,mBA7CK,kBAAQ,CA6CL;AA5CV,0DAAkC;AA8ChC,mBA9CK,kBAAQ,CA8CL;AA7CV,kDAA0B;AA6DxB,eA7DK,cAAI,CA6DL;AA5DN,oFAA4D;AA+C1D,gCA/CK,+BAAqB,CA+CL;AA9CvB,8EAA4D;AA+C1D,mCA/CK,4BAAwB,CA+CL;AA9C1B,6DAA0D;AA+CxD,mGA/CO,uCAAkB,OA+CP;AA9CpB,oHAA4F;AAgD1F,gDAhDK,+CAAqC,CAgDL;AA/CvC,wFAAgE;AAgD9D,kCAhDK,iCAAuB,CAgDL;AA/CzB,yEAAiD;AAoD/C,sBApDK,qBAAW,CAoDL;AAlDb,kFAA0D;AA8CxD,+BA9CK,8BAAoB,CA8CL;AA7CtB,0GAAkF;AA8ChF,2CA9CK,0CAAgC,CA8CL;AA7ClC,sDAA8B;AAyD5B,iBAzDK,gBAAM,CAyDL;AAxDR,gEAAwC;AAyDtC,sBAzDK,qBAAW,CAyDL;AAxDb,mDAAgD;AAyD9C,8FAzDO,6BAAa,OAyDP;AAxDf,kFAA0D;AA2DxD,+BA3DK,8BAAoB,CA2DL;AAxDtB,6DAA+C;AAmC7C,oCAAY;AAlCd,mDAAqC;AAuBnC,0BAAO;AAtBT,6CAA+B;AAmB7B,oBAAI;AAlBN,iDAAmC;AAmBjC,wBAAM;AAlBR,mEAAqD;AAmBnD,0CAAe;AAlBjB,2DAA6C;AAuB3C,kCAAW;AAtBb,6CAA+B;AAsC7B,oBAAI;AArCN,2DAA6C;AAuC3C,kCAAW;AAtCb,+EAAiE;AAwC/D,sDAAqB;AAvCvB,qEAAuD;AAsCrD,4CAAgB;AArClB,mDAAsE;AAuCpE,8FAvCO,6BAAa,OAuCP;AACb,qGAxCsB,oCAAoB,OAwCtB;AAvCtB,qDAAuC;AAgCrC,4BAAQ;AA/BV,+CAAiC;AAkB/B,sBAAK;AAjBP,+DAAiD;AAa/C,sCAAa;AAZf,gEAAkD;AAwChD,sCAAa;AAvCf,2CAA6B;AAwC3B,kBAAG;AArCL,8CAAmD;AAajD,6FAbO,mBAAY,OAaP"}
@@ -2,7 +2,6 @@ import { Statistics } from '../../../types';
2
2
  import Calculator from './Calculator';
3
3
  export default class BasicStatsCalculator extends Calculator {
4
4
  private static max;
5
- private static currentMax;
6
5
  private static sum;
7
6
  private static sumSquares;
8
7
  private static squaredDiffSum;
@@ -9,36 +9,49 @@ class BasicStatsCalculator extends Calculator_1.default {
9
9
  }
10
10
  exports.default = BasicStatsCalculator;
11
11
  _a = BasicStatsCalculator;
12
- BasicStatsCalculator.max = -Infinity;
13
- BasicStatsCalculator.currentMax = 0;
14
- BasicStatsCalculator.sum = 0;
15
- BasicStatsCalculator.sumSquares = 0;
16
- BasicStatsCalculator.squaredDiffSum = 0;
12
+ BasicStatsCalculator.max = [-Infinity];
13
+ BasicStatsCalculator.sum = [0];
14
+ BasicStatsCalculator.sumSquares = [0];
15
+ BasicStatsCalculator.squaredDiffSum = [0];
17
16
  BasicStatsCalculator.count = 0;
18
17
  BasicStatsCalculator.statsCallback = ({ value: newValue }) => {
19
- if (newValue > _a.max) {
20
- _a.max = newValue;
21
- _a.currentMax = newValue;
18
+ if (Array.isArray(newValue) &&
19
+ newValue.length > 1 &&
20
+ _a.max.length === 1) {
21
+ _a.max.push(_a.max[0], _a.max[0]);
22
+ _a.sum.push(_a.sum[0], _a.sum[0]);
23
+ _a.sumSquares.push(_a.sumSquares[0], _a.sumSquares[0]);
24
+ _a.squaredDiffSum.push(_a.squaredDiffSum[0], _a.squaredDiffSum[0]);
22
25
  }
26
+ const newArray = Array.isArray(newValue) ? newValue : [newValue];
23
27
  _a.count += 1;
24
- _a.sum += newValue;
25
- _a.sumSquares += Math.pow(newValue, 2);
26
- _a.squaredDiffSum += Math.pow(newValue - _a.sum / _a.count, 2);
28
+ _a.max.forEach((it, idx) => (_a.max[idx] = Math.max(it, newArray[idx])));
29
+ _a.sum.map((it, idx) => (_a.sum[idx] += newArray[idx]));
30
+ _a.sumSquares.map((it, idx) => (_a.sumSquares[idx] += Math.pow(newArray[idx], 2)));
31
+ _a.squaredDiffSum.map((it, idx) => (_a.squaredDiffSum[idx] += Math.pow(newArray[idx] - _a.sum[idx] / _a.count, 2)));
27
32
  };
28
33
  BasicStatsCalculator.getStatistics = () => {
29
- const mean = _a.sum / _a.count;
30
- const stdDev = Math.sqrt(_a.squaredDiffSum / _a.count);
31
- const stdDevWithSumSquare = Math.sqrt(_a.sumSquares / _a.count - Math.pow(mean, 2));
32
- _a.max = -Infinity;
33
- _a.sum = 0;
34
- _a.sumSquares = 0;
35
- _a.squaredDiffSum = 0;
34
+ const mean = _a.sum.map((sum) => sum / _a.count);
35
+ const stdDev = _a.squaredDiffSum.map((squaredDiffSum) => Math.sqrt(squaredDiffSum / _a.count));
36
+ const stdDevWithSumSquare = _a.sumSquares.map((it, idx) => Math.sqrt(_a.sumSquares[idx] / _a.count - Math.pow(mean[idx], 2)));
37
+ const currentMax = _a.max;
38
+ _a.max = [-Infinity];
39
+ _a.sum = [0];
40
+ _a.sumSquares = [0];
41
+ _a.squaredDiffSum = [0];
36
42
  _a.count = 0;
37
43
  return [
38
- { name: 'max', value: _a.currentMax, unit: null },
39
- { name: 'mean', value: mean, unit: null },
40
- { name: 'stdDev', value: stdDev, unit: null },
41
- { name: 'stdDevWithSumSquare', value: stdDevWithSumSquare, unit: null },
44
+ { name: 'max', value: singleArrayAsNumber(currentMax), unit: null },
45
+ { name: 'mean', value: singleArrayAsNumber(mean), unit: null },
46
+ { name: 'stdDev', value: singleArrayAsNumber(stdDev), unit: null },
47
+ {
48
+ name: 'stdDevWithSumSquare',
49
+ value: singleArrayAsNumber(stdDevWithSumSquare),
50
+ unit: null,
51
+ },
42
52
  ];
43
53
  };
54
+ function singleArrayAsNumber(val) {
55
+ return val.length === 1 ? val[0] : val;
56
+ }
44
57
  //# sourceMappingURL=BasicStatsCalculator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"BasicStatsCalculator.js","sourceRoot":"","sources":["../../../../../src/utilities/math/basic/BasicStatsCalculator.ts"],"names":[],"mappings":";;;;;;AACA,8DAAsC;AAEtC,MAAqB,oBAAqB,SAAQ,oBAAU;;AAA5D,uCAwDC;;AAvDgB,wBAAG,GAAG,CAAC,QAAS,CAAA;AAChB,+BAAU,GAAG,CAAE,CAAA;AACf,wBAAG,GAAG,CAAE,CAAA;AACR,+BAAU,GAAG,CAAE,CAAA;AACf,mCAAc,GAAG,CAAE,CAAA;AACnB,0BAAK,GAAG,CAAE,CAAA;AAOlB,kCAAa,GAAG,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAQ,EAAE;IACnD,IAAI,QAAQ,GAAG,EAAI,CAAC,GAAG,EAAE;QACvB,EAAI,CAAC,GAAG,GAAG,QAAQ,CAAC;QACpB,EAAI,CAAC,UAAU,GAAG,QAAQ,CAAC;KAC5B;IAED,EAAI,CAAC,KAAK,IAAI,CAAC,CAAC;IAEhB,EAAI,CAAC,GAAG,IAAI,QAAQ,CAAC;IACrB,EAAI,CAAC,UAAU,IAAI,SAAA,QAAQ,EAAI,CAAC,CAAA,CAAC;IACjC,EAAI,CAAC,cAAc,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,EAAI,CAAC,GAAG,GAAG,EAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;AACvE,CAAE,CAAA;AAYK,kCAAa,GAAG,GAAiB,EAAE;IACxC,MAAM,IAAI,GAAG,EAAI,CAAC,GAAG,GAAG,EAAI,CAAC,KAAK,CAAC;IACnC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,EAAI,CAAC,cAAc,GAAG,EAAI,CAAC,KAAK,CAAC,CAAC;IAC3D,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CACnC,EAAI,CAAC,UAAU,GAAG,EAAI,CAAC,KAAK,GAAG,SAAA,IAAI,EAAI,CAAC,CAAA,CACzC,CAAC;IAEF,EAAI,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;IACrB,EAAI,CAAC,GAAG,GAAG,CAAC,CAAC;IACb,EAAI,CAAC,UAAU,GAAG,CAAC,CAAC;IACpB,EAAI,CAAC,cAAc,GAAG,CAAC,CAAC;IACxB,EAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IAEf,OAAO;QACL,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAI,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE;QACnD,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;QACzC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE;QAC7C,EAAE,IAAI,EAAE,qBAAqB,EAAE,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,EAAE;KACxE,CAAC;AACJ,CAAE,CAAA"}
1
+ {"version":3,"file":"BasicStatsCalculator.js","sourceRoot":"","sources":["../../../../../src/utilities/math/basic/BasicStatsCalculator.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,10 @@
1
1
  import type { Types } from '@cornerstonejs/core';
2
+ import { vec3 } from 'gl-matrix';
2
3
  declare type Ellipse = {
3
4
  center: Types.Point3;
4
5
  xRadius: number;
5
6
  yRadius: number;
6
7
  zRadius: number;
7
8
  };
8
- export default function pointInEllipse(ellipse: Ellipse, pointLPS: Types.Point3): boolean;
9
+ export default function pointInEllipse(ellipse: Ellipse, pointLPS: vec3): boolean;
9
10
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"pointInEllipse.js","sourceRoot":"","sources":["../../../../../src/utilities/math/ellipse/pointInEllipse.ts"],"names":[],"mappings":";;AAeA,SAAwB,cAAc,CACpC,OAAgB,EAChB,QAAsB;IAEtB,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACzE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC;IAC3B,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,iBAAiB,CAAC;IAEvC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,OAAO,KAAK,CAAC,EAAE;QACjB,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;KACvD;IAED,IAAI,OAAO,KAAK,CAAC,EAAE;QACjB,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;KACvD;IAED,IAAI,OAAO,KAAK,CAAC,EAAE;QACjB,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;KACvD;IAED,OAAO,MAAM,IAAI,CAAC,CAAC;AACrB,CAAC;AAtBD,iCAsBC"}
1
+ {"version":3,"file":"pointInEllipse.js","sourceRoot":"","sources":["../../../../../src/utilities/math/ellipse/pointInEllipse.ts"],"names":[],"mappings":";;AAgBA,SAAwB,cAAc,CACpC,OAAgB,EAChB,QAAc;IAEd,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACzE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC;IAC3B,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,iBAAiB,CAAC;IAEvC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,OAAO,KAAK,CAAC,EAAE;QACjB,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;KACvD;IAED,IAAI,OAAO,KAAK,CAAC,EAAE;QACjB,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;KACvD;IAED,IAAI,OAAO,KAAK,CAAC,EAAE;QACjB,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;KACvD;IAED,OAAO,MAAM,IAAI,CAAC,CAAC;AACrB,CAAC;AAtBD,iCAsBC"}
@@ -4,5 +4,5 @@ declare type Sphere = {
4
4
  center: Types.Point3 | vec3;
5
5
  radius: number;
6
6
  };
7
- export default function pointInSphere(sphere: Sphere, pointLPS: Types.Point3): boolean;
7
+ export default function pointInSphere(sphere: Sphere, pointLPS: vec3): boolean;
8
8
  export {};
@@ -2,9 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  function pointInSphere(sphere, pointLPS) {
4
4
  const { center, radius } = sphere;
5
- return (Math.pow((pointLPS[0] - center[0]), 2) +
6
- Math.pow((pointLPS[1] - center[1]), 2) +
7
- Math.pow((pointLPS[2] - center[2]), 2) <=
5
+ return ((pointLPS[0] - center[0]) * (pointLPS[0] - center[0]) +
6
+ (pointLPS[1] - center[1]) * (pointLPS[1] - center[1]) +
7
+ (pointLPS[2] - center[2]) * (pointLPS[2] - center[2]) <=
8
8
  Math.pow(radius, 2));
9
9
  }
10
10
  exports.default = pointInSphere;
@@ -1 +1 @@
1
- {"version":3,"file":"pointInSphere.js","sourceRoot":"","sources":["../../../../../src/utilities/math/sphere/pointInSphere.ts"],"names":[],"mappings":";;AAkBA,SAAwB,aAAa,CACnC,MAAc,EACd,QAAsB;IAEtB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAElC,OAAO,CACL,SAAA,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,EAAI,CAAC,CAAA;QAC5B,SAAA,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,EAAI,CAAC,CAAA;QAC9B,SAAA,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,EAAI,CAAC,CAAA;QAChC,SAAA,MAAM,EAAI,CAAC,CAAA,CACZ,CAAC;AACJ,CAAC;AAZD,gCAYC"}
1
+ {"version":3,"file":"pointInSphere.js","sourceRoot":"","sources":["../../../../../src/utilities/math/sphere/pointInSphere.ts"],"names":[],"mappings":";;AAkBA,SAAwB,aAAa,CAAC,MAAc,EAAE,QAAc;IAClE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAElC,OAAO,CACL,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACnD,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACrD,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACvD,SAAA,MAAM,EAAI,CAAC,CAAA,CACZ,CAAC;AACJ,CAAC;AATD,gCASC"}
@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const core_1 = require("@cornerstonejs/core");
7
7
  const filterAnnotationsWithinSlice_1 = __importDefault(require("./filterAnnotationsWithinSlice"));
8
+ const __1 = require("..");
9
+ const baseUrlExtractor = /(videoId:|imageId:|volumeId:)([a-zA-Z]*:)/;
8
10
  function filterAnnotationsForDisplay(viewport, annotations) {
9
11
  if (viewport instanceof core_1.StackViewport) {
10
12
  const imageId = viewport.getCurrentImageId();
@@ -25,8 +27,23 @@ function filterAnnotationsForDisplay(viewport, annotations) {
25
27
  }
26
28
  else if (viewport instanceof core_1.VideoViewport) {
27
29
  const frameOfReferenceUID = viewport.getFrameOfReferenceUID();
28
- return annotations.filter((toolData) => {
29
- return toolData.metadata.FrameOfReferenceUID === frameOfReferenceUID;
30
+ return annotations.filter((annotation) => {
31
+ if (!annotation.isVisible) {
32
+ return false;
33
+ }
34
+ if (annotation.metadata.FrameOfReferenceUID !== frameOfReferenceUID) {
35
+ return false;
36
+ }
37
+ const testURI = annotation.metadata.referencedImageId.replace(baseUrlExtractor, '');
38
+ if (!viewport.hasImageURI(testURI)) {
39
+ return false;
40
+ }
41
+ const range = __1.annotationFrameRange.getFrameRange(annotation);
42
+ const frameNumber = viewport.getFrameNumber();
43
+ if (Array.isArray(range)) {
44
+ return frameNumber >= range[0] && frameNumber <= range[1];
45
+ }
46
+ return Math.abs(frameNumber - range) <= 5;
30
47
  });
31
48
  }
32
49
  else if (viewport instanceof core_1.VolumeViewport) {
@@ -1 +1 @@
1
- {"version":3,"file":"filterAnnotationsForDisplay.js","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":";;;;;AAAA,8CAM6B;AAE7B,kGAA0E;AAS1E,SAAwB,2BAA2B,CACjD,QAAyB,EACzB,WAAwB;IAExB,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAErC,MAAM,OAAO,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAK7C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;QAOnD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACvC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;gBACzB,OAAO,KAAK,CAAC;aACd;YAED,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC;YAEtD,IAAI,OAAO,KAAK,SAAS,EAAE;gBAGzB,OAAO,KAAK,CAAC;aACd;YAED,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;YAC5D,OAAO,iBAAiB,KAAK,QAAQ,CAAC;QACxC,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAC5C,MAAM,mBAAmB,GAAW,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QAEtE,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;YACrC,OAAO,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,KAAK,mBAAmB,CAAC;QACvE,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,QAAQ,YAAY,qBAAc,EAAE;QAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAEpC,MAAM,EAAE,wBAAwB,EAAE,GAChC,gBAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAGjE,OAAO,IAAA,sCAA4B,EACjC,WAAW,EACX,MAAM,EACN,wBAAwB,CACzB,CAAC;KACH;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,iBAAiB,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC;KACjE;AACH,CAAC;AAzDD,8CAyDC"}
1
+ {"version":3,"file":"filterAnnotationsForDisplay.js","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":";;;;;AAAA,8CAM6B;AAE7B,kGAA0E;AAE1E,0BAA0C;AAE1C,MAAM,gBAAgB,GAAG,2CAA2C,CAAC;AAQrE,SAAwB,2BAA2B,CACjD,QAAyB,EACzB,WAAwB;IAExB,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAErC,MAAM,OAAO,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAK7C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;QAOnD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACvC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;gBACzB,OAAO,KAAK,CAAC;aACd;YAED,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC;YAEtD,IAAI,OAAO,KAAK,SAAS,EAAE;gBAGzB,OAAO,KAAK,CAAC;aACd;YAED,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;YAC5D,OAAO,iBAAiB,KAAK,QAAQ,CAAC;QACxC,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAC5C,MAAM,mBAAmB,GAAW,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QAEtE,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACvC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;gBACzB,OAAO,KAAK,CAAC;aACd;YACD,IAAI,UAAU,CAAC,QAAQ,CAAC,mBAAmB,KAAK,mBAAmB,EAAE;gBACnE,OAAO,KAAK,CAAC;aACd;YACD,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAC3D,gBAAgB,EAChB,EAAE,CACH,CAAC;YAEF,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;gBAClC,OAAO,KAAK,CAAC;aACd;YACD,MAAM,KAAK,GAAG,wBAAoB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAC7D,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC9C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACxB,OAAO,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;aAC3D;YAKD,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,QAAQ,YAAY,qBAAc,EAAE;QAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAEpC,MAAM,EAAE,wBAAwB,EAAE,GAChC,gBAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAGjE,OAAO,IAAA,sCAA4B,EACjC,WAAW,EACX,MAAM,EACN,wBAAwB,CACzB,CAAC;KACH;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,iBAAiB,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC;KACjE;AACH,CAAC;AAhFD,8CAgFC"}
@@ -1,17 +1,18 @@
1
+ import { vec3 } from 'gl-matrix';
1
2
  import type { Types } from '@cornerstonejs/core';
2
3
  import type { vtkImageData } from '@kitware/vtk.js/Common/DataModel/ImageData';
3
4
  import BoundsIJK from '../types/BoundsIJK';
4
5
  export declare type PointInShape = {
5
6
  value: number;
6
7
  index: number;
7
- pointIJK: Types.Point3;
8
- pointLPS: Types.Point3;
8
+ pointIJK: vec3;
9
+ pointLPS: vec3;
9
10
  };
10
11
  export declare type PointInShapeCallback = ({ value, index, pointIJK, pointLPS, }: {
11
12
  value: number;
12
13
  index: number;
13
- pointIJK: Types.Point3;
14
- pointLPS: Types.Point3;
14
+ pointIJK: vec3;
15
+ pointLPS: vec3;
15
16
  }) => void;
16
- export declare type ShapeFnCriteria = (pointIJK: Types.Point3, pointLPS: Types.Point3) => boolean;
17
+ export declare type ShapeFnCriteria = (pointIJK: vec3, pointLPS: vec3) => boolean;
17
18
  export default function pointInShapeCallback(imageData: vtkImageData | Types.CPUImageData, pointInShapeFn: ShapeFnCriteria, callback?: PointInShapeCallback, boundsIJK?: BoundsIJK): Array<PointInShape>;
@@ -36,41 +36,42 @@ function pointInShapeCallback(imageData, pointInShapeFn, callback, boundsIJK) {
36
36
  const rowStep = gl_matrix_1.vec3.fromValues(rowCosines[0] * rowSpacing, rowCosines[1] * rowSpacing, rowCosines[2] * rowSpacing);
37
37
  const columnStep = gl_matrix_1.vec3.fromValues(columnCosines[0] * columnSpacing, columnCosines[1] * columnSpacing, columnCosines[2] * columnSpacing);
38
38
  const scanAxisStep = gl_matrix_1.vec3.fromValues(scanAxisNormal[0] * scanAxisSpacing, scanAxisNormal[1] * scanAxisSpacing, scanAxisNormal[2] * scanAxisSpacing);
39
- const yMultiple = dimensions[0];
40
- const zMultiple = dimensions[0] * dimensions[1];
39
+ const xMultiple = scalarData.length / dimensions[2] / dimensions[1] / dimensions[0];
40
+ const yMultiple = dimensions[0] * xMultiple;
41
+ const zMultiple = dimensions[1] * yMultiple;
41
42
  const pointsInShape = [];
43
+ const currentPos = gl_matrix_1.vec3.clone(worldPosStart);
42
44
  for (let k = kMin; k <= kMax; k++) {
45
+ const startPosJ = gl_matrix_1.vec3.clone(currentPos);
43
46
  for (let j = jMin; j <= jMax; j++) {
47
+ const startPosI = gl_matrix_1.vec3.clone(currentPos);
44
48
  for (let i = iMin; i <= iMax; i++) {
45
49
  const pointIJK = [i, j, k];
46
- const dI = i - iMin;
47
- const dJ = j - jMin;
48
- const dK = k - kMin;
49
- const startWorld = worldPosStart;
50
- const pointLPS = [
51
- startWorld[0] +
52
- dI * rowStep[0] +
53
- dJ * columnStep[0] +
54
- dK * scanAxisStep[0],
55
- startWorld[1] +
56
- dI * rowStep[1] +
57
- dJ * columnStep[1] +
58
- dK * scanAxisStep[1],
59
- startWorld[2] +
60
- dI * rowStep[2] +
61
- dJ * columnStep[2] +
62
- dK * scanAxisStep[2],
63
- ];
64
- if (pointInShapeFn(pointLPS, pointIJK)) {
65
- const index = k * zMultiple + j * yMultiple + i;
66
- const value = scalarData[index];
67
- pointsInShape.push({ value, index, pointIJK, pointLPS });
68
- if (callback !== null) {
69
- callback({ value, index, pointIJK, pointLPS });
50
+ if (pointInShapeFn(currentPos, currentPos)) {
51
+ const index = k * zMultiple + j * yMultiple + i * xMultiple;
52
+ let value;
53
+ if (xMultiple > 2) {
54
+ value = [
55
+ scalarData[index],
56
+ scalarData[index + 1],
57
+ scalarData[index + 2],
58
+ ];
59
+ }
60
+ else {
61
+ value = scalarData[index];
62
+ }
63
+ pointsInShape.push({ value, index, pointIJK, pointLPS: currentPos });
64
+ if (callback) {
65
+ callback({ value, index, pointIJK, pointLPS: currentPos });
70
66
  }
71
67
  }
68
+ gl_matrix_1.vec3.add(currentPos, currentPos, rowStep);
72
69
  }
70
+ gl_matrix_1.vec3.copy(currentPos, startPosI);
71
+ gl_matrix_1.vec3.add(currentPos, currentPos, columnStep);
73
72
  }
73
+ gl_matrix_1.vec3.copy(currentPos, startPosJ);
74
+ gl_matrix_1.vec3.add(currentPos, currentPos, scanAxisStep);
74
75
  }
75
76
  return pointsInShape;
76
77
  }
@@ -1 +1 @@
1
- {"version":3,"file":"pointInShapeCallback.js","sourceRoot":"","sources":["../../../src/utilities/pointInShapeCallback.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pointInShapeCallback.js","sourceRoot":"","sources":["../../../src/utilities/pointInShapeCallback.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,2 @@
1
- declare function roundNumber(value: string | number, precision?: number): string;
1
+ declare function roundNumber(value: string | number | (string | number)[], precision?: number): string;
2
2
  export default roundNumber;
@@ -1,6 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  function roundNumber(value, precision = 2) {
4
+ if (Array.isArray(value)) {
5
+ return value.map((v) => roundNumber(v, precision)).join(', ');
6
+ }
4
7
  if (value === undefined || value === null || value === '') {
5
8
  return 'NaN';
6
9
  }
@@ -1 +1 @@
1
- {"version":3,"file":"roundNumber.js","sourceRoot":"","sources":["../../../src/utilities/roundNumber.ts"],"names":[],"mappings":";;AAYA,SAAS,WAAW,CAAC,KAAsB,EAAE,SAAS,GAAG,CAAC;IACxD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAAE;QACzD,OAAO,KAAK,CAAC;KACd;IACD,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACtB,IAAI,KAAK,GAAG,MAAM,EAAE;QAClB,OAAO,GAAG,KAAK,EAAE,CAAC;KACnB;IACD,MAAM,cAAc,GAClB,KAAK,IAAI,GAAG;QACV,CAAC,CAAC,SAAS,GAAG,CAAC;QACf,CAAC,CAAC,KAAK,IAAI,EAAE;YACb,CAAC,CAAC,SAAS,GAAG,CAAC;YACf,CAAC,CAAC,KAAK,IAAI,CAAC;gBACZ,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,KAAK,IAAI,GAAG;oBACd,CAAC,CAAC,SAAS,GAAG,CAAC;oBACf,CAAC,CAAC,KAAK,IAAI,IAAI;wBACf,CAAC,CAAC,SAAS,GAAG,CAAC;wBACf,CAAC,CAAC,KAAK,IAAI,KAAK;4BAChB,CAAC,CAAC,SAAS,GAAG,CAAC;4BACf,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;IACpB,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AACvC,CAAC;AAED,kBAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"roundNumber.js","sourceRoot":"","sources":["../../../src/utilities/roundNumber.ts"],"names":[],"mappings":";;AAYA,SAAS,WAAW,CAClB,KAA4C,EAC5C,SAAS,GAAG,CAAC;IAEb,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAC/D;IACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAAE;QACzD,OAAO,KAAK,CAAC;KACd;IACD,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACtB,IAAI,KAAK,GAAG,MAAM,EAAE;QAClB,OAAO,GAAG,KAAK,EAAE,CAAC;KACnB;IACD,MAAM,cAAc,GAClB,KAAK,IAAI,GAAG;QACV,CAAC,CAAC,SAAS,GAAG,CAAC;QACf,CAAC,CAAC,KAAK,IAAI,EAAE;YACb,CAAC,CAAC,SAAS,GAAG,CAAC;YACf,CAAC,CAAC,KAAK,IAAI,CAAC;gBACZ,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,KAAK,IAAI,GAAG;oBACd,CAAC,CAAC,SAAS,GAAG,CAAC;oBACf,CAAC,CAAC,KAAK,IAAI,IAAI;wBACf,CAAC,CAAC,SAAS,GAAG,CAAC;wBACf,CAAC,CAAC,KAAK,IAAI,KAAK;4BAChB,CAAC,CAAC,SAAS,GAAG,CAAC;4BACf,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;IACpB,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AACvC,CAAC;AAED,kBAAe,WAAW,CAAC"}
@@ -14,7 +14,7 @@ function isViewportPreScaled(viewport, targetId) {
14
14
  return !!(preScale === null || preScale === void 0 ? void 0 : preScale.scaled);
15
15
  }
16
16
  else {
17
- throw new Error('Viewport is not a valid type');
17
+ return false;
18
18
  }
19
19
  }
20
20
  exports.isViewportPreScaled = isViewportPreScaled;
@@ -1 +1 @@
1
- {"version":3,"file":"isViewportPreScaled.js","sourceRoot":"","sources":["../../../../src/utilities/viewport/isViewportPreScaled.ts"],"names":[],"mappings":";;;AAAA,8CAK6B;AAE7B,SAAS,mBAAmB,CAC1B,QAAsD,EACtD,QAAgB;IAEhB,IAAI,QAAQ,YAAY,yBAAkB,EAAE;QAC1C,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACnD,MAAM,QAAQ,GACZ,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACzC,OAAO,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAA,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;KACpE;SAAM,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAC5C,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC;QACnD,OAAO,CAAC,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAA,CAAC;KAC3B;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;AACH,CAAC;AAEQ,kDAAmB"}
1
+ {"version":3,"file":"isViewportPreScaled.js","sourceRoot":"","sources":["../../../../src/utilities/viewport/isViewportPreScaled.ts"],"names":[],"mappings":";;;AAAA,8CAK6B;AAE7B,SAAS,mBAAmB,CAC1B,QAAsD,EACtD,QAAgB;IAEhB,IAAI,QAAQ,YAAY,yBAAkB,EAAE;QAC1C,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACnD,MAAM,QAAQ,GACZ,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACzC,OAAO,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAA,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;KACpE;SAAM,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAC5C,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC;QACnD,OAAO,CAAC,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAA,CAAC;KAC3B;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAEQ,kDAAmB"}
package/dist/esm/index.js CHANGED
@@ -8,8 +8,8 @@ import * as cursors from './cursors';
8
8
  import * as Types from './types';
9
9
  import * as annotation from './stateManagement/annotation';
10
10
  import * as segmentation from './stateManagement/segmentation';
11
- import { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, PlanarRotateTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, CrosshairsTool, ReferenceLinesTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, SegmentationDisplayTool, BrushTool, AngleTool, CobbAngleTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, ReferenceLines, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, OverlayGridTool, SegmentationIntersectionTool, } from './tools';
11
+ import { BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, PlanarRotateTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, KeyImageTool, CrosshairsTool, ReferenceLinesTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, SegmentationDisplayTool, BrushTool, AngleTool, CobbAngleTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, ReferenceLines, PaintFillTool, ScaleOverlayTool, OrientationMarkerTool, OverlayGridTool, SegmentationIntersectionTool, } from './tools';
12
12
  import VideoRedactionTool from './tools/annotation/VideoRedactionTool';
13
13
  import * as Enums from './enums';
14
- export { VideoRedactionTool, init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, PlanarRotateTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, AngleTool, CobbAngleTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, ReferenceLines, ScaleOverlayTool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, BrushTool, OrientationMarkerTool, synchronizers, Synchronizer, SynchronizerManager, PaintFillTool, Types, state, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, };
14
+ export { VideoRedactionTool, init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, AnnotationDisplayTool, PanTool, TrackballRotateTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, PlanarRotateTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, CrosshairsTool, ReferenceLinesTool, OverlayGridTool, SegmentationIntersectionTool, ProbeTool, RectangleROITool, EllipticalROITool, CircleROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, AngleTool, CobbAngleTool, KeyImageTool, MagnifyTool, AdvancedMagnifyTool, ReferenceCursors, ReferenceLines, ScaleOverlayTool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, BrushTool, OrientationMarkerTool, synchronizers, Synchronizer, SynchronizerManager, PaintFillTool, Types, state, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, };
15
15
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EACL,OAAO,EACP,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,yBAAyB,GAC1B,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AAGzC,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EACL,QAAQ,EACR,cAAc,EACd,qBAAqB,EACrB,OAAO,EACP,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,iCAAiC,EACjC,uBAAuB,EACvB,SAAS,EACT,SAAS,EACT,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,qBAAqB,EACrB,eAAe,EACf,4BAA4B,GAC7B,MAAM,SAAS,CAAC;AAEjB,OAAO,kBAAkB,MAAM,uCAAuC,CAAC;AAEvE,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,OAAO,EACL,kBAAkB,EAElB,IAAI,EACJ,OAAO,EACP,OAAO,EACP,UAAU,EACV,yBAAyB,EAEzB,QAAQ,EACR,cAAc,EACd,qBAAqB,EAErB,OAAO,EACP,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAElB,UAAU,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,4BAA4B,EAC5B,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EACjB,SAAS,EACT,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAEhB,uBAAuB,EAEvB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,iCAAiC,EACjC,SAAS,EACT,qBAAqB,EAErB,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,aAAa,EACb,KAAK,EACL,KAAK,EAEL,gBAAgB,EAEhB,KAAK,EAEL,SAAS,EAET,OAAO,EAEP,UAAU,EAEV,YAAY,EAEZ,SAAS,EACT,OAAO,GACR,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EACL,OAAO,EACP,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,yBAAyB,GAC1B,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AAGzC,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EACL,QAAQ,EACR,cAAc,EACd,qBAAqB,EACrB,OAAO,EACP,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,iCAAiC,EACjC,uBAAuB,EACvB,SAAS,EACT,SAAS,EACT,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,qBAAqB,EACrB,eAAe,EACf,4BAA4B,GAC7B,MAAM,SAAS,CAAC;AAEjB,OAAO,kBAAkB,MAAM,uCAAuC,CAAC;AAEvE,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,OAAO,EACL,kBAAkB,EAElB,IAAI,EACJ,OAAO,EACP,OAAO,EACP,UAAU,EACV,yBAAyB,EAEzB,QAAQ,EACR,cAAc,EACd,qBAAqB,EAErB,OAAO,EACP,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAElB,UAAU,EACV,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,4BAA4B,EAC5B,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EACjB,SAAS,EACT,aAAa,EACb,YAAY,EACZ,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAEhB,uBAAuB,EAEvB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,iCAAiC,EACjC,SAAS,EACT,qBAAqB,EAErB,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,aAAa,EACb,KAAK,EACL,KAAK,EAEL,gBAAgB,EAEhB,KAAK,EAEL,SAAS,EAET,OAAO,EAEP,UAAU,EAEV,YAAY,EAEZ,SAAS,EACT,OAAO,GACR,CAAC"}
@@ -0,0 +1,70 @@
1
+ import { eventTarget, triggerEvent } from '@cornerstonejs/core';
2
+ import Events from '../../enums/Events';
3
+ import { getAnnotation } from './annotationState';
4
+ export default class AnnotationGroup {
5
+ constructor() {
6
+ this.annotationUIDs = new Set();
7
+ this._isVisible = true;
8
+ this.visibleFilter = this.unboundVisibleFilter.bind(this);
9
+ }
10
+ unboundVisibleFilter(uid) {
11
+ return !this._isVisible || !this.annotationUIDs.has(uid);
12
+ }
13
+ has(uid) {
14
+ return this.annotationUIDs.has(uid);
15
+ }
16
+ setVisible(isVisible = true, baseEvent, filter) {
17
+ if (this._isVisible === isVisible) {
18
+ return;
19
+ }
20
+ this._isVisible = isVisible;
21
+ this.annotationUIDs.forEach((uid) => {
22
+ const annotation = getAnnotation(uid);
23
+ if (!annotation) {
24
+ this.annotationUIDs.delete(uid);
25
+ return;
26
+ }
27
+ if (annotation.isVisible === isVisible) {
28
+ return;
29
+ }
30
+ if (!isVisible && filter?.(uid) === false) {
31
+ return;
32
+ }
33
+ annotation.isVisible = isVisible;
34
+ const eventDetail = {
35
+ ...baseEvent,
36
+ annotation,
37
+ };
38
+ triggerEvent(eventTarget, Events.ANNOTATION_MODIFIED, eventDetail);
39
+ });
40
+ }
41
+ get isVisible() {
42
+ return this._isVisible;
43
+ }
44
+ findNearby(uid, direction) {
45
+ const uids = [...this.annotationUIDs];
46
+ if (uids.length === 0) {
47
+ return null;
48
+ }
49
+ if (!uid) {
50
+ return uids[direction === 1 ? 0 : uids.length - 1];
51
+ }
52
+ const index = uids.indexOf(uid);
53
+ if (index === -1 ||
54
+ index + direction < 0 ||
55
+ index + direction >= uids.length) {
56
+ return null;
57
+ }
58
+ return uids[index + direction];
59
+ }
60
+ add(...annotationUIDs) {
61
+ annotationUIDs.forEach((annotationUID) => this.annotationUIDs.add(annotationUID));
62
+ }
63
+ remove(...annotationUIDs) {
64
+ annotationUIDs.forEach((annotationUID) => this.annotationUIDs.delete(annotationUID));
65
+ }
66
+ clear() {
67
+ this.annotationUIDs.clear();
68
+ }
69
+ }
70
+ //# sourceMappingURL=AnnotationGroup.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"AnnotationGroup.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/AnnotationGroup.ts"],"names":[],"mappings":"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"}
@@ -18,7 +18,7 @@ function getAnnotations(toolName, annotationGroupSelector) {
18
18
  return manager.getAnnotations(groupKey, toolName);
19
19
  }
20
20
  function addAnnotation(annotation, annotationGroupSelector) {
21
- if (annotation.annotationUID === undefined) {
21
+ if (!annotation.annotationUID) {
22
22
  annotation.annotationUID = csUtils.uuidv4();
23
23
  }
24
24
  const manager = getAnnotationManager();
@@ -1 +1 @@
1
- {"version":3,"file":"annotationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationState.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,WAAW,EACX,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,gDAAgD,EAAE,MAAM,6CAA6C,CAAC;AAI/G,OAAO,EACL,gCAAgC,EAChC,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAGzB,IAAI,cAAc,GAAG,gDAAgD,CAAC;AAMtE,SAAS,oBAAoB;IAC3B,OAAO,cAAc,CAAC;AACxB,CAAC;AAMD,SAAS,oBAAoB,CAAC,iBAAiB;IAC7C,cAAc,GAAG,iBAAiB,CAAC;AACrC,CAAC;AAGD,SAAS,sBAAsB;IAC7B,cAAc,GAAG,gDAAgD,CAAC;AACpE,CAAC;AAeD,SAAS,cAAc,CACrB,QAAgB,EAChB,uBAAgD;IAEhD,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAC9D,OAAO,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAgB,CAAC;AACnE,CAAC;AAcD,SAAS,aAAa,CACpB,UAAsB,EACtB,uBAAgD;IAEhD,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS,EAAE;QAC1C,UAAU,CAAC,aAAa,GAAG,OAAO,CAAC,MAAM,EAAY,CAAC;KACvD;IAED,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAE9D,OAAO,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAI5C,IAAI,uBAAuB,YAAY,cAAc,EAAE;QACrD,gCAAgC,CAAC,UAAU,EAAE,uBAAuB,CAAC,CAAC;KACvE;SAAM;QAIL,4BAA4B,CAAC,UAAU,CAAC,CAAC;KAC1C;IAED,OAAO,UAAU,CAAC,aAAa,CAAC;AAClC,CAAC;AAeD,SAAS,sBAAsB,CAC7B,QAAgB,EAChB,uBAAgD;IAEhD,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAE9D,OAAO,OAAO,CAAC,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC5D,CAAC;AAMD,SAAS,gBAAgB,CAAC,aAAqB;IAC7C,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAGxD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;KACR;IAED,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAGxC,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,CAAC;IAE5C,MAAM,WAAW,GAAiC;QAChD,UAAU;QACV,oBAAoB,EAAE,OAAO,CAAC,GAAG;KAClC,CAAC;IAEF,YAAY,CAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;AAMD,SAAS,aAAa,CAAC,aAAqB;IAC1C,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAExD,OAAO,UAAU,CAAC;AACpB,CAAC;AAKD,SAAS,oBAAoB;IAC3B,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,OAAO,CAAC,oBAAoB,EAAE,CAAC;AACjC,CAAC;AAED,OAAO,EACL,cAAc,EACd,sBAAsB,EACtB,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,oBAAoB,EAEpB,oBAAoB,EACpB,oBAAoB,EACpB,sBAAsB,GACvB,CAAC"}
1
+ {"version":3,"file":"annotationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationState.ts"],"names":[],"mappings":"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"}
@@ -4,5 +4,6 @@ import * as selection from './annotationSelection';
4
4
  import * as state from './annotationState';
5
5
  import * as visibility from './annotationVisibility';
6
6
  import FrameOfReferenceSpecificAnnotationManager from './FrameOfReferenceSpecificAnnotationManager';
7
- export { config, locking, selection, state, visibility, FrameOfReferenceSpecificAnnotationManager, };
7
+ import AnnotationGroup from './AnnotationGroup';
8
+ export { config, locking, selection, state, visibility, FrameOfReferenceSpecificAnnotationManager, AnnotationGroup, };
8
9
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAC/C,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAC;AAC3C,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,yCAAyC,MAAM,6CAA6C,CAAC;AAEpG,OAAO,EACL,MAAM,EACN,OAAO,EACP,SAAS,EACT,KAAK,EACL,UAAU,EACV,yCAAyC,GAC1C,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAC/C,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAC;AAC3C,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,yCAAyC,MAAM,6CAA6C,CAAC;AACpG,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,MAAM,EACN,OAAO,EACP,SAAS,EACT,KAAK,EACL,UAAU,EACV,yCAAyC,EACzC,eAAe,GAChB,CAAC"}
@@ -11,6 +11,7 @@ export default class ToolGroup {
11
11
  constructor(id) {
12
12
  this.viewportsInfo = [];
13
13
  this.toolOptions = {};
14
+ this.restoreToolOptions = {};
14
15
  this._toolInstances = {};
15
16
  this.id = id;
16
17
  }
@@ -121,7 +122,7 @@ export default class ToolGroup {
121
122
  return;
122
123
  }
123
124
  if (mode === ToolModes.Active) {
124
- this.setToolActive(toolName, options);
125
+ this.setToolActive(toolName, options || this.restoreToolOptions[toolName]);
125
126
  return;
126
127
  }
127
128
  if (mode === ToolModes.Passive) {
@@ -248,6 +249,7 @@ export default class ToolGroup {
248
249
  bindings: [],
249
250
  mode: Disabled,
250
251
  };
252
+ this.restoreToolOptions[toolName] = this.toolOptions[toolName];
251
253
  this.toolOptions[toolName] = toolOptions;
252
254
  toolInstance.mode = Disabled;
253
255
  if (typeof toolInstance.onSetToolDisabled === 'function') {