@cornerstonejs/tools 0.46.3 → 0.48.0

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 (175) hide show
  1. package/dist/cjs/init.js +1 -1
  2. package/dist/cjs/init.js.map +1 -1
  3. package/dist/cjs/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.d.ts +14 -16
  4. package/dist/cjs/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.js +98 -90
  5. package/dist/cjs/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.js.map +1 -1
  6. package/dist/cjs/stateManagement/annotation/annotationState.d.ts +11 -10
  7. package/dist/cjs/stateManagement/annotation/annotationState.js +40 -45
  8. package/dist/cjs/stateManagement/annotation/annotationState.js.map +1 -1
  9. package/dist/cjs/stateManagement/annotation/helpers/state.d.ts +4 -0
  10. package/dist/cjs/stateManagement/annotation/helpers/state.js +49 -0
  11. package/dist/cjs/stateManagement/annotation/helpers/state.js.map +1 -0
  12. package/dist/cjs/stateManagement/index.d.ts +4 -3
  13. package/dist/cjs/stateManagement/index.js +4 -3
  14. package/dist/cjs/stateManagement/index.js.map +1 -1
  15. package/dist/cjs/store/ToolGroupManager/getToolGroupsWithToolName.d.ts +3 -0
  16. package/dist/cjs/store/ToolGroupManager/getToolGroupsWithToolName.js +23 -0
  17. package/dist/cjs/store/ToolGroupManager/getToolGroupsWithToolName.js.map +1 -0
  18. package/dist/cjs/store/ToolGroupManager/index.d.ts +2 -1
  19. package/dist/cjs/store/ToolGroupManager/index.js +3 -1
  20. package/dist/cjs/store/ToolGroupManager/index.js.map +1 -1
  21. package/dist/cjs/store/filterToolsWithAnnotationsForElement.js +2 -2
  22. package/dist/cjs/store/filterToolsWithAnnotationsForElement.js.map +1 -1
  23. package/dist/cjs/store/removeEnabledElement.js +1 -1
  24. package/dist/cjs/store/removeEnabledElement.js.map +1 -1
  25. package/dist/cjs/tools/CrosshairsTool.d.ts +1 -0
  26. package/dist/cjs/tools/CrosshairsTool.js +19 -17
  27. package/dist/cjs/tools/CrosshairsTool.js.map +1 -1
  28. package/dist/cjs/tools/ReferenceCursors.d.ts +0 -1
  29. package/dist/cjs/tools/ReferenceCursors.js +10 -12
  30. package/dist/cjs/tools/ReferenceCursors.js.map +1 -1
  31. package/dist/cjs/tools/ReferenceLinesTool.js +3 -2
  32. package/dist/cjs/tools/ReferenceLinesTool.js.map +1 -1
  33. package/dist/cjs/tools/ScaleOverlayTool.js +7 -8
  34. package/dist/cjs/tools/ScaleOverlayTool.js.map +1 -1
  35. package/dist/cjs/tools/WindowLevelTool.js +2 -1
  36. package/dist/cjs/tools/WindowLevelTool.js.map +1 -1
  37. package/dist/cjs/tools/annotation/AngleTool.js +5 -4
  38. package/dist/cjs/tools/annotation/AngleTool.js.map +1 -1
  39. package/dist/cjs/tools/annotation/ArrowAnnotateTool.js +8 -7
  40. package/dist/cjs/tools/annotation/ArrowAnnotateTool.js.map +1 -1
  41. package/dist/cjs/tools/annotation/BidirectionalTool.js +5 -4
  42. package/dist/cjs/tools/annotation/BidirectionalTool.js.map +1 -1
  43. package/dist/cjs/tools/annotation/CobbAngleTool.js +5 -4
  44. package/dist/cjs/tools/annotation/CobbAngleTool.js.map +1 -1
  45. package/dist/cjs/tools/annotation/EllipticalROITool.js +5 -4
  46. package/dist/cjs/tools/annotation/EllipticalROITool.js.map +1 -1
  47. package/dist/cjs/tools/annotation/LengthTool.js +5 -4
  48. package/dist/cjs/tools/annotation/LengthTool.js.map +1 -1
  49. package/dist/cjs/tools/annotation/PlanarFreehandROITool.js +4 -3
  50. package/dist/cjs/tools/annotation/PlanarFreehandROITool.js.map +1 -1
  51. package/dist/cjs/tools/annotation/ProbeTool.js +7 -5
  52. package/dist/cjs/tools/annotation/ProbeTool.js.map +1 -1
  53. package/dist/cjs/tools/annotation/RectangleROITool.js +7 -5
  54. package/dist/cjs/tools/annotation/RectangleROITool.js.map +1 -1
  55. package/dist/cjs/tools/base/AnnotationDisplayTool.js +2 -2
  56. package/dist/cjs/tools/base/AnnotationDisplayTool.js.map +1 -1
  57. package/dist/cjs/tools/segmentation/PaintFillTool.js +2 -1
  58. package/dist/cjs/tools/segmentation/PaintFillTool.js.map +1 -1
  59. package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js +5 -4
  60. package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
  61. package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js +4 -3
  62. package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
  63. package/dist/cjs/tools/segmentation/strategies/eraseRectangle.js +2 -1
  64. package/dist/cjs/tools/segmentation/strategies/eraseRectangle.js.map +1 -1
  65. package/dist/cjs/tools/segmentation/strategies/fillCircle.js +3 -2
  66. package/dist/cjs/tools/segmentation/strategies/fillCircle.js.map +1 -1
  67. package/dist/cjs/tools/segmentation/strategies/fillRectangle.js +2 -1
  68. package/dist/cjs/tools/segmentation/strategies/fillRectangle.js.map +1 -1
  69. package/dist/cjs/tools/segmentation/strategies/fillSphere.js +2 -1
  70. package/dist/cjs/tools/segmentation/strategies/fillSphere.js.map +1 -1
  71. package/dist/cjs/types/AnnotationGroupSelector.d.ts +2 -0
  72. package/dist/cjs/types/AnnotationGroupSelector.js +3 -0
  73. package/dist/cjs/types/AnnotationGroupSelector.js.map +1 -0
  74. package/dist/cjs/types/AnnotationTypes.d.ts +4 -4
  75. package/dist/cjs/types/IAnnotationManager.d.ts +14 -0
  76. package/dist/cjs/types/IAnnotationManager.js +3 -0
  77. package/dist/cjs/types/IAnnotationManager.js.map +1 -0
  78. package/dist/cjs/types/index.d.ts +4 -2
  79. package/dist/cjs/utilities/getAnnotationNearPoint.js +5 -4
  80. package/dist/cjs/utilities/getAnnotationNearPoint.js.map +1 -1
  81. package/dist/cjs/utilities/segmentation/createMergedLabelmapForIndex.js +3 -3
  82. package/dist/cjs/utilities/segmentation/createMergedLabelmapForIndex.js.map +1 -1
  83. package/dist/cjs/utilities/segmentation/rectangleROIThresholdVolumeByRange.js +2 -2
  84. package/dist/cjs/utilities/segmentation/rectangleROIThresholdVolumeByRange.js.map +1 -1
  85. package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js +3 -2
  86. package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js.map +1 -1
  87. package/dist/esm/init.js +2 -2
  88. package/dist/esm/init.js.map +1 -1
  89. package/dist/esm/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.d.ts +14 -16
  90. package/dist/esm/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.js +100 -91
  91. package/dist/esm/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.js.map +1 -1
  92. package/dist/esm/stateManagement/annotation/annotationState.d.ts +11 -10
  93. package/dist/esm/stateManagement/annotation/annotationState.js +38 -44
  94. package/dist/esm/stateManagement/annotation/annotationState.js.map +1 -1
  95. package/dist/esm/stateManagement/annotation/helpers/state.d.ts +4 -0
  96. package/dist/esm/stateManagement/annotation/helpers/state.js +45 -0
  97. package/dist/esm/stateManagement/annotation/helpers/state.js.map +1 -0
  98. package/dist/esm/stateManagement/index.d.ts +4 -3
  99. package/dist/esm/stateManagement/index.js +2 -2
  100. package/dist/esm/stateManagement/index.js.map +1 -1
  101. package/dist/esm/store/ToolGroupManager/getToolGroupsWithToolName.d.ts +3 -0
  102. package/dist/esm/store/ToolGroupManager/getToolGroupsWithToolName.js +21 -0
  103. package/dist/esm/store/ToolGroupManager/getToolGroupsWithToolName.js.map +1 -0
  104. package/dist/esm/store/ToolGroupManager/index.d.ts +2 -1
  105. package/dist/esm/store/ToolGroupManager/index.js +2 -1
  106. package/dist/esm/store/ToolGroupManager/index.js.map +1 -1
  107. package/dist/esm/store/filterToolsWithAnnotationsForElement.js +2 -2
  108. package/dist/esm/store/filterToolsWithAnnotationsForElement.js.map +1 -1
  109. package/dist/esm/store/removeEnabledElement.js +1 -1
  110. package/dist/esm/store/removeEnabledElement.js.map +1 -1
  111. package/dist/esm/tools/CrosshairsTool.d.ts +1 -0
  112. package/dist/esm/tools/CrosshairsTool.js +19 -17
  113. package/dist/esm/tools/CrosshairsTool.js.map +1 -1
  114. package/dist/esm/tools/ReferenceCursors.d.ts +0 -1
  115. package/dist/esm/tools/ReferenceCursors.js +10 -12
  116. package/dist/esm/tools/ReferenceCursors.js.map +1 -1
  117. package/dist/esm/tools/ReferenceLinesTool.js +3 -2
  118. package/dist/esm/tools/ReferenceLinesTool.js.map +1 -1
  119. package/dist/esm/tools/ScaleOverlayTool.js +7 -8
  120. package/dist/esm/tools/ScaleOverlayTool.js.map +1 -1
  121. package/dist/esm/tools/WindowLevelTool.js +2 -1
  122. package/dist/esm/tools/WindowLevelTool.js.map +1 -1
  123. package/dist/esm/tools/annotation/AngleTool.js +5 -4
  124. package/dist/esm/tools/annotation/AngleTool.js.map +1 -1
  125. package/dist/esm/tools/annotation/ArrowAnnotateTool.js +8 -7
  126. package/dist/esm/tools/annotation/ArrowAnnotateTool.js.map +1 -1
  127. package/dist/esm/tools/annotation/BidirectionalTool.js +5 -4
  128. package/dist/esm/tools/annotation/BidirectionalTool.js.map +1 -1
  129. package/dist/esm/tools/annotation/CobbAngleTool.js +5 -4
  130. package/dist/esm/tools/annotation/CobbAngleTool.js.map +1 -1
  131. package/dist/esm/tools/annotation/EllipticalROITool.js +5 -4
  132. package/dist/esm/tools/annotation/EllipticalROITool.js.map +1 -1
  133. package/dist/esm/tools/annotation/LengthTool.js +5 -4
  134. package/dist/esm/tools/annotation/LengthTool.js.map +1 -1
  135. package/dist/esm/tools/annotation/PlanarFreehandROITool.js +4 -3
  136. package/dist/esm/tools/annotation/PlanarFreehandROITool.js.map +1 -1
  137. package/dist/esm/tools/annotation/ProbeTool.js +7 -5
  138. package/dist/esm/tools/annotation/ProbeTool.js.map +1 -1
  139. package/dist/esm/tools/annotation/RectangleROITool.js +7 -5
  140. package/dist/esm/tools/annotation/RectangleROITool.js.map +1 -1
  141. package/dist/esm/tools/base/AnnotationDisplayTool.js +3 -3
  142. package/dist/esm/tools/base/AnnotationDisplayTool.js.map +1 -1
  143. package/dist/esm/tools/segmentation/PaintFillTool.js +2 -1
  144. package/dist/esm/tools/segmentation/PaintFillTool.js.map +1 -1
  145. package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js +5 -4
  146. package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
  147. package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js +4 -3
  148. package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
  149. package/dist/esm/tools/segmentation/strategies/eraseRectangle.js +2 -1
  150. package/dist/esm/tools/segmentation/strategies/eraseRectangle.js.map +1 -1
  151. package/dist/esm/tools/segmentation/strategies/fillCircle.js +3 -2
  152. package/dist/esm/tools/segmentation/strategies/fillCircle.js.map +1 -1
  153. package/dist/esm/tools/segmentation/strategies/fillRectangle.js +2 -1
  154. package/dist/esm/tools/segmentation/strategies/fillRectangle.js.map +1 -1
  155. package/dist/esm/tools/segmentation/strategies/fillSphere.js +2 -1
  156. package/dist/esm/tools/segmentation/strategies/fillSphere.js.map +1 -1
  157. package/dist/esm/types/AnnotationGroupSelector.d.ts +2 -0
  158. package/dist/esm/types/AnnotationGroupSelector.js +2 -0
  159. package/dist/esm/types/AnnotationGroupSelector.js.map +1 -0
  160. package/dist/esm/types/AnnotationTypes.d.ts +4 -4
  161. package/dist/esm/types/IAnnotationManager.d.ts +14 -0
  162. package/dist/esm/types/IAnnotationManager.js +2 -0
  163. package/dist/esm/types/IAnnotationManager.js.map +1 -0
  164. package/dist/esm/types/index.d.ts +4 -2
  165. package/dist/esm/utilities/getAnnotationNearPoint.js +3 -2
  166. package/dist/esm/utilities/getAnnotationNearPoint.js.map +1 -1
  167. package/dist/esm/utilities/segmentation/createMergedLabelmapForIndex.js +3 -3
  168. package/dist/esm/utilities/segmentation/createMergedLabelmapForIndex.js.map +1 -1
  169. package/dist/esm/utilities/segmentation/rectangleROIThresholdVolumeByRange.js +2 -2
  170. package/dist/esm/utilities/segmentation/rectangleROIThresholdVolumeByRange.js.map +1 -1
  171. package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js +3 -2
  172. package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js.map +1 -1
  173. package/dist/umd/index.js +1 -1
  174. package/dist/umd/index.js.map +1 -1
  175. package/package.json +3 -3
