@cornerstonejs/tools 1.55.0 → 1.56.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 (91) hide show
  1. package/dist/cjs/eventListeners/segmentation/imageChangeEventListener.js +15 -7
  2. package/dist/cjs/eventListeners/segmentation/imageChangeEventListener.js.map +1 -1
  3. package/dist/cjs/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.js +1 -1
  4. package/dist/cjs/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.js.map +1 -1
  5. package/dist/cjs/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.js +2 -1
  6. package/dist/cjs/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.js.map +1 -1
  7. package/dist/cjs/tools/annotation/CobbAngleTool.js +27 -22
  8. package/dist/cjs/tools/annotation/CobbAngleTool.js.map +1 -1
  9. package/dist/cjs/tools/segmentation/BrushTool.js +1 -1
  10. package/dist/cjs/tools/segmentation/BrushTool.js.map +1 -1
  11. package/dist/cjs/tools/segmentation/strategies/BrushStrategy.d.ts +3 -2
  12. package/dist/cjs/tools/segmentation/strategies/BrushStrategy.js +11 -4
  13. package/dist/cjs/tools/segmentation/strategies/BrushStrategy.js.map +1 -1
  14. package/dist/cjs/tools/segmentation/strategies/compositions/dynamicThreshold.js +9 -3
  15. package/dist/cjs/tools/segmentation/strategies/compositions/dynamicThreshold.js.map +1 -1
  16. package/dist/cjs/tools/segmentation/strategies/compositions/islandRemoval.js +1 -1
  17. package/dist/cjs/tools/segmentation/strategies/compositions/islandRemoval.js.map +1 -1
  18. package/dist/cjs/tools/segmentation/strategies/compositions/threshold.js +6 -2
  19. package/dist/cjs/tools/segmentation/strategies/compositions/threshold.js.map +1 -1
  20. package/dist/cjs/tools/segmentation/strategies/utils/getStrategyData.d.ts +2 -3
  21. package/dist/cjs/tools/segmentation/strategies/utils/getStrategyData.js +21 -6
  22. package/dist/cjs/tools/segmentation/strategies/utils/getStrategyData.js.map +1 -1
  23. package/dist/cjs/utilities/pointInShapeCallback.js +3 -1
  24. package/dist/cjs/utilities/pointInShapeCallback.js.map +1 -1
  25. package/dist/cjs/utilities/segmentation/floodFill.js +16 -22
  26. package/dist/cjs/utilities/segmentation/floodFill.js.map +1 -1
  27. package/dist/cjs/utilities/segmentation/getSegmentAtLabelmapBorder.js +3 -2
  28. package/dist/cjs/utilities/segmentation/getSegmentAtLabelmapBorder.js.map +1 -1
  29. package/dist/cjs/utilities/segmentation/getSegmentAtWorldPoint.js +3 -2
  30. package/dist/cjs/utilities/segmentation/getSegmentAtWorldPoint.js.map +1 -1
  31. package/dist/esm/eventListeners/segmentation/imageChangeEventListener.js +16 -8
  32. package/dist/esm/eventListeners/segmentation/imageChangeEventListener.js.map +1 -1
  33. package/dist/esm/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.js +1 -1
  34. package/dist/esm/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.js.map +1 -1
  35. package/dist/esm/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.js +2 -1
  36. package/dist/esm/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.js.map +1 -1
  37. package/dist/esm/tools/annotation/CobbAngleTool.js +33 -28
  38. package/dist/esm/tools/annotation/CobbAngleTool.js.map +1 -1
  39. package/dist/esm/tools/segmentation/BrushTool.js +1 -1
  40. package/dist/esm/tools/segmentation/BrushTool.js.map +1 -1
  41. package/dist/esm/tools/segmentation/strategies/BrushStrategy.js +10 -3
  42. package/dist/esm/tools/segmentation/strategies/BrushStrategy.js.map +1 -1
  43. package/dist/esm/tools/segmentation/strategies/compositions/dynamicThreshold.js +9 -3
  44. package/dist/esm/tools/segmentation/strategies/compositions/dynamicThreshold.js.map +1 -1
  45. package/dist/esm/tools/segmentation/strategies/compositions/islandRemoval.js +1 -1
  46. package/dist/esm/tools/segmentation/strategies/compositions/islandRemoval.js.map +1 -1
  47. package/dist/esm/tools/segmentation/strategies/compositions/threshold.js +6 -2
  48. package/dist/esm/tools/segmentation/strategies/compositions/threshold.js.map +1 -1
  49. package/dist/esm/tools/segmentation/strategies/utils/getStrategyData.js +21 -6
  50. package/dist/esm/tools/segmentation/strategies/utils/getStrategyData.js.map +1 -1
  51. package/dist/esm/utilities/pointInShapeCallback.js +3 -1
  52. package/dist/esm/utilities/pointInShapeCallback.js.map +1 -1
  53. package/dist/esm/utilities/segmentation/floodFill.js +16 -22
  54. package/dist/esm/utilities/segmentation/floodFill.js.map +1 -1
  55. package/dist/esm/utilities/segmentation/getSegmentAtLabelmapBorder.js +3 -2
  56. package/dist/esm/utilities/segmentation/getSegmentAtLabelmapBorder.js.map +1 -1
  57. package/dist/esm/utilities/segmentation/getSegmentAtWorldPoint.js +3 -2
  58. package/dist/esm/utilities/segmentation/getSegmentAtWorldPoint.js.map +1 -1
  59. package/dist/types/eventListeners/segmentation/imageChangeEventListener.d.ts.map +1 -1
  60. package/dist/types/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.d.ts.map +1 -1
  61. package/dist/types/tools/annotation/CobbAngleTool.d.ts.map +1 -1
  62. package/dist/types/tools/segmentation/strategies/BrushStrategy.d.ts +3 -2
  63. package/dist/types/tools/segmentation/strategies/BrushStrategy.d.ts.map +1 -1
  64. package/dist/types/tools/segmentation/strategies/compositions/dynamicThreshold.d.ts.map +1 -1
  65. package/dist/types/tools/segmentation/strategies/compositions/islandRemoval.d.ts.map +1 -1
  66. package/dist/types/tools/segmentation/strategies/compositions/threshold.d.ts.map +1 -1
  67. package/dist/types/tools/segmentation/strategies/utils/getStrategyData.d.ts +2 -3
  68. package/dist/types/tools/segmentation/strategies/utils/getStrategyData.d.ts.map +1 -1
  69. package/dist/types/utilities/pointInShapeCallback.d.ts.map +1 -1
  70. package/dist/types/utilities/segmentation/floodFill.d.ts.map +1 -1
  71. package/dist/types/utilities/segmentation/getSegmentAtLabelmapBorder.d.ts.map +1 -1
  72. package/dist/types/utilities/segmentation/getSegmentAtWorldPoint.d.ts.map +1 -1
  73. package/dist/umd/985.index.js +1 -1
  74. package/dist/umd/985.index.js.map +1 -1
  75. package/dist/umd/index.js +1 -1
  76. package/dist/umd/index.js.map +1 -1
  77. package/package.json +7 -3
  78. package/src/eventListeners/segmentation/imageChangeEventListener.ts +28 -13
  79. package/src/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.ts +1 -1
  80. package/src/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.ts +3 -1
  81. package/src/tools/annotation/CobbAngleTool.ts +62 -56
  82. package/src/tools/segmentation/BrushTool.ts +1 -1
  83. package/src/tools/segmentation/strategies/BrushStrategy.ts +25 -4
  84. package/src/tools/segmentation/strategies/compositions/dynamicThreshold.ts +12 -2
  85. package/src/tools/segmentation/strategies/compositions/islandRemoval.ts +1 -2
  86. package/src/tools/segmentation/strategies/compositions/threshold.ts +8 -6
  87. package/src/tools/segmentation/strategies/utils/getStrategyData.ts +20 -5
  88. package/src/utilities/pointInShapeCallback.ts +2 -0
  89. package/src/utilities/segmentation/floodFill.ts +44 -31
  90. package/src/utilities/segmentation/getSegmentAtLabelmapBorder.ts +6 -5
  91. package/src/utilities/segmentation/getSegmentAtWorldPoint.ts +6 -5
