@cornerstonejs/tools 0.53.1 → 0.54.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.
- package/dist/cjs/drawingSvg/drawLine.js +3 -1
- package/dist/cjs/drawingSvg/drawLine.js.map +1 -1
- package/dist/cjs/drawingSvg/drawTextBox.js +3 -3
- package/dist/cjs/drawingSvg/drawTextBox.js.map +1 -1
- package/dist/cjs/store/addEnabledElement.js +5 -4
- package/dist/cjs/store/addEnabledElement.js.map +1 -1
- package/dist/cjs/utilities/segmentation/index.d.ts +2 -1
- package/dist/cjs/utilities/segmentation/index.js +3 -1
- package/dist/cjs/utilities/segmentation/index.js.map +1 -1
- package/dist/cjs/utilities/segmentation/rectangleROIThresholdVolumeByRange.d.ts +1 -5
- package/dist/cjs/utilities/segmentation/rectangleROIThresholdVolumeByRange.js.map +1 -1
- package/dist/cjs/utilities/segmentation/thresholdSegmentationByRange.d.ts +4 -0
- package/dist/cjs/utilities/segmentation/thresholdSegmentationByRange.js +54 -0
- package/dist/cjs/utilities/segmentation/thresholdSegmentationByRange.js.map +1 -0
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.d.ts +1 -5
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js +4 -49
- package/dist/cjs/utilities/segmentation/thresholdVolumeByRange.js.map +1 -1
- package/dist/cjs/utilities/segmentation/utilities.d.ts +11 -0
- package/dist/cjs/utilities/segmentation/utilities.js +55 -0
- package/dist/cjs/utilities/segmentation/utilities.js.map +1 -1
- package/dist/esm/drawingSvg/drawLine.js +3 -1
- package/dist/esm/drawingSvg/drawLine.js.map +1 -1
- package/dist/esm/drawingSvg/drawTextBox.js +3 -3
- package/dist/esm/drawingSvg/drawTextBox.js.map +1 -1
- package/dist/esm/store/addEnabledElement.js +5 -4
- package/dist/esm/store/addEnabledElement.js.map +1 -1
- package/dist/esm/utilities/segmentation/index.d.ts +2 -1
- package/dist/esm/utilities/segmentation/index.js +2 -1
- package/dist/esm/utilities/segmentation/index.js.map +1 -1
- package/dist/esm/utilities/segmentation/rectangleROIThresholdVolumeByRange.d.ts +1 -5
- package/dist/esm/utilities/segmentation/rectangleROIThresholdVolumeByRange.js.map +1 -1
- package/dist/esm/utilities/segmentation/thresholdSegmentationByRange.d.ts +4 -0
- package/dist/esm/utilities/segmentation/thresholdSegmentationByRange.js +52 -0
- package/dist/esm/utilities/segmentation/thresholdSegmentationByRange.js.map +1 -0
- package/dist/esm/utilities/segmentation/thresholdVolumeByRange.d.ts +1 -5
- package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js +3 -45
- package/dist/esm/utilities/segmentation/thresholdVolumeByRange.js.map +1 -1
- package/dist/esm/utilities/segmentation/utilities.d.ts +11 -0
- package/dist/esm/utilities/segmentation/utilities.js +52 -0
- package/dist/esm/utilities/segmentation/utilities.js.map +1 -1
- package/dist/umd/index.js +1 -2
- package/dist/umd/index.js.map +1 -1
- package/package.json +2 -2
- package/dist/umd/index.js.LICENSE.txt +0 -6
|
@@ -8,5 +8,6 @@ import { triggerSegmentationRender } from './triggerSegmentationRender';
|
|
|
8
8
|
import floodFill from './floodFill';
|
|
9
9
|
import { getBrushSizeForToolGroup, setBrushSizeForToolGroup, } from './brushSizeForToolGroup';
|
|
10
10
|
import { getBrushThresholdForToolGroup, setBrushThresholdForToolGroup, } from './brushThresholdForToolGroup';
|
|
11
|
-
|
|
11
|
+
import thresholdSegmentationByRange from './thresholdSegmentationByRange';
|
|
12
|
+
export { thresholdVolumeByRange, createMergedLabelmapForIndex, isValidRepresentationConfig, getDefaultRepresentationConfig, createLabelmapVolumeForViewport, rectangleROIThresholdVolumeByRange, triggerSegmentationRender, floodFill, getBrushSizeForToolGroup, setBrushSizeForToolGroup, getBrushThresholdForToolGroup, setBrushThresholdForToolGroup, thresholdSegmentationByRange, };
|
|
12
13
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/index.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,kCAAkC,MAAM,sCAAsC,CAAC;AACtF,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAC1E,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AACxE,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAC9E,OAAO,+BAA+B,MAAM,mCAAmC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,EACL,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,GAC9B,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/index.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,kCAAkC,MAAM,sCAAsC,CAAC;AACtF,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAC1E,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AACxE,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAC9E,OAAO,+BAA+B,MAAM,mCAAmC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,EACL,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,GAC9B,MAAM,8BAA8B,CAAC;AACtC,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EACL,sBAAsB,EACtB,4BAA4B,EAC5B,2BAA2B,EAC3B,8BAA8B,EAC9B,+BAA+B,EAC/B,kCAAkC,EAClC,yBAAyB,EACzB,SAAS,EACT,wBAAwB,EACxB,wBAAwB,EACxB,6BAA6B,EAC7B,6BAA6B,EAC7B,4BAA4B,GAC7B,CAAC"}
|
|
@@ -1,9 +1,5 @@
|
|
|
1
1
|
import type { Types } from '@cornerstonejs/core';
|
|
2
|
-
|
|
3
|
-
volume: Types.IImageVolume;
|
|
4
|
-
lower: number;
|
|
5
|
-
upper: number;
|
|
6
|
-
};
|
|
2
|
+
import { ThresholdInformation } from './utilities';
|
|
7
3
|
export declare type ThresholdOptions = {
|
|
8
4
|
numSlicesToProject?: number;
|
|
9
5
|
overwrite: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rectangleROIThresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/rectangleROIThresholdVolumeByRange.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EACL,iCAAiC,EACjC,yBAAyB,GAC1B,MAAM,aAAa,CAAC;AAErB,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,oCAAoC,MAAM,0DAA0D,CAAC;
|
|
1
|
+
{"version":3,"file":"rectangleROIThresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/rectangleROIThresholdVolumeByRange.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EACL,iCAAiC,EACjC,yBAAyB,GAC1B,MAAM,aAAa,CAAC;AAErB,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,oCAAoC,MAAM,0DAA0D,CAAC;AA+B5G,SAAS,kCAAkC,CACzC,cAAwB,EACxB,kBAAsC,EACtC,0BAAkD,EAClD,OAAyB;IAEzB,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;QACvD,OAAO,KAAK,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,oCAAoC,CAC9C,WAAW,EACX,0BAA0B,CAAC,CAAC,CAAC,CAAC,MAAM,EACpC,OAAO,CACR,CAAC;SACH;KACF;IAED,MAAM,wBAAwB,GAAG,sBAAsB,CACrD,kBAAkB,EAClB,0BAA0B,EAC1B,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAC1B,CAAC;IAEF,OAAO,wBAAwB,CAAC;AAClC,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAW;IACvC,MAAM,cAAc,GAAG;QACrB,yBAAyB,CAAC,QAAQ;QAClC,iCAAiC,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,eAAe,kCAAkC,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { Types } from '@cornerstonejs/core';
|
|
2
|
+
import { ThresholdInformation } from './utilities';
|
|
3
|
+
declare function thresholdSegmentationByRange(segmentationVolume: Types.IImageVolume, segmentationIndex: number, thresholdVolumeInformation: ThresholdInformation[], overlapType: number): Types.IImageVolume;
|
|
4
|
+
export default thresholdSegmentationByRange;
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { pointInShapeCallback } from '../../utilities';
|
|
2
|
+
import { triggerSegmentationDataModified } from '../../stateManagement/segmentation/triggerSegmentationEvents';
|
|
3
|
+
import { getVoxelOverlap, processVolumes, } from './utilities';
|
|
4
|
+
function thresholdSegmentationByRange(segmentationVolume, segmentationIndex, thresholdVolumeInformation, overlapType) {
|
|
5
|
+
const scalarData = segmentationVolume.getScalarData();
|
|
6
|
+
const { baseVolumeIdx, volumeInfoList } = processVolumes(segmentationVolume, thresholdVolumeInformation);
|
|
7
|
+
volumeInfoList.forEach((volumeInfo) => {
|
|
8
|
+
const { volumeSize } = volumeInfo;
|
|
9
|
+
if (volumeSize === scalarData.length) {
|
|
10
|
+
_handleSameSizeVolume(scalarData, segmentationIndex, volumeInfo);
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
13
|
+
_handleDifferentSizeVolume(scalarData, segmentationIndex, volumeInfo, volumeInfoList, baseVolumeIdx, overlapType);
|
|
14
|
+
}
|
|
15
|
+
});
|
|
16
|
+
triggerSegmentationDataModified(segmentationVolume.volumeId);
|
|
17
|
+
return segmentationVolume;
|
|
18
|
+
}
|
|
19
|
+
function _handleDifferentSizeVolume(scalarData, segmentationIndex, volumeInfo, volumeInfoList, baseVolumeIdx, overlapType) {
|
|
20
|
+
const { imageData, lower, upper, dimensions } = volumeInfo;
|
|
21
|
+
let total, overlaps, range;
|
|
22
|
+
for (let i = 0; i < scalarData.length; i++) {
|
|
23
|
+
if (scalarData[i] === segmentationIndex) {
|
|
24
|
+
const overlapBounds = getVoxelOverlap(imageData, dimensions, volumeInfoList[baseVolumeIdx].spacing, volumeInfoList[baseVolumeIdx].imageData.getPoint(i));
|
|
25
|
+
const callbackOverlap = ({ value }) => {
|
|
26
|
+
total = total + 1;
|
|
27
|
+
if (value >= range.lower && value <= range.upper) {
|
|
28
|
+
overlaps = overlaps + 1;
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
total = 0;
|
|
32
|
+
overlaps = 0;
|
|
33
|
+
range = { lower, upper };
|
|
34
|
+
let overlapTest = false;
|
|
35
|
+
pointInShapeCallback(imageData, () => true, callbackOverlap, overlapBounds);
|
|
36
|
+
overlapTest = overlapType === 0 ? overlaps > 0 : overlaps === total;
|
|
37
|
+
scalarData[i] = overlapTest ? segmentationIndex : 0;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return { total, range, overlaps };
|
|
41
|
+
}
|
|
42
|
+
function _handleSameSizeVolume(scalarData, segmentationIndex, volumeInfo) {
|
|
43
|
+
const { referenceValues, lower, upper } = volumeInfo;
|
|
44
|
+
for (let i = 0; i < scalarData.length; i++) {
|
|
45
|
+
if (scalarData[i] === segmentationIndex) {
|
|
46
|
+
const value = referenceValues[i];
|
|
47
|
+
scalarData[i] = value >= lower && value <= upper ? segmentationIndex : 0;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
export default thresholdSegmentationByRange;
|
|
52
|
+
//# sourceMappingURL=thresholdSegmentationByRange.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"thresholdSegmentationByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/thresholdSegmentationByRange.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,10 @@
|
|
|
1
1
|
import { Types } from '@cornerstonejs/core';
|
|
2
2
|
import { BoundsIJK } from '../../types';
|
|
3
|
+
import { ThresholdInformation } from './utilities';
|
|
3
4
|
export declare type ThresholdRangeOptions = {
|
|
4
5
|
overwrite: boolean;
|
|
5
6
|
boundsIJK: BoundsIJK;
|
|
6
7
|
overlapType?: number;
|
|
7
8
|
};
|
|
8
|
-
export declare type ThresholdInformation = {
|
|
9
|
-
volume: Types.IImageVolume;
|
|
10
|
-
lower: number;
|
|
11
|
-
upper: number;
|
|
12
|
-
};
|
|
13
9
|
declare function thresholdVolumeByRange(segmentationVolume: Types.IImageVolume, thresholdVolumeInformation: ThresholdInformation[], options: ThresholdRangeOptions): Types.IImageVolume;
|
|
14
10
|
export default thresholdVolumeByRange;
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
import { utilities as csUtils } from '@cornerstonejs/core';
|
|
2
1
|
import { pointInShapeCallback } from '../../utilities';
|
|
3
2
|
import { triggerSegmentationDataModified } from '../../stateManagement/segmentation/triggerSegmentationEvents';
|
|
4
|
-
import
|
|
5
|
-
const equalsCheck = (a, b) => {
|
|
6
|
-
return JSON.stringify(a) === JSON.stringify(b);
|
|
7
|
-
};
|
|
3
|
+
import { getVoxelOverlap, processVolumes, } from './utilities';
|
|
8
4
|
function thresholdVolumeByRange(segmentationVolume, thresholdVolumeInformation, options) {
|
|
9
|
-
const {
|
|
5
|
+
const { imageData: segmentationImageData } = segmentationVolume;
|
|
10
6
|
const scalarData = segmentationVolume.getScalarData();
|
|
11
7
|
const { overwrite, boundsIJK } = options;
|
|
12
8
|
const overlapType = options?.overlapType || 0;
|
|
@@ -15,28 +11,7 @@ function thresholdVolumeByRange(segmentationVolume, thresholdVolumeInformation,
|
|
|
15
11
|
scalarData[i] = 0;
|
|
16
12
|
}
|
|
17
13
|
}
|
|
18
|
-
const volumeInfoList =
|
|
19
|
-
let baseVolumeIdx = 0;
|
|
20
|
-
for (let i = 0; i < thresholdVolumeInformation.length; i++) {
|
|
21
|
-
const { imageData, spacing, dimensions } = thresholdVolumeInformation[i].volume;
|
|
22
|
-
const volumeSize = thresholdVolumeInformation[i].volume.getScalarData().length;
|
|
23
|
-
if (volumeSize === scalarData.length &&
|
|
24
|
-
equalsCheck(spacing, segmentationSpacing)) {
|
|
25
|
-
baseVolumeIdx = i;
|
|
26
|
-
}
|
|
27
|
-
const referenceValues = imageData.getPointData().getScalars().getData();
|
|
28
|
-
const lower = thresholdVolumeInformation[i].lower;
|
|
29
|
-
const upper = thresholdVolumeInformation[i].upper;
|
|
30
|
-
volumeInfoList.push({
|
|
31
|
-
imageData,
|
|
32
|
-
referenceValues,
|
|
33
|
-
lower,
|
|
34
|
-
upper,
|
|
35
|
-
spacing,
|
|
36
|
-
dimensions,
|
|
37
|
-
volumeSize,
|
|
38
|
-
});
|
|
39
|
-
}
|
|
14
|
+
const { baseVolumeIdx, volumeInfoList } = processVolumes(segmentationVolume, thresholdVolumeInformation);
|
|
40
15
|
let overlaps, total, range;
|
|
41
16
|
const testOverlapRange = (volumeInfo, voxelSpacing, voxelCenter) => {
|
|
42
17
|
const callbackOverlap = ({ value }) => {
|
|
@@ -71,23 +46,6 @@ function thresholdVolumeByRange(segmentationVolume, thresholdVolumeInformation,
|
|
|
71
46
|
return true;
|
|
72
47
|
}
|
|
73
48
|
};
|
|
74
|
-
const getVoxelOverlap = (imageData, dimensions, voxelSpacing, voxelCenter) => {
|
|
75
|
-
const voxelCornersWorld = [];
|
|
76
|
-
for (let i = 0; i < 2; i++) {
|
|
77
|
-
for (let j = 0; j < 2; j++) {
|
|
78
|
-
for (let k = 0; k < 2; k++) {
|
|
79
|
-
const point = voxelCenter;
|
|
80
|
-
point[0] = point[0] + ((i * 2 - 1) * voxelSpacing[0]) / 2;
|
|
81
|
-
point[1] = point[1] + ((j * 2 - 1) * voxelSpacing[1]) / 2;
|
|
82
|
-
point[2] = point[2] + ((k * 2 - 1) * voxelSpacing[2]) / 2;
|
|
83
|
-
voxelCornersWorld.push(point);
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
const voxelCornersIJK = voxelCornersWorld.map((world) => csUtils.transformWorldToIndex(imageData, world));
|
|
88
|
-
const overlapBounds = getBoundingBoxAroundShape(voxelCornersIJK, dimensions);
|
|
89
|
-
return overlapBounds;
|
|
90
|
-
};
|
|
91
49
|
const callback = ({ index, pointIJK, pointLPS }) => {
|
|
92
50
|
let insert = volumeInfoList.length > 0;
|
|
93
51
|
for (let i = 0; i < volumeInfoList.length; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/thresholdVolumeByRange.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"thresholdVolumeByRange.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/thresholdVolumeByRange.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,13 @@
|
|
|
1
|
+
import { Types } from '@cornerstonejs/core';
|
|
1
2
|
import BrushTool from '../../tools/segmentation/BrushTool';
|
|
3
|
+
export declare type ThresholdInformation = {
|
|
4
|
+
volume: Types.IImageVolume;
|
|
5
|
+
lower: number;
|
|
6
|
+
upper: number;
|
|
7
|
+
};
|
|
2
8
|
export default function getBrushToolInstances(toolGroupId: any): BrushTool[];
|
|
9
|
+
export declare function getVoxelOverlap(imageData: any, dimensions: any, voxelSpacing: any, voxelCenter: any): [Types.Point2, Types.Point2, Types.Point2];
|
|
10
|
+
export declare function processVolumes(segmentationVolume: Types.IImageVolume, thresholdVolumeInformation: ThresholdInformation[]): {
|
|
11
|
+
volumeInfoList: any[];
|
|
12
|
+
baseVolumeIdx: number;
|
|
13
|
+
};
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { utilities as csUtils } from '@cornerstonejs/core';
|
|
1
2
|
import { getToolGroup } from '../../store/ToolGroupManager';
|
|
2
3
|
import BrushTool from '../../tools/segmentation/BrushTool';
|
|
4
|
+
import getBoundingBoxAroundShape from '../boundingBox/getBoundingBoxAroundShape';
|
|
3
5
|
export default function getBrushToolInstances(toolGroupId) {
|
|
4
6
|
const toolGroup = getToolGroup(toolGroupId);
|
|
5
7
|
if (toolGroup === undefined) {
|
|
@@ -12,4 +14,54 @@ export default function getBrushToolInstances(toolGroupId) {
|
|
|
12
14
|
const brushBasedToolInstances = Object.values(toolInstances).filter((toolInstance) => toolInstance instanceof BrushTool);
|
|
13
15
|
return brushBasedToolInstances;
|
|
14
16
|
}
|
|
17
|
+
const equalsCheck = (a, b) => {
|
|
18
|
+
return JSON.stringify(a) === JSON.stringify(b);
|
|
19
|
+
};
|
|
20
|
+
export function getVoxelOverlap(imageData, dimensions, voxelSpacing, voxelCenter) {
|
|
21
|
+
const voxelCornersWorld = [];
|
|
22
|
+
for (let i = 0; i < 2; i++) {
|
|
23
|
+
for (let j = 0; j < 2; j++) {
|
|
24
|
+
for (let k = 0; k < 2; k++) {
|
|
25
|
+
const point = voxelCenter;
|
|
26
|
+
point[0] = point[0] + ((i * 2 - 1) * voxelSpacing[0]) / 2;
|
|
27
|
+
point[1] = point[1] + ((j * 2 - 1) * voxelSpacing[1]) / 2;
|
|
28
|
+
point[2] = point[2] + ((k * 2 - 1) * voxelSpacing[2]) / 2;
|
|
29
|
+
voxelCornersWorld.push(point);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
const voxelCornersIJK = voxelCornersWorld.map((world) => csUtils.transformWorldToIndex(imageData, world));
|
|
34
|
+
const overlapBounds = getBoundingBoxAroundShape(voxelCornersIJK, dimensions);
|
|
35
|
+
return overlapBounds;
|
|
36
|
+
}
|
|
37
|
+
export function processVolumes(segmentationVolume, thresholdVolumeInformation) {
|
|
38
|
+
const { spacing: segmentationSpacing, imageData: segmentationImageData } = segmentationVolume;
|
|
39
|
+
const scalarData = segmentationVolume.getScalarData();
|
|
40
|
+
const volumeInfoList = [];
|
|
41
|
+
let baseVolumeIdx = 0;
|
|
42
|
+
for (let i = 0; i < thresholdVolumeInformation.length; i++) {
|
|
43
|
+
const { imageData, spacing, dimensions } = thresholdVolumeInformation[i].volume;
|
|
44
|
+
const volumeSize = thresholdVolumeInformation[i].volume.getScalarData().length;
|
|
45
|
+
if (volumeSize === scalarData.length &&
|
|
46
|
+
equalsCheck(spacing, segmentationSpacing)) {
|
|
47
|
+
baseVolumeIdx = i;
|
|
48
|
+
}
|
|
49
|
+
const referenceValues = imageData.getPointData().getScalars().getData();
|
|
50
|
+
const lower = thresholdVolumeInformation[i].lower;
|
|
51
|
+
const upper = thresholdVolumeInformation[i].upper;
|
|
52
|
+
volumeInfoList.push({
|
|
53
|
+
imageData,
|
|
54
|
+
referenceValues,
|
|
55
|
+
lower,
|
|
56
|
+
upper,
|
|
57
|
+
spacing,
|
|
58
|
+
dimensions,
|
|
59
|
+
volumeSize,
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
return {
|
|
63
|
+
volumeInfoList,
|
|
64
|
+
baseVolumeIdx,
|
|
65
|
+
};
|
|
66
|
+
}
|
|
15
67
|
//# sourceMappingURL=utilities.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/utilities.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/utilities.ts"],"names":[],"mappings":"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"}
|