package/dist/cjs/tools/segmentation/strategies/fillCircle.js CHANGED
@@ -10,7 +10,8 @@ const utilities_1 = require("../../../utilities");
10
10
  const { transformWorldToIndex } = core_1.utilities;
11
11
  function fillCircle(enabledElement, operationData, threshold = false) {
12
12
  const { volume: segmentationVolume, imageVolume, points, segmentsLocked, segmentIndex, segmentationId, strategySpecificConfiguration, } = operationData;
13
- const { imageData, dimensions, scalarData } = segmentationVolume;
13
+ const { imageData, dimensions } = segmentationVolume;
14
+ const scalarData = segmentationVolume.getScalarData();
14
15
  const { viewport } = enabledElement;
15
16
  const center = gl_matrix_1.vec3.fromValues(0, 0, 0);
16
17
  points.forEach((point) => {
@@ -63,7 +64,7 @@ function fillCircle(enabledElement, operationData, threshold = false) {
63
64
  }
64
65
  function isWithinThreshold(index, imageVolume, strategySpecificConfiguration) {
65
66
  const { THRESHOLD_INSIDE_CIRCLE } = strategySpecificConfiguration;
66
- const voxelValue = imageVolume.scalarData[index];
67
+ const voxelValue = imageVolume.getScalarData()[index];
67
68
  const { threshold } = THRESHOLD_INSIDE_CIRCLE;
68
69
  return threshold[0] <= voxelValue && voxelValue <= threshold[1];
69
70
  }
package/dist/cjs/tools/segmentation/strategies/fillCircle.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fillCircle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillCircle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fillCircle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillCircle.ts"],"names":[],"mappings":"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"}
package/dist/cjs/tools/segmentation/strategies/fillRectangle.js CHANGED
@@ -8,7 +8,8 @@ const triggerSegmentationEvents_1 = require("../../../stateManagement/segmentati
8
8
  const { transformWorldToIndex } = core_1.utilities;
9
9
  function fillRectangle(enabledElement, operationData, inside = true) {
10
10
  const { volume: segmentation, points, segmentsLocked, segmentIndex, segmentationId, constraintFn, } = operationData;
11
- const { imageData, dimensions, scalarData } = segmentation;
11
+ const { imageData, dimensions } = segmentation;
12
+ const scalarData = segmentation.getScalarData();
12
13
  let rectangleCornersIJK = points.map((world) => {
13
14
  return transformWorldToIndex(imageData, world);
14
15
  });
package/dist/cjs/tools/segmentation/strategies/fillRectangle.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fillRectangle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillRectangle.ts"],"names":[],"mappings":";;;AAAA,8CAAwE;AAGxE,gEAA2E;AAC3E,kDAA0D;AAC1D,+GAAkH;AAElH,MAAM,EAAE,qBAAqB,EAAE,GAAG,gBAAO,CAAC;AAoB1C,SAAS,aAAa,CACpB,cAAqC,EACrC,aAA4B,EAC5B,MAAM,GAAG,IAAI;IAEb,MAAM,EACJ,MAAM,EAAE,YAAY,EACpB,MAAM,EACN,cAAc,EACd,YAAY,EACZ,cAAc,EACd,YAAY,GACb,GAAG,aAAa,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;IAE3D,IAAI,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7C,OAAO,qBAAqB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAGH,mBAAmB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACtD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,IAAA,uCAAyB,EAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAE7E,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE;QAChD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAGD,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;IAEpC,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC9C,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAClC,OAAO;SACR;QAED,IAAI,CAAC,YAAY,EAAE;YACjB,UAAU,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;YACjC,OAAO;SACR;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1B,UAAU,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;SAClC;IACH,CAAC,CAAC;IAEF,IAAA,gCAAoB,EAAC,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAEvE,IAAA,2DAA+B,EAAC,cAAc,CAAC,CAAC;AAClD,CAAC;AASD,SAAgB,mBAAmB,CACjC,cAAqC,EACrC,aAA4B;IAE5B,aAAa,CAAC,cAAc,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AALD,kDAKC;AASD,SAAgB,oBAAoB,CAClC,cAAqC,EACrC,aAA4B;IAE5B,aAAa,CAAC,cAAc,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC;AALD,oDAKC"}
1
+ {"version":3,"file":"fillRectangle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillRectangle.ts"],"names":[],"mappings":";;;AAAA,8CAAwE;AAGxE,gEAA2E;AAC3E,kDAA0D;AAC1D,+GAAkH;AAElH,MAAM,EAAE,qBAAqB,EAAE,GAAG,gBAAO,CAAC;AAoB1C,SAAS,aAAa,CACpB,cAAqC,EACrC,aAA4B,EAC5B,MAAM,GAAG,IAAI;IAEb,MAAM,EACJ,MAAM,EAAE,YAAY,EACpB,MAAM,EACN,cAAc,EACd,YAAY,EACZ,cAAc,EACd,YAAY,GACb,GAAG,aAAa,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;IAC/C,MAAM,UAAU,GAAG,YAAY,CAAC,aAAa,EAAE,CAAC;IAEhD,IAAI,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7C,OAAO,qBAAqB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAGH,mBAAmB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACtD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,IAAA,uCAAyB,EAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAE7E,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE;QAChD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAGD,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;IAEpC,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC9C,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAClC,OAAO;SACR;QAED,IAAI,CAAC,YAAY,EAAE;YACjB,UAAU,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;YACjC,OAAO;SACR;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1B,UAAU,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;SAClC;IACH,CAAC,CAAC;IAEF,IAAA,gCAAoB,EAAC,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAEvE,IAAA,2DAA+B,EAAC,cAAc,CAAC,CAAC;AAClD,CAAC;AASD,SAAgB,mBAAmB,CACjC,cAAqC,EACrC,aAA4B;IAE5B,aAAa,CAAC,cAAc,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AALD,kDAKC;AASD,SAAgB,oBAAoB,CAClC,cAAqC,EACrC,aAA4B;IAE5B,aAAa,CAAC,cAAc,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC;AALD,oDAKC"}
package/dist/cjs/tools/segmentation/strategies/fillSphere.js CHANGED
@@ -6,7 +6,8 @@ const utilities_1 = require("../../../utilities");
6
6
  function fillSphere(enabledElement, operationData, _inside = true) {
7
7
  const { viewport } = enabledElement;
8
8
  const { volume: segmentation, segmentsLocked, segmentIndex, segmentationId, points, } = operationData;
9
- const { scalarData, imageData, dimensions } = segmentation;
9
+ const { imageData, dimensions } = segmentation;
10
+ const scalarData = segmentation.getScalarData();
10
11
  const scalarIndex = [];
11
12
  const callback = ({ index, value }) => {
12
13
  if (segmentsLocked.includes(value)) {
package/dist/cjs/tools/segmentation/strategies/fillSphere.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fillSphere.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillSphere.ts"],"names":[],"mappings":";;;AAEA,+GAAkH;AAClH,kDAAsE;AAatE,SAAS,UAAU,CACjB,cAAqC,EACrC,aAA4B,EAC5B,OAAO,GAAG,IAAI;IAEd,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IACpC,MAAM,EACJ,MAAM,EAAE,YAAY,EACpB,cAAc,EACd,YAAY,EACZ,cAAc,EACd,MAAM,GACP,GAAG,aAAa,CAAC;IAElB,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;IAC3D,MAAM,WAAW,GAAG,EAAE,CAAC;IAEvB,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;QACpC,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAClC,OAAO;SACR;QACD,UAAU,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;QACjC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAC;IAEF,IAAA,4CAAgC,EAC9B,SAAS,EACT,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EACtB,QAAQ,EACR,QAAiC,CAClC,CAAC;IAKF,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAC3B,EAAE,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,CAAC,EAAE,EACnC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,CACvB,CAAC;IAEF,IAAA,2DAA+B,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAC9D,CAAC;AAQD,SAAgB,gBAAgB,CAC9B,cAAqC,EACrC,aAA4B;IAE5B,UAAU,CAAC,cAAc,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;AAClD,CAAC;AALD,4CAKC;AAQD,SAAgB,iBAAiB,CAC/B,cAAqC,EACrC,aAA4B;IAE5B,UAAU,CAAC,cAAc,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;AACnD,CAAC;AALD,8CAKC"}
1
+ {"version":3,"file":"fillSphere.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillSphere.ts"],"names":[],"mappings":";;;AAEA,+GAAkH;AAClH,kDAAsE;AAatE,SAAS,UAAU,CACjB,cAAqC,EACrC,aAA4B,EAC5B,OAAO,GAAG,IAAI;IAEd,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IACpC,MAAM,EACJ,MAAM,EAAE,YAAY,EACpB,cAAc,EACd,YAAY,EACZ,cAAc,EACd,MAAM,GACP,GAAG,aAAa,CAAC;IAElB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;IAC/C,MAAM,UAAU,GAAG,YAAY,CAAC,aAAa,EAAE,CAAC;IAChD,MAAM,WAAW,GAAG,EAAE,CAAC;IAEvB,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;QACpC,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAClC,OAAO;SACR;QACD,UAAU,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;QACjC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAC;IAEF,IAAA,4CAAgC,EAC9B,SAAS,EACT,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EACtB,QAAQ,EACR,QAAiC,CAClC,CAAC;IAKF,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAC3B,EAAE,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,CAAC,EAAE,EACnC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,CACvB,CAAC;IAEF,IAAA,2DAA+B,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAC9D,CAAC;AAQD,SAAgB,gBAAgB,CAC9B,cAAqC,EACrC,aAA4B;IAE5B,UAAU,CAAC,cAAc,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;AAClD,CAAC;AALD,4CAKC;AAQD,SAAgB,iBAAiB,CAC/B,cAAqC,EACrC,aAA4B;IAE5B,UAAU,CAAC,cAAc,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;AACnD,CAAC;AALD,8CAKC"}
package/dist/cjs/types/AnnotationGroupSelector.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ declare type AnnotationGroupSelector = HTMLDivElement | string;
2
+ export default AnnotationGroupSelector;
package/dist/cjs/types/AnnotationGroupSelector.js ADDED
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=AnnotationGroupSelector.js.map
package/dist/cjs/types/AnnotationGroupSelector.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"AnnotationGroupSelector.js","sourceRoot":"","sources":["../../../src/types/AnnotationGroupSelector.ts"],"names":[],"mappings":""}
package/dist/cjs/types/AnnotationTypes.d.ts CHANGED
@@ -36,10 +36,10 @@ declare type Annotation = {
36
36
  };
37
37
  };
38
38
  declare type Annotations = Array<Annotation>;
39
- declare type FrameOfReferenceSpecificAnnotations = {
40
- [key: string]: Annotations;
39
+ declare type GroupSpecificAnnotations = {
40
+ [toolName: string]: Annotations;
41
41
  };
42
42
  declare type AnnotationState = {
43
- [key: string]: FrameOfReferenceSpecificAnnotations;
43
+ [key: string]: GroupSpecificAnnotations;
44
44
  };
45
- export { FrameOfReferenceSpecificAnnotations, AnnotationState, Annotations, Annotation, };
45
+ export { Annotation, Annotations, GroupSpecificAnnotations, AnnotationState };
package/dist/cjs/types/IAnnotationManager.d.ts ADDED
@@ -0,0 +1,14 @@
1
+ import AnnotationGroupSelector from './AnnotationGroupSelector';
2
+ import { Annotation, Annotations, GroupSpecificAnnotations } from './AnnotationTypes';
3
+ interface IAnnotationManager {
4
+ getGroupKey: (annotationGroupSelector: AnnotationGroupSelector) => string;
5
+ addAnnotation: (annotation: Annotation, groupKey: string) => void;
6
+ getAnnotations: (groupKey: string, toolName?: string) => GroupSpecificAnnotations | Annotations;
7
+ getAnnotation: (annotationUID: string) => Annotation;
8
+ removeAnnotation: (annotationUID: string) => void;
9
+ removeAnnotations: (groupKey: string) => void;
10
+ removeAllAnnotations: () => void;
11
+ getNumberOfAnnotations: (groupKey: string, toolName?: string) => number;
12
+ getNumberOfAllAnnotations: () => number;
13
+ }
14
+ export default IAnnotationManager;
package/dist/cjs/types/IAnnotationManager.js ADDED
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=IAnnotationManager.js.map
package/dist/cjs/types/IAnnotationManager.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"IAnnotationManager.js","sourceRoot":"","sources":["../../../src/types/IAnnotationManager.ts"],"names":[],"mappings":""}
package/dist/cjs/types/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { Annotation, Annotations, FrameOfReferenceSpecificAnnotations, AnnotationState } from './AnnotationTypes';
1
+ import type { Annotation, Annotations, AnnotationState, GroupSpecificAnnotations } from './AnnotationTypes';
2
2
  import type * as EventTypes from './EventTypes';
3
3
  import type * as LabelmapTypes from './LabelmapTypes';
4
4
  import type IPoints from './IPoints';
@@ -24,4 +24,6 @@ import ISynchronizerEventHandler from './ISynchronizerEventHandler';
24
24
  import { FloodFillGetter, FloodFillOptions, FloodFillResult } from './FloodFillTypes';
25
25
  import IToolClassReference from './IToolClassReference';
26
26
  import { ContourSegmentationData } from './ContourTypes';
27
- export type { Annotation, Annotations, FrameOfReferenceSpecificAnnotations, AnnotationState, AnnotationStyle, ToolSpecificAnnotationTypes, JumpToSliceOptions, PlanarBoundingBox, ToolProps, PublicToolProps, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, SegmentationRepresentationData, SegmentationRepresentationConfig, RepresentationConfig, ToolGroupSpecificRepresentationState, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, RepresentationPublicInput, Color, ColorLUT, LabelmapTypes, SVGCursorDescriptor, SVGPoint, ScrollOptions, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, };
27
+ import IAnnotationManager from './IAnnotationManager';
28
+ import AnnotationGroupSelector from './AnnotationGroupSelector';
29
+ export type { Annotation, Annotations, IAnnotationManager, GroupSpecificAnnotations, AnnotationState, AnnotationStyle, ToolSpecificAnnotationTypes, JumpToSliceOptions, AnnotationGroupSelector, PlanarBoundingBox, ToolProps, PublicToolProps, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, SegmentationRepresentationData, SegmentationRepresentationConfig, RepresentationConfig, ToolGroupSpecificRepresentationState, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, RepresentationPublicInput, Color, ColorLUT, LabelmapTypes, SVGCursorDescriptor, SVGPoint, ScrollOptions, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, };
package/dist/cjs/utilities/getAnnotationNearPoint.js CHANGED
@@ -52,13 +52,14 @@ 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;
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);
55
+ var _a, _b;
56
+ const { viewport } = enabledElement;
57
+ const annotations = (0, annotationState_1.getAnnotations)(tool.constructor.toolName, viewport === null || viewport === void 0 ? void 0 : viewport.element);
58
+ const currentId = (_a = viewport === null || viewport === void 0 ? void 0 : viewport.getCurrentImageId) === null || _a === void 0 ? void 0 : _a.call(viewport);
58
59
  if (annotations === null || annotations === void 0 ? void 0 : annotations.length) {
59
60
  const { element } = enabledElement.viewport;
60
61
  for (const annotation of annotations) {
61
- const referencedImageId = (_c = annotation.metadata) === null || _c === void 0 ? void 0 : _c.referencedImageId;
62
+ const referencedImageId = (_b = annotation.metadata) === null || _b === void 0 ? void 0 : _b.referencedImageId;
62
63
  if ((currentId && referencedImageId && currentId !== referencedImageId) ||
63
64
  !tool.isPointNearTool) {
64
65
  continue;
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;AA6FQ,wDAAsB;AAjF/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;AAkDgC,wFAAsC;AApCvE,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,IACE,CAAC,SAAS,IAAI,iBAAiB,IAAI,SAAS,KAAK,iBAAiB,CAAC;gBACnE,CAAC,IAAI,CAAC,eAAe,EACrB;gBACA,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"}
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;AA+FQ,wDAAsB;AAnF/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;AAoDgC,wFAAsC;AAtCvE,SAAS,6BAA6B,CACpC,IAAoB,EACpB,cAAqC,EACrC,KAAmB,EACnB,SAAiB;;IAKjB,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,MAAM,WAAW,GAAG,IAAA,gCAAc,EAC/B,IAAI,CAAC,WAA+B,CAAC,QAAQ,EAC9C,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAClB,CAAC;IACF,MAAM,SAAS,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,iBAAiB,wDAAI,CAAC;IAClD,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,IACE,CAAC,SAAS,IAAI,iBAAiB,IAAI,SAAS,KAAK,iBAAiB,CAAC;gBACnE,CAAC,IAAI,CAAC,eAAe,EACrB;gBACA,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/cjs/utilities/segmentation/createMergedLabelmapForIndex.js CHANGED
@@ -11,10 +11,10 @@ function createMergedLabelmapForIndex(labelmaps, segmentIndex = 1, volumeId = 'm
11
11
  }
12
12
  });
13
13
  const labelmap = labelmaps[0];
14
- const arrayType = labelmap.scalarData.constructor;
15
- const outputData = new arrayType(labelmap.scalarData.length);
14
+ const arrayType = labelmap.getScalarData().constructor;
15
+ const outputData = new arrayType(labelmap.getScalarData().length);
16
16
  labelmaps.forEach((labelmap) => {
17
- const { scalarData } = labelmap;
17
+ const scalarData = labelmap.getScalarData();
18
18
  for (let i = 0; i < scalarData.length; i++) {
19
19
  if (scalarData[i] === segmentIndex) {
20
20
  outputData[i] = segmentIndex;
package/dist/cjs/utilities/segmentation/createMergedLabelmapForIndex.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createMergedLabelmapForIndex.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/createMergedLabelmapForIndex.ts"],"names":[],"mappings":";;AACA,8CAAyE;AAazE,SAAS,4BAA4B,CACnC,SAAoC,EACpC,YAAY,GAAG,CAAC,EAChB,QAAQ,GAAG,gBAAgB;IAE3B,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;QAC/D,IACE,CAAC,gBAAO,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YACrD,CAAC,gBAAO,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACnD,CAAC,gBAAO,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC/C,CAAC,gBAAO,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAC7C;YACA,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAE9B,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;IAClD,MAAM,UAAU,GAAG,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAE7D,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC7B,MAAM,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;QAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1C,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE;gBAClC,UAAU,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;aAC9B;SACF;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG;QACd,UAAU,EAAE,UAAU;QACtB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,UAAU,EAAE,QAAQ,CAAC,UAAU;KAChC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAI,CAAC;IAE1B,MAAM,YAAY,GAAG,mBAAY,CAAC,iBAAiB,CACjD,OAAO,EACP,QAAQ,EACR,YAAY,CACb,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,kBAAe,4BAA4B,CAAC"}
1
+ {"version":3,"file":"createMergedLabelmapForIndex.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/createMergedLabelmapForIndex.ts"],"names":[],"mappings":";;AACA,8CAAyE;AAazE,SAAS,4BAA4B,CACnC,SAAoC,EACpC,YAAY,GAAG,CAAC,EAChB,QAAQ,GAAG,gBAAgB;IAE3B,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;QAC/D,IACE,CAAC,gBAAO,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YACrD,CAAC,gBAAO,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACnD,CAAC,gBAAO,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC/C,CAAC,gBAAO,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAC7C;YACA,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAE9B,MAAM,SAAS,GAAI,QAAQ,CAAC,aAAa,EAAU,CAAC,WAAW,CAAC;IAChE,MAAM,UAAU,GAAG,IAAI,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC7B,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC;QAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1C,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE;gBAClC,UAAU,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;aAC9B;SACF;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG;QACd,UAAU,EAAE,UAAU;QACtB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,UAAU,EAAE,QAAQ,CAAC,UAAU;KAChC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAI,CAAC;IAE1B,MAAM,YAAY,GAAG,mBAAY,CAAC,iBAAiB,CACjD,OAAO,EACP,QAAQ,EACR,YAAY,CACb,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,kBAAe,4BAA4B,CAAC"}
package/dist/cjs/utilities/segmentation/rectangleROIThresholdVolumeByRange.js CHANGED
@@ -14,8 +14,8 @@ function rectangleROIThresholdVolumeByRange(annotationUIDs, segmentationVolume,
14
14
  _validateAnnotations(annotations);
15
15
  let boundsIJK;
16
16
  for (let i = 0; i < thresholdVolumeInformation.length; i++) {
17
- const volumeSize = thresholdVolumeInformation[i].volume.scalarData.length;
18
- if (volumeSize === segmentationVolume.scalarData.length || i === 0) {
17
+ const volumeSize = thresholdVolumeInformation[i].volume.getScalarData().length;
18
+ if (volumeSize === segmentationVolume.getScalarData().length || i === 0) {
19
19
  boundsIJK = (0, getBoundsIJKFromRectangleAnnotations_1.default)(annotations, thresholdVolumeInformation[i].volume, options);
20
20
  }
21
21
  }
package/dist/cjs/utilities/segmentation/rectangleROIThresholdVolumeByRange.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rectangleROIThresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/rectangleROIThresholdVolumeByRange.ts"],"names":[],"mappings":";;;;;AACA,iEAAyD;AACzD,uCAGqB;AAErB,sFAA8D;AAC9D,oIAA4G;AAoC5G,SAAS,kCAAkC,CACzC,cAAwB,EACxB,kBAAsC,EACtC,0BAAkD,EAClD,OAAyB;IAEzB,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;QACvD,OAAO,kBAAK,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAElC,IAAI,SAAS,CAAC;IACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,0BAA0B,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAE1D,MAAM,UAAU,GAAG,0BAA0B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;QAC1E,IAAI,UAAU,KAAK,kBAAkB,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE;YAClE,SAAS,GAAG,IAAA,8CAAoC,EAC9C,WAAW,EACX,0BAA0B,CAAC,CAAC,CAAC,CAAC,MAAM,EACpC,OAAO,CACR,CAAC;SACH;KACF;IAED,MAAM,wBAAwB,GAAG,IAAA,gCAAsB,EACrD,kBAAkB,EAClB,0BAA0B,kCACrB,OAAO,KAAE,SAAS,IACxB,CAAC;IAEF,OAAO,wBAAwB,CAAC;AAClC,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAW;IACvC,MAAM,cAAc,GAAG;QACrB,iCAAyB,CAAC,QAAQ;QAClC,yCAAiC,CAAC,QAAQ;KAC3C,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC1C,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CACb,sHAAsH,CACvH,CAAC;SACH;KACF;AACH,CAAC;AAED,kBAAe,kCAAkC,CAAC"}
1
+ {"version":3,"file":"rectangleROIThresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/rectangleROIThresholdVolumeByRange.ts"],"names":[],"mappings":";;;;;AACA,iEAAyD;AACzD,uCAGqB;AAErB,sFAA8D;AAC9D,oIAA4G;AAoC5G,SAAS,kCAAkC,CACzC,cAAwB,EACxB,kBAAsC,EACtC,0BAAkD,EAClD,OAAyB;IAEzB,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;QACvD,OAAO,kBAAK,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAElC,IAAI,SAAS,CAAC;IACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,0BAA0B,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAE1D,MAAM,UAAU,GACd,0BAA0B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC;QAC9D,IAAI,UAAU,KAAK,kBAAkB,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE;YACvE,SAAS,GAAG,IAAA,8CAAoC,EAC9C,WAAW,EACX,0BAA0B,CAAC,CAAC,CAAC,CAAC,MAAM,EACpC,OAAO,CACR,CAAC;SACH;KACF;IAED,MAAM,wBAAwB,GAAG,IAAA,gCAAsB,EACrD,kBAAkB,EAClB,0BAA0B,kCACrB,OAAO,KAAE,SAAS,IACxB,CAAC;IAEF,OAAO,wBAAwB,CAAC;AAClC,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAW;IACvC,MAAM,cAAc,GAAG;QACrB,iCAAyB,CAAC,QAAQ;QAClC,yCAAiC,CAAC,QAAQ;KAC3C,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC1C,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CACb,sHAAsH,CACvH,CAAC;SACH;KACF;AACH,CAAC;AAED,kBAAe,kCAAkC,CAAC"}
package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js CHANGED
@@ -11,7 +11,8 @@ const equalsCheck = (a, b) => {
11
11
  return JSON.stringify(a) === JSON.stringify(b);
12
12
  };
13
13
  function thresholdVolumeByRange(segmentationVolume, thresholdVolumeInformation, options) {
14
- const { scalarData, spacing: segmentationSpacing, imageData: segmentationImageData, } = segmentationVolume;
14
+ const { spacing: segmentationSpacing, imageData: segmentationImageData } = segmentationVolume;
15
+ const scalarData = segmentationVolume.getScalarData();
15
16
  const { overwrite, boundsIJK } = options;
16
17
  const overlapType = (options === null || options === void 0 ? void 0 : options.overlapType) || 0;
17
18
  if (overwrite) {
@@ -23,7 +24,7 @@ function thresholdVolumeByRange(segmentationVolume, thresholdVolumeInformation,
23
24
  let baseVolumeIdx = 0;
24
25
  for (let i = 0; i < thresholdVolumeInformation.length; i++) {
25
26
  const { imageData, spacing, dimensions } = thresholdVolumeInformation[i].volume;
26
- const volumeSize = thresholdVolumeInformation[i].volume.scalarData.length;
27
+ const volumeSize = thresholdVolumeInformation[i].volume.getScalarData().length;
27
28
  if (volumeSize === scalarData.length &&
28
29
  equalsCheck(spacing, segmentationSpacing)) {
29
30
  baseVolumeIdx = i;
package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"thresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/thresholdVolumeByRange.ts"],"names":[],"mappings":";;;;;AACA,8CAA2D;AAE3D,+CAAuD;AACvD,4GAA+G;AAE/G,yGAAiF;AAejF,MAAM,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;IAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC;AAqBF,SAAS,sBAAsB,CAC7B,kBAAsC,EACtC,0BAAkD,EAClD,OAA8B;IAE9B,MAAM,EACJ,UAAU,EACV,OAAO,EAAE,mBAAmB,EAC5B,SAAS,EAAE,qBAAqB,GACjC,GAAG,kBAAkB,CAAC;IAEvB,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IACzC,MAAM,WAAW,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,KAAI,CAAC,CAAC;IAG9C,IAAI,SAAS,EAAE;QACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1C,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;SACnB;KACF;IAGD,MAAM,cAAc,GAAG,EAAE,CAAC;IAC1B,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,0BAA0B,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1D,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,GACtC,0BAA0B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAEvC,MAAM,UAAU,GAAG,0BAA0B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;QAE1E,IACE,UAAU,KAAK,UAAU,CAAC,MAAM;YAChC,WAAW,CAAC,OAAO,EAAE,mBAAmB,CAAC,EACzC;YACA,aAAa,GAAG,CAAC,CAAC;SACnB;QAGD,MAAM,eAAe,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,CAAC;QACxE,MAAM,KAAK,GAAG,0BAA0B,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAClD,MAAM,KAAK,GAAG,0BAA0B,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAElD,cAAc,CAAC,IAAI,CAAC;YAClB,SAAS;YACT,eAAe;YACf,KAAK;YACL,KAAK;YACL,OAAO;YACP,UAAU;YACV,UAAU;SACX,CAAC,CAAC;KACJ;IAGD,IAAI,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC;IAE3B,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE;QAMjE,MAAM,eAAe,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;YACpC,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;YAClB,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE;gBAChD,QAAQ,GAAG,QAAQ,GAAG,CAAC,CAAC;aACzB;QACH,CAAC,CAAC;QAEF,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;QAE3D,MAAM,aAAa,GAAG,eAAe,CACnC,SAAS,EACT,UAAU,EACV,YAAY,EACZ,WAAW,CACZ,CAAC;QAGF,KAAK,GAAG,CAAC,CAAC;QACV,QAAQ,GAAG,CAAC,CAAC;QACb,KAAK,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QAEzB,IAAI,WAAW,GAAG,KAAK,CAAC;QAGxB,IAAA,gCAAoB,EAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;QAE5E,IAAI,WAAW,KAAK,CAAC,EAAE;YACrB,WAAW,GAAG,QAAQ,GAAG,CAAC,CAAC;SAC5B;aAAM,IAAI,WAAW,IAAI,CAAC,EAAE;YAC3B,WAAW,GAAG,QAAQ,KAAK,KAAK,CAAC;SAClC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;IAGF,MAAM,SAAS,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;QACzC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;QAChE,MAAM,MAAM,GAAG,SAAS,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAEtD,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,KAAK,IAAI,KAAK,IAAI,KAAK,IAAI,KAAK,EAAE;YACpC,OAAO,KAAK,CAAC;SACd;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC;IAMF,MAAM,eAAe,GAAG,CACtB,SAAS,EACT,UAAU,EACV,YAAY,EACZ,WAAW,EACX,EAAE;QACF,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBAC1B,MAAM,KAAK,GAAG,WAAW,CAAC;oBAC1B,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;oBAC1D,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;oBAC1D,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;oBAC1D,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC/B;aACF;SACF;QACD,MAAM,eAAe,GAAG,iBAAiB,CAAC,GAAG,CAC3C,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAO,CAAC,qBAAqB,CAAC,SAAS,EAAE,KAAK,CAAiB,CAC3E,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,mCAAyB,EAC7C,eAAe,EACf,UAAU,CACX,CAAC;QAEF,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC;IAOF,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE;QACjD,IAAI,MAAM,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;QACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAE9C,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,MAAM,EAAE;gBACtD,MAAM,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;aACjD;iBAAM;gBAEL,MAAM,GAAG,gBAAgB,CACvB,cAAc,CAAC,CAAC,CAAC,EACjB,cAAc,CAAC,aAAa,CAAC,CAAC,OAAO,EACrC,QAAQ,CACT,CAAC;aACH;YACD,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM;aACP;SACF;QAGD,IAAI,MAAM;YAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,IAAA,gCAAoB,EAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAE7E,IAAA,2DAA+B,EAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAE7D,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,kBAAe,sBAAsB,CAAC"}
1
+ {"version":3,"file":"thresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/thresholdVolumeByRange.ts"],"names":[],"mappings":"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"}
package/dist/esm/init.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { eventTarget, Enums } from '@cornerstonejs/core';
2
- import { getDefaultAnnotationManager } from './stateManagement/annotation/annotationState';
2
+ import { getAnnotationManager } from './stateManagement/annotation/annotationState';
3
3
  import { getDefaultSegmentationStateManager } from './stateManagement/segmentation/segmentationState';
4
4
  import { Events as TOOLS_EVENTS } from './enums';
5
5
  import { addEnabledElement, removeEnabledElement } from './store';
@@ -20,7 +20,7 @@ export function destroy() {
20
20
  _removeCornerstoneToolsEventListeners();
21
21
  ToolGroupManager.destroy();
22
22
  resetCornerstoneToolsState();
23
- const annotationManager = getDefaultAnnotationManager();
23
+ const annotationManager = getAnnotationManager();
24
24
  const segmentationStateManager = getDefaultSegmentationStateManager();
25
25
  annotationManager.restoreAnnotations({});
26
26
  segmentationStateManager.resetState();
package/dist/esm/init.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/init.ts"],"names":[],"mappings":"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"}
package/dist/esm/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.d.ts CHANGED
@@ -1,26 +1,24 @@
1
- import { Annotation, Annotations, FrameOfReferenceSpecificAnnotations, AnnotationState } from '../../types/AnnotationTypes';
1
+ import { Annotation, Annotations, AnnotationState, GroupSpecificAnnotations } from '../../types/AnnotationTypes';
2
+ import { AnnotationGroupSelector, IAnnotationManager } from '../../types';
2
3
  import { Types } from '@cornerstonejs/core';
3
- interface FilterInterface {
4
- FrameOfReferenceUID?: string;
5
- toolName?: string;
6
- }
7
- export default class FrameOfReferenceSpecificAnnotationManager {
4
+ declare class FrameOfReferenceSpecificAnnotationManager implements IAnnotationManager {
8
5
  private annotations;
9
6
  readonly uid: string;
10
7
  constructor(uid?: string);
8
+ getGroupKey: (annotationGroupSelector: AnnotationGroupSelector) => string;
11
9
  _imageVolumeModifiedHandler: (evt: Types.EventTypes.ImageVolumeModifiedEvent) => void;
12
10
  getFramesOfReference: () => Array<string>;
13
- getFrameOfReferenceAnnotations: (FrameOfReferenceUID: string) => FrameOfReferenceSpecificAnnotations;
14
- get: (FrameOfReferenceUID: string, toolName: string) => Annotations | undefined;
15
- getAnnotation: (annotationUID: string, filter?: FilterInterface) => Annotation | undefined;
16
- getNumberOfAnnotationsInFrameOfReference: (toolName: string, frameOfReferenceUID: string) => number;
17
- getNumberOfAnnotations: (toolName: string, frameOfReferenceUID?: string) => number;
18
- addAnnotation: (annotation: Annotation) => void;
19
- removeAnnotation: (annotationUID: string, filter?: FilterInterface) => void;
20
- saveAnnotations: (FrameOfReferenceUID?: string, toolName?: string) => AnnotationState | FrameOfReferenceSpecificAnnotations | Annotations;
21
- restoreAnnotations: (state: AnnotationState | FrameOfReferenceSpecificAnnotations | Annotations, FrameOfReferenceUID?: string, toolName?: string) => void;
11
+ getAnnotations: (groupKey: string, toolName?: string) => GroupSpecificAnnotations | Annotations;
12
+ getAnnotation: (annotationUID: string) => Annotation | undefined;
13
+ getNumberOfAnnotations: (groupKey: string, toolName?: string) => number;
14
+ addAnnotation: (annotation: Annotation, groupKey?: string) => void;
15
+ removeAnnotation: (annotationUID: string) => void;
16
+ removeAnnotations: (groupKey: string, toolName?: string) => void;
17
+ saveAnnotations: (groupKey?: string, toolName?: string) => AnnotationState | GroupSpecificAnnotations | Annotations;
18
+ restoreAnnotations: (state: AnnotationState | GroupSpecificAnnotations | Annotations, groupKey?: string, toolName?: string) => void;
19
+ getNumberOfAllAnnotations: () => number;
22
20
  removeAllAnnotations: () => void;
23
- private _getToolSpecificAnnotationsAndIndex;
24
21
  }
25
22
  declare const defaultFrameOfReferenceSpecificAnnotationManager: FrameOfReferenceSpecificAnnotationManager;
26
23
  export { defaultFrameOfReferenceSpecificAnnotationManager };
24
+ export default FrameOfReferenceSpecificAnnotationManager;