@@ -3,21 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
+ const gl_matrix_1 = require("gl-matrix");
6
7
  const StrategyCallbacks_1 = __importDefault(require("../../../../enums/StrategyCallbacks"));
7
8
  exports.default = {
8
9
  [StrategyCallbacks_1.default.CreateIsInThreshold]: (operationData) => {
9
- const { imageVoxelManager: imageVoxelManager, strategySpecificConfiguration, segmentIndex, } = operationData;
10
+ const { imageVoxelManager, strategySpecificConfiguration, segmentIndex } = operationData;
10
11
  if (!strategySpecificConfiguration || !segmentIndex) {
11
12
  return;
12
13
  }
13
14
  return (index) => {
14
15
  const { THRESHOLD, THRESHOLD_INSIDE_CIRCLE } = strategySpecificConfiguration;
15
16
  const voxelValue = imageVoxelManager.getAtIndex(index);
17
+ const gray = Array.isArray(voxelValue)
18
+ ? gl_matrix_1.vec3.length(voxelValue)
19
+ : voxelValue;
16
20
  const { threshold } = THRESHOLD || THRESHOLD_INSIDE_CIRCLE || {};
17
21
  if (!(threshold === null || threshold === void 0 ? void 0 : threshold.length)) {
18
22
  return true;
19
23
  }
20
- return threshold[0] <= voxelValue && voxelValue <= threshold[1];
24
+ return threshold[0] <= gray && gray <= threshold[1];
21
25
  };
22
26
  },
23
27
  };
@@ -1 +1 @@
1
- {"version":3,"file":"threshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/threshold.ts"],"names":[],"mappings":";;;;;AACA,4FAAoE;AAOpE,kBAAe;IACb,CAAC,2BAAiB,CAAC,mBAAmB,CAAC,EAAE,CACvC,aAAuC,EACvC,EAAE;QACF,MAAM,EACJ,iBAAiB,EAAE,iBAAiB,EACpC,6BAA6B,EAC7B,YAAY,GACb,GAAG,aAAa,CAAC;QAClB,IAAI,CAAC,6BAA6B,IAAI,CAAC,YAAY,EAAE;YACnD,OAAO;SACR;QACD,OAAO,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,GAC1C,6BAA6B,CAAC;YAEhC,MAAM,UAAU,GAAG,iBAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAGvD,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,IAAI,uBAAuB,IAAI,EAAE,CAAC;YACjE,IAAI,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAA,EAAE;gBACtB,OAAO,IAAI,CAAC;aACb;YACD,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,UAAU,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;QAClE,CAAC,CAAC;IACJ,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"threshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/threshold.ts"],"names":[],"mappings":";;;;;AAAA,yCAAiC;AAGjC,4FAAoE;AAOpE,kBAAe;IACb,CAAC,2BAAiB,CAAC,mBAAmB,CAAC,EAAE,CACvC,aAAuC,EACvC,EAAE;QACF,MAAM,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,YAAY,EAAE,GACtE,aAAa,CAAC;QAChB,IAAI,CAAC,6BAA6B,IAAI,CAAC,YAAY,EAAE;YACnD,OAAO;SACR;QACD,OAAO,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,GAC1C,6BAA6B,CAAC;YAEhC,MAAM,UAAU,GAAG,iBAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACvD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;gBACpC,CAAC,CAAC,gBAAI,CAAC,MAAM,CAAC,UAA0B,CAAC;gBACzC,CAAC,CAAC,UAAU,CAAC;YAGf,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,IAAI,uBAAuB,IAAI,EAAE,CAAC;YACjE,IAAI,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAA,EAAE;gBACtB,OAAO,IAAI,CAAC;aACb;YACD,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC;IACJ,CAAC;CACF,CAAC"}
@@ -1,12 +1,11 @@
1
- import { utilities } from '@cornerstonejs/core';
2
1
  declare function getStrategyData({ operationData, viewport }: {
3
2
  operationData: any;
4
3
  viewport: any;
5
4
  }): {
6
5
  segmentationImageData: any;
7
6
  segmentationScalarData: any;
8
- segmentationVoxelManager: utilities.VoxelManager<number>;
7
+ segmentationVoxelManager: any;
9
8
  imageScalarData: any;
10
- imageVoxelManager: utilities.VoxelManager<number>;
9
+ imageVoxelManager: any;
11
10
  };
12
11
  export { getStrategyData };
@@ -5,15 +5,19 @@ const core_1 = require("@cornerstonejs/core");
5
5
  const stackVolumeCheck_1 = require("./stackVolumeCheck");
6
6
  const { VoxelManager } = core_1.utilities;
7
7
  function getStrategyData({ operationData, viewport }) {
8
+ var _a;
8
9
  let segmentationImageData, segmentationScalarData, imageScalarData;
9
10
  let imageDimensions;
10
11
  let segmentationDimensions;
12
+ let imageVoxelManager;
13
+ let segmentationVoxelManager;
11
14
  if ((0, stackVolumeCheck_1.isVolumeSegmentation)(operationData, viewport)) {
12
15
  const { volumeId, referencedVolumeId } = operationData;
13
16
  const segmentationVolume = core_1.cache.getVolume(volumeId);
14
17
  if (!segmentationVolume) {
15
18
  return;
16
19
  }
20
+ segmentationVoxelManager = segmentationVolume.voxelManager;
17
21
  if (referencedVolumeId) {
18
22
  const imageVolume = core_1.cache.getVolume(referencedVolumeId);
19
23
  imageScalarData = imageVolume.getScalarData();
@@ -33,22 +37,33 @@ function getStrategyData({ operationData, viewport }) {
33
37
  return;
34
38
  }
35
39
  const actor = viewport.getActor(segmentationRepresentationUID);
40
+ if (!actor) {
41
+ return;
42
+ }
36
43
  segmentationImageData = actor.actor.getMapper().getInputData();
44
+ segmentationVoxelManager = segmentationImageData.voxelManager;
37
45
  const currentSegmentationImageId = imageIdReferenceMap.get(currentImageId);
38
46
  const segmentationImage = core_1.cache.getImage(currentSegmentationImageId);
39
- segmentationScalarData = segmentationImage.getPixelData();
47
+ if (!segmentationImage) {
48
+ return;
49
+ }
50
+ segmentationScalarData = (_a = segmentationImage.getPixelData) === null || _a === void 0 ? void 0 : _a.call(segmentationImage);
40
51
  const image = core_1.cache.getImage(currentImageId);
41
- imageScalarData = image.getPixelData();
42
- imageDimensions = [image.columns, image.rows, 1];
52
+ const imageData = image ? null : viewport.getImageData();
53
+ imageScalarData = (image === null || image === void 0 ? void 0 : image.getPixelData()) || imageData.getScalarData();
54
+ imageDimensions = image
55
+ ? [image.columns, image.rows, 1]
56
+ : imageData.dimensions;
43
57
  segmentationDimensions = [
44
58
  segmentationImage.columns,
45
59
  segmentationImage.rows,
46
60
  1,
47
61
  ];
62
+ imageVoxelManager = image === null || image === void 0 ? void 0 : image.voxelManager;
48
63
  }
49
- const segmentationVoxelManager = VoxelManager.createVolumeVoxelManager(segmentationDimensions, segmentationScalarData);
50
- const imageVoxelManager = imageDimensions &&
51
- VoxelManager.createVolumeVoxelManager(imageDimensions, imageScalarData);
64
+ segmentationVoxelManager || (segmentationVoxelManager = VoxelManager.createVolumeVoxelManager(segmentationDimensions, segmentationScalarData));
65
+ imageVoxelManager || (imageVoxelManager = imageDimensions &&
66
+ VoxelManager.createVolumeVoxelManager(imageDimensions, imageScalarData));
52
67
  return {
53
68
  segmentationImageData,
54
69
  segmentationScalarData,
@@ -1 +1 @@
1
- {"version":3,"file":"getStrategyData.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/utils/getStrategyData.ts"],"names":[],"mappings":";;;AAAA,8CAAuD;AAEvD,yDAA0D;AAG1D,MAAM,EAAE,YAAY,EAAE,GAAG,gBAAS,CAAC;AAEnC,SAAS,eAAe,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE;IAClD,IAAI,qBAAqB,EAAE,sBAAsB,EAAE,eAAe,CAAC;IACnE,IAAI,eAA6B,CAAC;IAClC,IAAI,sBAAoC,CAAC;IACzC,IAAI,IAAA,uCAAoB,EAAC,aAAa,EAAE,QAAQ,CAAC,EAAE;QACjD,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC;QAEvD,MAAM,kBAAkB,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAErD,IAAI,CAAC,kBAAkB,EAAE;YACvB,OAAO;SACR;QAID,IAAI,kBAAkB,EAAE;YACtB,MAAM,WAAW,GAAG,YAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;YACxD,eAAe,GAAG,WAAW,CAAC,aAAa,EAAE,CAAC;YAC9C,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC;SAC1C;QAED,CAAC,EAAE,SAAS,EAAE,qBAAqB,EAAE,GAAG,kBAAkB,CAAC,CAAC;QAC5D,sBAAsB,GAAG,kBAAkB,CAAC,aAAa,EAAE,CAAC;QAC5D,sBAAsB,GAAG,kBAAkB,CAAC,UAAU,CAAC;KACxD;SAAM;QACL,MAAM,EAAE,mBAAmB,EAAE,6BAA6B,EAAE,GAC1D,aAA+C,CAAC;QAElD,IAAI,CAAC,mBAAmB,EAAE;YACxB,OAAO;SACR;QAED,MAAM,cAAc,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QACpD,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO;SACR;QAKD,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;QAC/D,qBAAqB,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,YAAY,EAAE,CAAC;QAC/D,MAAM,0BAA0B,GAAG,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE3E,MAAM,iBAAiB,GAAG,YAAK,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC;QACrE,sBAAsB,GAAG,iBAAiB,CAAC,YAAY,EAAE,CAAC;QAE1D,MAAM,KAAK,GAAG,YAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAK7C,eAAe,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;QACvC,eAAe,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACjD,sBAAsB,GAAG;YACvB,iBAAiB,CAAC,OAAO;YACzB,iBAAiB,CAAC,IAAI;YACtB,CAAC;SACF,CAAC;KACH;IAED,MAAM,wBAAwB,GAAG,YAAY,CAAC,wBAAwB,CACpE,sBAAsB,EACtB,sBAAsB,CACvB,CAAC;IAEF,MAAM,iBAAiB,GACrB,eAAe;QACf,YAAY,CAAC,wBAAwB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAE1E,OAAO;QACL,qBAAqB;QACrB,sBAAsB;QACtB,wBAAwB;QACxB,eAAe;QACf,iBAAiB;KAClB,CAAC;AACJ,CAAC;AAEQ,0CAAe"}
1
+ {"version":3,"file":"getStrategyData.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/utils/getStrategyData.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ const gl_matrix_1 = require("gl-matrix");
4
4
  function pointInShapeCallback(imageData, pointInShapeFn, callback, boundsIJK) {
5
5
  let iMin, iMax, jMin, jMax, kMin, kMax;
6
6
  let scalarData;
7
+ const { numComps } = imageData;
7
8
  if (imageData.getScalarData) {
8
9
  scalarData = imageData.getScalarData();
9
10
  }
@@ -36,7 +37,8 @@ function pointInShapeCallback(imageData, pointInShapeFn, callback, boundsIJK) {
36
37
  const rowStep = gl_matrix_1.vec3.fromValues(rowCosines[0] * rowSpacing, rowCosines[1] * rowSpacing, rowCosines[2] * rowSpacing);
37
38
  const columnStep = gl_matrix_1.vec3.fromValues(columnCosines[0] * columnSpacing, columnCosines[1] * columnSpacing, columnCosines[2] * columnSpacing);
38
39
  const scanAxisStep = gl_matrix_1.vec3.fromValues(scanAxisNormal[0] * scanAxisSpacing, scanAxisNormal[1] * scanAxisSpacing, scanAxisNormal[2] * scanAxisSpacing);
39
- const xMultiple = scalarData.length / dimensions[2] / dimensions[1] / dimensions[0];
40
+ const xMultiple = numComps ||
41
+ scalarData.length / dimensions[2] / dimensions[1] / dimensions[0];
40
42
  const yMultiple = dimensions[0] * xMultiple;
41
43
  const zMultiple = dimensions[1] * yMultiple;
42
44
  const pointsInShape = [];
@@ -1 +1 @@
1
- {"version":3,"file":"pointInShapeCallback.js","sourceRoot":"","sources":["../../../src/utilities/pointInShapeCallback.ts"],"names":[],"mappings":";;AAAA,yCAAiC;AAwCjC,SAAwB,oBAAoB,CAC1C,SAA4C,EAC5C,cAA+B,EAC/B,QAA+B,EAC/B,SAAqB;IAErB,IAAI,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;IAEvC,IAAI,UAAU,CAAC;IAGf,IAAK,SAAgC,CAAC,aAAa,EAAE;QACnD,UAAU,GAAI,SAAgC,CAAC,aAAa,EAAE,CAAC;KAChE;SAAM;QACL,UAAU,GAAI,SAA0B;aACrC,YAAY,EAAE;aACd,UAAU,EAAE;aACZ,OAAO,EAAE,CAAC;KACd;IAED,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,EAAE,CAAC;IAE7C,IAAI,CAAC,SAAS,EAAE;QACd,IAAI,GAAG,CAAC,CAAC;QACT,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,GAAG,CAAC,CAAC;QACT,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,GAAG,CAAC,CAAC;QACT,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;KACtB;SAAM;QACL,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;KACxD;IAED,MAAM,KAAK,GAAG,gBAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAEhD,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;IAC3C,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzC,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC;IACvC,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,eAAe,CAAC,GAAG,OAAO,CAAC;IAG7D,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAEpD,MAAM,OAAO,GAAG,gBAAI,CAAC,UAAU,CAC7B,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,EAC1B,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,EAC1B,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAC3B,CAAC;IAEF,MAAM,UAAU,GAAG,gBAAI,CAAC,UAAU,CAChC,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,EAChC,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,EAChC,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CACjC,CAAC;IAEF,MAAM,YAAY,GAAG,gBAAI,CAAC,UAAU,CAClC,cAAc,CAAC,CAAC,CAAC,GAAG,eAAe,EACnC,cAAc,CAAC,CAAC,CAAC,GAAG,eAAe,EACnC,cAAc,CAAC,CAAC,CAAC,GAAG,eAAe,CACpC,CAAC;IAEF,MAAM,SAAS,GACb,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAC5C,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAE5C,MAAM,aAAa,GAAwB,EAAE,CAAC;IAE9C,MAAM,UAAU,GAAG,gBAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAE7C,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,SAAS,GAAG,gBAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAEzC,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE;YACjC,MAAM,SAAS,GAAG,gBAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAEzC,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE;gBACjC,MAAM,QAAQ,GAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBAGzC,IAAI,cAAc,CAAC,UAA0B,EAAE,QAAQ,CAAC,EAAE;oBACxD,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,SAAS,CAAC;oBAC5D,IAAI,KAAK,CAAC;oBACV,IAAI,SAAS,GAAG,CAAC,EAAE;wBACjB,KAAK,GAAG;4BACN,UAAU,CAAC,KAAK,CAAC;4BACjB,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC;4BACrB,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC;yBACtB,CAAC;qBACH;yBAAM;wBACL,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;qBAC3B;oBAED,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;oBACrE,IAAI,QAAQ,EAAE;wBACZ,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;qBAC5D;iBACF;gBAGD,gBAAI,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;aAC3C;YAGD,gBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YACjC,gBAAI,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;SAC9C;QAGD,gBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACjC,gBAAI,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;KAChD;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AArHD,uCAqHC"}
1
+ {"version":3,"file":"pointInShapeCallback.js","sourceRoot":"","sources":["../../../src/utilities/pointInShapeCallback.ts"],"names":[],"mappings":"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"}
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  function floodFill(getter, seed, options = {}) {
4
4
  const onFlood = options.onFlood;
5
5
  const onBoundary = options.onBoundary;
6
- const equals = options.equals || defaultEquals;
6
+ const equals = options.equals;
7
7
  const diagonals = options.diagonals || false;
8
8
  const startNode = get(seed);
9
9
  const permutations = prunedPermutations();
10
10
  const stack = [];
11
11
  const flooded = [];
12
- const visits = {};
13
- const bounds = {};
12
+ const visits = new Set();
13
+ const bounds = new Map();
14
14
  stack.push({ currentArgs: seed });
15
15
  while (stack.length > 0) {
16
16
  flood(stack.pop());
@@ -35,14 +35,18 @@ function floodFill(getter, seed, options = {}) {
35
35
  }
36
36
  }
37
37
  function visited(key) {
38
- return visits[key] === true;
38
+ const [x, y, z = 0] = key;
39
+ const iKey = x + 32768 + 65536 * (y + 32768 + 65536 * (z + 32768));
40
+ return visits.has(iKey);
39
41
  }
40
42
  function markAsVisited(key) {
41
- visits[key] = true;
43
+ const [x, y, z = 0] = key;
44
+ const iKey = x + 32768 + 65536 * (y + 32768 + 65536 * (z + 32768));
45
+ visits.add(iKey);
42
46
  }
43
47
  function member(getArgs) {
44
- const node = safely(get, [getArgs]);
45
- return safely(equals, [node, startNode]);
48
+ const node = get(getArgs);
49
+ return equals ? equals(node, startNode) : node === startNode;
46
50
  }
47
51
  function markAsFlooded(getArgs) {
48
52
  flooded.push(getArgs);
@@ -51,7 +55,9 @@ function floodFill(getter, seed, options = {}) {
51
55
  }
52
56
  }
53
57
  function markAsBoundary(prevArgs) {
54
- bounds[prevArgs] = prevArgs;
58
+ const [x, y, z = 0] = prevArgs;
59
+ const iKey = x + 32768 + 65536 * (y + 32768 + 65536 * (z + 32768));
60
+ bounds.set(iKey, prevArgs);
55
61
  if (onBoundary) {
56
62
  onBoundary(...prevArgs);
57
63
  }
@@ -72,14 +78,6 @@ function floodFill(getter, seed, options = {}) {
72
78
  function get(getArgs) {
73
79
  return getter(...getArgs);
74
80
  }
75
- function safely(f, args) {
76
- try {
77
- return f(...args);
78
- }
79
- catch (error) {
80
- return;
81
- }
82
- }
83
81
  function prunedPermutations() {
84
82
  const permutations = permute(seed.length);
85
83
  return permutations.filter(function (perm) {
@@ -101,12 +99,8 @@ function floodFill(getter, seed, options = {}) {
101
99
  return perms;
102
100
  }
103
101
  function boundaries() {
104
- const array = [];
105
- for (const key in bounds) {
106
- if (bounds[key] !== undefined) {
107
- array.unshift(bounds[key]);
108
- }
109
- }
102
+ const array = Array.from(bounds.values());
103
+ array.reverse();
110
104
  return array;
111
105
  }
112
106
  }
@@ -1 +1 @@
1
- {"version":3,"file":"floodFill.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/floodFill.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"floodFill.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/floodFill.ts"],"names":[],"mappings":"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"}
@@ -32,8 +32,9 @@ function getSegmentAtLabelmapBorder(segmentationId, worldPoint, { viewport, sear
32
32
  const imageData = segmentationActor === null || segmentationActor === void 0 ? void 0 : segmentationActor.actor.getMapper().getInputData();
33
33
  const indexIJK = core_1.utilities.transformWorldToIndex(imageData, worldPoint);
34
34
  const dimensions = imageData.getDimensions();
35
- const voxelManager = core_1.utilities.VoxelManager.createVolumeVoxelManager(dimensions, imageData.getPointData().getScalars().getData());
36
- const segmentIndex = voxelManager.getAtIJK(...indexIJK);
35
+ const voxelManager = (imageData.voxelManager ||
36
+ core_1.utilities.VoxelManager.createVolumeVoxelManager(dimensions, imageData.getPointData().getScalars().getData()));
37
+ const segmentIndex = voxelManager.getAtIJKPoint(indexIJK);
37
38
  const onEdge = isSegmentOnEdgeIJK(indexIJK, dimensions, voxelManager, segmentIndex);
38
39
  return onEdge ? segmentIndex : undefined;
39
40
  }
@@ -1 +1 @@
1
- {"version":3,"file":"getSegmentAtLabelmapBorder.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/getSegmentAtLabelmapBorder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getSegmentAtLabelmapBorder.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/getSegmentAtLabelmapBorder.ts"],"names":[],"mappings":"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"}
@@ -49,8 +49,9 @@ function getSegmentAtWorldForLabelmap(segmentation, worldPoint, { viewport }) {
49
49
  const imageData = segmentationActor === null || segmentationActor === void 0 ? void 0 : segmentationActor.actor.getMapper().getInputData();
50
50
  const indexIJK = core_1.utilities.transformWorldToIndex(imageData, worldPoint);
51
51
  const dimensions = imageData.getDimensions();
52
- const voxelManager = core_1.utilities.VoxelManager.createVolumeVoxelManager(dimensions, imageData.getPointData().getScalars().getData());
53
- const segmentIndex = voxelManager.getAtIJK(...indexIJK);
52
+ const voxelManager = (imageData.voxelManager ||
53
+ core_1.utilities.VoxelManager.createVolumeVoxelManager(dimensions, imageData.getPointData().getScalars().getData()));
54
+ const segmentIndex = voxelManager.getAtIJKPoint(indexIJK);
54
55
  return segmentIndex;
55
56
  }
56
57
  exports.getSegmentAtWorldForLabelmap = getSegmentAtWorldForLabelmap;
@@ -1 +1 @@
1
- {"version":3,"file":"getSegmentAtWorldPoint.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/getSegmentAtWorldPoint.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getSegmentAtWorldPoint.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/getSegmentAtWorldPoint.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import vtkDataArray from '@kitware/vtk.js/Common/Core/DataArray';
2
2
  import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
3
- import { StackViewport, getEnabledElement, Enums, getEnabledElementByIds, cache, utilities, } from '@cornerstonejs/core';
3
+ import { BaseVolumeViewport, getEnabledElement, Enums, getEnabledElementByIds, cache, utilities, } from '@cornerstonejs/core';
4
4
  import { getToolGroupForViewport } from '../../store/ToolGroupManager';
5
5
  import Representations from '../../enums/SegmentationRepresentations';
6
6
  import * as SegmentationState from '../../stateManagement/segmentation/segmentationState';
@@ -8,17 +8,13 @@ import { isVolumeSegmentation } from '../../tools/segmentation/strategies/utils/
8
8
  import triggerSegmentationRender from '../../utilities/segmentation/triggerSegmentationRender';
9
9
  const enable = function (element) {
10
10
  const { viewport } = getEnabledElement(element);
11
- if (!(viewport instanceof StackViewport)) {
11
+ if (viewport instanceof BaseVolumeViewport) {
12
12
  return;
13
13
  }
14
14
  element.addEventListener(Enums.Events.STACK_NEW_IMAGE, _imageChangeEventListener);
15
15
  element.addEventListener(Enums.Events.IMAGE_RENDERED, _imageChangeEventListener);
16
16
  };
17
17
  const disable = function (element) {
18
- const { viewport } = getEnabledElement(element);
19
- if (!(viewport instanceof StackViewport)) {
20
- return;
21
- }
22
18
  element.removeEventListener(Enums.Events.STACK_NEW_IMAGE, _imageChangeEventListener);
23
19
  element.removeEventListener(Enums.Events.IMAGE_RENDERED, _imageChangeEventListener);
24
20
  };
@@ -74,6 +70,10 @@ function _imageChangeEventListener(evt) {
74
70
  const derivedImageId = imageIdReferenceMap.get(currentImageId);
75
71
  const segmentationImageData = segmentationActor.getMapper().getInputData();
76
72
  if (!derivedImageId) {
73
+ if (segmentationImageData.setDerivedImage) {
74
+ segmentationImageData.setDerivedImage(null);
75
+ return;
76
+ }
77
77
  const scalarArray = vtkDataArray.newInstance({
78
78
  name: 'Pixels',
79
79
  numberOfComponents: 1,
@@ -86,7 +86,10 @@ function _imageChangeEventListener(evt) {
86
86
  }
87
87
  const derivedImage = cache.getImage(derivedImageId);
88
88
  const { dimensions, spacing, direction } = viewport.getImageDataMetadata(derivedImage);
89
- const currentImage = cache.getImage(currentImageId);
89
+ const currentImage = cache.getImage(currentImageId) ||
90
+ {
91
+ imageId: currentImageId,
92
+ };
90
93
  const { origin: currentOrigin } = viewport.getImageDataMetadata(currentImage);
91
94
  const originToUse = currentOrigin;
92
95
  segmentationImageData.setOrigin(originToUse);
@@ -117,7 +120,12 @@ function _imageChangeEventListener(evt) {
117
120
  triggerSegmentationRender(toolGroup.id);
118
121
  return;
119
122
  }
120
- utilities.updateVTKImageDataWithCornerstoneImage(segmentationImageData, derivedImage);
123
+ if (segmentationImageData.setDerivedImage) {
124
+ segmentationImageData.setDerivedImage(derivedImage);
125
+ }
126
+ else {
127
+ utilities.updateVTKImageDataWithCornerstoneImage(segmentationImageData, derivedImage);
128
+ }
121
129
  viewport.render();
122
130
  if (evt.type === Enums.Events.IMAGE_RENDERED) {
123
131
  viewport.element.removeEventListener(Enums.Events.IMAGE_RENDERED, _imageChangeEventListener);
@@ -1 +1 @@
1
- {"version":3,"file":"imageChangeEventListener.js","sourceRoot":"","sources":["../../../../src/eventListeners/segmentation/imageChangeEventListener.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"imageChangeEventListener.js","sourceRoot":"","sources":["../../../../src/eventListeners/segmentation/imageChangeEventListener.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,6 @@ import { SegmentationRepresentations } from '../../../../enums';
2
2
  import { computeAndAddRepresentation } from '../computeAndAddRepresentation';
3
3
  import { computeLabelmapData } from './labelmapComputationStrategies';
4
4
  export function computeAndAddLabelmapRepresentation(segmentationId, options = {}) {
5
- return computeAndAddRepresentation(segmentationId, SegmentationRepresentations.Labelmap, () => computeLabelmapData(segmentationId, options), () => { });
5
+ return computeAndAddRepresentation(segmentationId, SegmentationRepresentations.Labelmap, () => computeLabelmapData(segmentationId, options), () => undefined);
6
6
  }
7
7
  //# sourceMappingURL=computeAndAddLabelmapRepresentation.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"computeAndAddLabelmapRepresentation.js","sourceRoot":"","sources":["../../../../../../src/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAYtE,MAAM,UAAU,mCAAmC,CACjD,cAAsB,EACtB,UAAoC,EAAE;IAEtC,OAAO,2BAA2B,CAChC,cAAc,EACd,2BAA2B,CAAC,QAAQ,EACpC,GAAG,EAAE,CAAC,mBAAmB,CAAC,cAAc,EAAE,OAAO,CAAC,EAClD,GAAG,EAAE,GAAE,CAAC,CACT,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"computeAndAddLabelmapRepresentation.js","sourceRoot":"","sources":["../../../../../../src/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAYtE,MAAM,UAAU,mCAAmC,CACjD,cAAsB,EACtB,UAAoC,EAAE;IAEtC,OAAO,2BAA2B,CAChC,cAAc,EACd,2BAA2B,CAAC,QAAQ,EACpC,GAAG,EAAE,CAAC,mBAAmB,CAAC,cAAc,EAAE,OAAO,CAAC,EAClD,GAAG,EAAE,CAAC,SAAS,CAChB,CAAC;AACJ,CAAC"}
@@ -49,5 +49,6 @@ export async function convertSurfaceToVolumeLabelmap(surfaceRepresentationData,
49
49
  volumeId: segmentationVolume.volumeId,
50
50
  };
51
51
  }
52
- export async function convertSurfaceToStackLabelmap() { }
52
+ export async function convertSurfaceToStackLabelmap() {
53
+ }
53
54
  //# sourceMappingURL=convertSurfaceToLabelmap.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"convertSurfaceToLabelmap.js","sourceRoot":"","sources":["../../../../../../src/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,KAAK,EACL,WAAW,EACX,mBAAmB,EACnB,YAAY,GACb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAC;AAE5C,MAAM,qBAAqB,GAAG,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE;IACtD,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,mBAAmB,EAAE;QAC1D,QAAQ;QACR,IAAI,EAAE,WAAW,CAAC,2BAA2B;KAC9C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,yBAAkD,EAClD,kBAAsC;IAEtC,MAAM,EAAE,WAAW,EAAE,GAAG,yBAAyB,CAAC;IAClD,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,MAAM,YAAY,GAAG,IAAI,GAAG,EAM3B,CAAC;IAEF,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE;QAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAsB,CAAC;QACrD,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QAEtC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE;YAC7B,MAAM;YACN,KAAK;SACN,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC;IAEtE,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAEtC,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,WAAW,CACnD,SAAS,EACT,iCAAiC,EACjC;QACE,YAAY;QACZ,UAAU;QACV,OAAO;QACP,SAAS;QACT,MAAM;KACP,EACD;QACE,SAAS,EAAE;YACT,CAAC,QAAQ,EAAE,EAAE;gBACX,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;SACF;KACF,CACF,CAAC;IAEF,qBAAqB,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAExC,kBAAkB,CAAC,SAAS;SACzB,YAAY,EAAE;SACd,UAAU,EAAE;SACZ,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1B,kBAAkB,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;IAGxC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;IAE9B,OAAO;QACL,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;KACtC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,KAAI,CAAC"}
1
+ {"version":3,"file":"convertSurfaceToLabelmap.js","sourceRoot":"","sources":["../../../../../../src/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,KAAK,EACL,WAAW,EACX,mBAAmB,EACnB,YAAY,GACb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAC;AAE5C,MAAM,qBAAqB,GAAG,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE;IACtD,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,mBAAmB,EAAE;QAC1D,QAAQ;QACR,IAAI,EAAE,WAAW,CAAC,2BAA2B;KAC9C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,yBAAkD,EAClD,kBAAsC;IAEtC,MAAM,EAAE,WAAW,EAAE,GAAG,yBAAyB,CAAC;IAClD,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,MAAM,YAAY,GAAG,IAAI,GAAG,EAM3B,CAAC;IAEF,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE;QAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAsB,CAAC;QACrD,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QAEtC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE;YAC7B,MAAM;YACN,KAAK;SACN,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC;IAEtE,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAEtC,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,WAAW,CACnD,SAAS,EACT,iCAAiC,EACjC;QACE,YAAY;QACZ,UAAU;QACV,OAAO;QACP,SAAS;QACT,MAAM;KACP,EACD;QACE,SAAS,EAAE;YACT,CAAC,QAAQ,EAAE,EAAE;gBACX,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;SACF;KACF,CACF,CAAC;IAEF,qBAAqB,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAExC,kBAAkB,CAAC,SAAS;SACzB,YAAY,EAAE;SACd,UAAU,EAAE;SACZ,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1B,kBAAkB,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;IAGxC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;IAE9B,OAAO;QACL,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;KACtC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B;AAEnD,CAAC"}
@@ -22,6 +22,7 @@ class CobbAngleTool extends AnnotationTool {
22
22
  shadow: true,
23
23
  preventHandleOutsideImage: false,
24
24
  getTextLines: defaultGetTextLines,
25
+ showArcLines: false,
25
26
  },
26
27
  }) {
27
28
  super(toolProps, defaultToolProps);
@@ -390,16 +391,18 @@ class CobbAngleTool extends AnnotationTool {
390
391
  });
391
392
  const { arc1Start, arc1End, arc2End, arc2Start } = data.cachedStats[targetId].points.canvas;
392
393
  const { arc1Angle, arc2Angle } = data.cachedStats[targetId];
393
- lineUID = 'arc1';
394
- drawLineSvg(svgDrawingHelper, annotationUID, lineUID, arc1Start, arc1End, {
395
- color,
396
- lineWidth: '1',
397
- });
398
- lineUID = 'arc2';
399
- drawLineSvg(svgDrawingHelper, annotationUID, lineUID, arc2Start, arc2End, {
400
- color,
401
- lineWidth: '1',
402
- });
394
+ if (this.configuration.showArcLines) {
395
+ lineUID = 'arc1';
396
+ drawLineSvg(svgDrawingHelper, annotationUID, lineUID, arc1Start, arc1End, {
397
+ color,
398
+ lineWidth: '1',
399
+ });
400
+ lineUID = 'arc2';
401
+ drawLineSvg(svgDrawingHelper, annotationUID, lineUID, arc2Start, arc2End, {
402
+ color,
403
+ lineWidth: '1',
404
+ });
405
+ }
403
406
  if (!data.cachedStats[targetId]?.angle) {
404
407
  continue;
405
408
  }
@@ -433,24 +436,26 @@ class CobbAngleTool extends AnnotationTool {
433
436
  bottomLeft: viewport.canvasToWorld([left, top + height]),
434
437
  bottomRight: viewport.canvasToWorld([left + width, top + height]),
435
438
  };
436
- const arc1TextBoxUID = 'arcAngle1';
437
- const arc1TextLine = [
438
- `${arc1Angle.toFixed(2)} ${String.fromCharCode(176)}`,
439
- ];
440
- const arch1TextPosCanvas = midPoint2(arc1Start, arc1End);
441
- drawTextBoxSvg(svgDrawingHelper, annotationUID, arc1TextBoxUID, arc1TextLine, arch1TextPosCanvas, {
442
- ...options,
443
- padding: 3,
444
- });
445
- const arc2TextBoxUID = 'arcAngle2';
446
- const arc2TextLine = [
447
- `${arc2Angle.toFixed(2)} ${String.fromCharCode(176)}`,
448
- ];
449
- const arch2TextPosCanvas = midPoint2(arc2Start, arc2End);
450
- drawTextBoxSvg(svgDrawingHelper, annotationUID, arc2TextBoxUID, arc2TextLine, arch2TextPosCanvas, {
451
- ...options,
452
- padding: 3,
453
- });
439
+ if (this.configuration.showArcLines) {
440
+ const arc1TextBoxUID = 'arcAngle1';
441
+ const arc1TextLine = [
442
+ `${arc1Angle.toFixed(2)} ${String.fromCharCode(176)}`,
443
+ ];
444
+ const arch1TextPosCanvas = midPoint2(arc1Start, arc1End);
445
+ drawTextBoxSvg(svgDrawingHelper, annotationUID, arc1TextBoxUID, arc1TextLine, arch1TextPosCanvas, {
446
+ ...options,
447
+ padding: 3,
448
+ });
449
+ const arc2TextBoxUID = 'arcAngle2';
450
+ const arc2TextLine = [
451
+ `${arc2Angle.toFixed(2)} ${String.fromCharCode(176)}`,
452
+ ];
453
+ const arch2TextPosCanvas = midPoint2(arc2Start, arc2End);
454
+ drawTextBoxSvg(svgDrawingHelper, annotationUID, arc2TextBoxUID, arc2TextLine, arch2TextPosCanvas, {
455
+ ...options,
456
+ padding: 3,
457
+ });
458
+ }
454
459
  }
455
460
  return renderStatus;
456
461
  };