@cornerstonejs/tools 1.42.1 → 1.43.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.
- package/dist/cjs/index.d.ts +2 -2
- package/dist/cjs/index.js +2 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/activeSegmentation.d.ts +2 -1
- package/dist/cjs/stateManagement/segmentation/activeSegmentation.js +10 -1
- package/dist/cjs/stateManagement/segmentation/activeSegmentation.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/segmentIndex.js +5 -0
- package/dist/cjs/stateManagement/segmentation/segmentIndex.js.map +1 -1
- package/dist/cjs/tools/displayTools/Labelmap/labelmapConfig.js +2 -0
- package/dist/cjs/tools/displayTools/Labelmap/labelmapConfig.js.map +1 -1
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js +10 -4
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/cjs/tools/index.d.ts +2 -1
- package/dist/cjs/tools/index.js +3 -1
- package/dist/cjs/tools/index.js.map +1 -1
- package/dist/cjs/tools/segmentation/BrushTool.d.ts +1 -0
- package/dist/cjs/tools/segmentation/BrushTool.js +32 -15
- package/dist/cjs/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js +5 -0
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js +5 -0
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/SegmentSelectTool.d.ts +15 -0
- package/dist/cjs/tools/segmentation/SegmentSelectTool.js +105 -0
- package/dist/cjs/tools/segmentation/SegmentSelectTool.js.map +1 -0
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js +5 -0
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/BrushStrategy.d.ts +2 -1
- package/dist/cjs/tools/segmentation/strategies/BrushStrategy.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/fillCircle.js +8 -9
- package/dist/cjs/tools/segmentation/strategies/fillCircle.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/fillRectangle.js +30 -3
- package/dist/cjs/tools/segmentation/strategies/fillRectangle.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/fillSphere.js +3 -20
- package/dist/cjs/tools/segmentation/strategies/fillSphere.js.map +1 -1
- package/dist/cjs/types/LabelmapTypes.d.ts +1 -0
- package/dist/cjs/utilities/boundingBox/getBoundingBoxAroundShape.d.ts +4 -2
- package/dist/cjs/utilities/boundingBox/getBoundingBoxAroundShape.js +45 -23
- package/dist/cjs/utilities/boundingBox/getBoundingBoxAroundShape.js.map +1 -1
- package/dist/cjs/utilities/boundingBox/index.d.ts +2 -2
- package/dist/cjs/utilities/boundingBox/index.js +5 -3
- package/dist/cjs/utilities/boundingBox/index.js.map +1 -1
- package/dist/cjs/utilities/getSphereBoundsInfo.d.ts +11 -0
- package/dist/cjs/utilities/getSphereBoundsInfo.js +45 -0
- package/dist/cjs/utilities/getSphereBoundsInfo.js.map +1 -0
- package/dist/cjs/utilities/index.d.ts +2 -2
- package/dist/cjs/utilities/index.js +3 -3
- package/dist/cjs/utilities/index.js.map +1 -1
- package/dist/cjs/utilities/pointInShapeCallback.d.ts +1 -1
- package/dist/cjs/utilities/pointInShapeCallback.js +1 -1
- package/dist/cjs/utilities/pointInShapeCallback.js.map +1 -1
- package/dist/cjs/utilities/rectangleROITool/getBoundsIJKFromRectangleAnnotations.js +2 -2
- package/dist/cjs/utilities/rectangleROITool/getBoundsIJKFromRectangleAnnotations.js.map +1 -1
- package/dist/cjs/utilities/rectangleROITool/index.d.ts +2 -1
- package/dist/cjs/utilities/rectangleROITool/index.js +3 -1
- package/dist/cjs/utilities/rectangleROITool/index.js.map +1 -1
- package/dist/cjs/utilities/rectangleROITool/isAxisAlignedRectangle.d.ts +2 -0
- package/dist/cjs/utilities/rectangleROITool/isAxisAlignedRectangle.js +26 -0
- package/dist/cjs/utilities/rectangleROITool/isAxisAlignedRectangle.js.map +1 -0
- package/dist/cjs/utilities/segmentation/createLabelmapVolumeForViewport.js +1 -1
- package/dist/cjs/utilities/segmentation/createLabelmapVolumeForViewport.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/invalidateBrushCursor.d.ts +1 -0
- package/dist/cjs/utilities/segmentation/invalidateBrushCursor.js +31 -0
- package/dist/cjs/utilities/segmentation/invalidateBrushCursor.js.map +1 -0
- package/dist/cjs/utilities/segmentation/utilities.d.ts +1 -1
- package/dist/cjs/utilities/segmentation/utilities.js +2 -2
- package/dist/cjs/utilities/segmentation/utilities.js.map +1 -1
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/activeSegmentation.js +10 -2
- package/dist/esm/stateManagement/segmentation/activeSegmentation.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/segmentIndex.js +6 -1
- package/dist/esm/stateManagement/segmentation/segmentIndex.js.map +1 -1
- package/dist/esm/tools/displayTools/Labelmap/labelmapConfig.js +2 -0
- package/dist/esm/tools/displayTools/Labelmap/labelmapConfig.js.map +1 -1
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js +11 -5
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/esm/tools/index.js +2 -1
- package/dist/esm/tools/index.js.map +1 -1
- package/dist/esm/tools/segmentation/BrushTool.js +31 -15
- package/dist/esm/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/esm/tools/segmentation/CircleScissorsTool.js +5 -0
- package/dist/esm/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js +5 -0
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/SegmentSelectTool.js +100 -0
- package/dist/esm/tools/segmentation/SegmentSelectTool.js.map +1 -0
- package/dist/esm/tools/segmentation/SphereScissorsTool.js +5 -0
- package/dist/esm/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/BrushStrategy.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/fillCircle.js +8 -9
- package/dist/esm/tools/segmentation/strategies/fillCircle.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/fillRectangle.js +32 -5
- package/dist/esm/tools/segmentation/strategies/fillRectangle.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/fillSphere.js +3 -20
- package/dist/esm/tools/segmentation/strategies/fillSphere.js.map +1 -1
- package/dist/esm/utilities/boundingBox/getBoundingBoxAroundShape.js +40 -23
- package/dist/esm/utilities/boundingBox/getBoundingBoxAroundShape.js.map +1 -1
- package/dist/esm/utilities/boundingBox/index.js +2 -2
- package/dist/esm/utilities/boundingBox/index.js.map +1 -1
- package/dist/esm/utilities/getSphereBoundsInfo.js +42 -0
- package/dist/esm/utilities/getSphereBoundsInfo.js.map +1 -0
- package/dist/esm/utilities/index.js +2 -2
- package/dist/esm/utilities/index.js.map +1 -1
- package/dist/esm/utilities/pointInShapeCallback.js +1 -1
- package/dist/esm/utilities/pointInShapeCallback.js.map +1 -1
- package/dist/esm/utilities/rectangleROITool/getBoundsIJKFromRectangleAnnotations.js +2 -2
- package/dist/esm/utilities/rectangleROITool/getBoundsIJKFromRectangleAnnotations.js.map +1 -1
- package/dist/esm/utilities/rectangleROITool/index.js +2 -1
- package/dist/esm/utilities/rectangleROITool/index.js.map +1 -1
- package/dist/esm/utilities/rectangleROITool/isAxisAlignedRectangle.js +23 -0
- package/dist/esm/utilities/rectangleROITool/isAxisAlignedRectangle.js.map +1 -0
- package/dist/esm/utilities/segmentation/createLabelmapVolumeForViewport.js +1 -1
- package/dist/esm/utilities/segmentation/createLabelmapVolumeForViewport.js.map +1 -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/invalidateBrushCursor.js +24 -0
- package/dist/esm/utilities/segmentation/invalidateBrushCursor.js.map +1 -0
- package/dist/esm/utilities/segmentation/utilities.js +2 -2
- package/dist/esm/utilities/segmentation/utilities.js.map +1 -1
- package/dist/types/index.d.ts +2 -2
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/stateManagement/segmentation/activeSegmentation.d.ts +2 -1
- package/dist/types/stateManagement/segmentation/activeSegmentation.d.ts.map +1 -1
- package/dist/types/stateManagement/segmentation/segmentIndex.d.ts.map +1 -1
- package/dist/types/tools/displayTools/Labelmap/labelmapConfig.d.ts.map +1 -1
- package/dist/types/tools/displayTools/Labelmap/labelmapDisplay.d.ts.map +1 -1
- package/dist/types/tools/index.d.ts +2 -1
- package/dist/types/tools/index.d.ts.map +1 -1
- package/dist/types/tools/segmentation/BrushTool.d.ts +1 -0
- package/dist/types/tools/segmentation/BrushTool.d.ts.map +1 -1
- package/dist/types/tools/segmentation/CircleScissorsTool.d.ts.map +1 -1
- package/dist/types/tools/segmentation/RectangleScissorsTool.d.ts.map +1 -1
- package/dist/types/tools/segmentation/SegmentSelectTool.d.ts +16 -0
- package/dist/types/tools/segmentation/SegmentSelectTool.d.ts.map +1 -0
- package/dist/types/tools/segmentation/SphereScissorsTool.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/BrushStrategy.d.ts +2 -1
- package/dist/types/tools/segmentation/strategies/BrushStrategy.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/fillCircle.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/fillRectangle.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/fillSphere.d.ts.map +1 -1
- package/dist/types/types/LabelmapTypes.d.ts +1 -0
- package/dist/types/types/LabelmapTypes.d.ts.map +1 -1
- package/dist/types/utilities/boundingBox/getBoundingBoxAroundShape.d.ts +4 -2
- package/dist/types/utilities/boundingBox/getBoundingBoxAroundShape.d.ts.map +1 -1
- package/dist/types/utilities/boundingBox/index.d.ts +2 -2
- package/dist/types/utilities/boundingBox/index.d.ts.map +1 -1
- package/dist/types/utilities/getSphereBoundsInfo.d.ts +12 -0
- package/dist/types/utilities/getSphereBoundsInfo.d.ts.map +1 -0
- package/dist/types/utilities/index.d.ts +2 -2
- package/dist/types/utilities/index.d.ts.map +1 -1
- package/dist/types/utilities/pointInShapeCallback.d.ts +1 -1
- package/dist/types/utilities/rectangleROITool/getBoundsIJKFromRectangleAnnotations.d.ts.map +1 -1
- package/dist/types/utilities/rectangleROITool/index.d.ts +2 -1
- package/dist/types/utilities/rectangleROITool/index.d.ts.map +1 -1
- package/dist/types/utilities/rectangleROITool/isAxisAlignedRectangle.d.ts +3 -0
- package/dist/types/utilities/rectangleROITool/isAxisAlignedRectangle.d.ts.map +1 -0
- package/dist/types/utilities/segmentation/index.d.ts +2 -1
- package/dist/types/utilities/segmentation/index.d.ts.map +1 -1
- package/dist/types/utilities/segmentation/invalidateBrushCursor.d.ts +2 -0
- package/dist/types/utilities/segmentation/invalidateBrushCursor.d.ts.map +1 -0
- package/dist/types/utilities/segmentation/utilities.d.ts +1 -1
- package/dist/types/utilities/segmentation/utilities.d.ts.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +4 -4
- package/src/index.ts +2 -0
- package/src/stateManagement/segmentation/activeSegmentation.ts +24 -1
- package/src/stateManagement/segmentation/segmentIndex.ts +15 -2
- package/src/tools/displayTools/Labelmap/labelmapConfig.ts +2 -0
- package/src/tools/displayTools/Labelmap/labelmapDisplay.ts +23 -12
- package/src/tools/index.ts +2 -0
- package/src/tools/segmentation/BrushTool.ts +53 -26
- package/src/tools/segmentation/CircleScissorsTool.ts +9 -0
- package/src/tools/segmentation/RectangleScissorsTool.ts +10 -1
- package/src/tools/segmentation/SegmentSelectTool.ts +182 -0
- package/src/tools/segmentation/SphereScissorsTool.ts +9 -0
- package/src/tools/segmentation/strategies/BrushStrategy.ts +2 -1
- package/src/tools/segmentation/strategies/fillCircle.ts +15 -14
- package/src/tools/segmentation/strategies/fillRectangle.ts +51 -6
- package/src/tools/segmentation/strategies/fillSphere.ts +10 -38
- package/src/types/LabelmapTypes.ts +5 -2
- package/src/utilities/boundingBox/getBoundingBoxAroundShape.ts +88 -37
- package/src/utilities/boundingBox/index.ts +11 -2
- package/src/utilities/{pointInSurroundingSphereCallback.ts → getSphereBoundsInfo.ts} +39 -82
- package/src/utilities/index.ts +2 -2
- package/src/utilities/math/ellipse/pointInEllipse.ts +1 -1
- package/src/utilities/pointInShapeCallback.ts +2 -2
- package/src/utilities/rectangleROITool/getBoundsIJKFromRectangleAnnotations.ts +5 -2
- package/src/utilities/rectangleROITool/index.ts +2 -1
- package/src/utilities/rectangleROITool/isAxisAlignedRectangle.ts +53 -0
- package/src/utilities/segmentation/createLabelmapVolumeForViewport.ts +1 -1
- package/src/utilities/segmentation/index.ts +2 -0
- package/src/utilities/segmentation/invalidateBrushCursor.ts +48 -0
- package/src/utilities/segmentation/utilities.ts +5 -2
- package/dist/cjs/utilities/pointInSurroundingSphereCallback.d.ts +0 -4
- package/dist/cjs/utilities/pointInSurroundingSphereCallback.js +0 -70
- package/dist/cjs/utilities/pointInSurroundingSphereCallback.js.map +0 -1
- package/dist/esm/utilities/pointInSurroundingSphereCallback.js +0 -64
- package/dist/esm/utilities/pointInSurroundingSphereCallback.js.map +0 -1
- package/dist/types/utilities/pointInSurroundingSphereCallback.d.ts +0 -5
- package/dist/types/utilities/pointInSurroundingSphereCallback.d.ts.map +0 -1
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const core_1 = require("@cornerstonejs/core");
|
|
7
|
+
const base_1 = require("../base");
|
|
8
|
+
const triggerSegmentationEvents_1 = require("../../stateManagement/segmentation/triggerSegmentationEvents");
|
|
9
|
+
const triggerAnnotationRenderForViewportIds_1 = __importDefault(require("../../utilities/triggerAnnotationRenderForViewportIds"));
|
|
10
|
+
const stackVolumeCheck_1 = require("./strategies/utils/stackVolumeCheck");
|
|
11
|
+
const activeSegmentation_1 = require("../../stateManagement/segmentation/activeSegmentation");
|
|
12
|
+
const SegmentationRepresentations_1 = __importDefault(require("../../enums/SegmentationRepresentations"));
|
|
13
|
+
const segmentIndex_1 = require("../../stateManagement/segmentation/segmentIndex");
|
|
14
|
+
class SegmentSelectTool extends base_1.BaseTool {
|
|
15
|
+
constructor(toolProps = {}, defaultToolProps = {
|
|
16
|
+
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
17
|
+
configuration: {
|
|
18
|
+
hoverTimeout: 750,
|
|
19
|
+
},
|
|
20
|
+
}) {
|
|
21
|
+
super(toolProps, defaultToolProps);
|
|
22
|
+
this.mouseMoveCallback = (evt) => {
|
|
23
|
+
if (this.hoverTimer) {
|
|
24
|
+
clearTimeout(this.hoverTimer);
|
|
25
|
+
}
|
|
26
|
+
this.hoverTimer = setTimeout(() => {
|
|
27
|
+
this._setActiveSegment(evt);
|
|
28
|
+
this.hoverTimer = null;
|
|
29
|
+
}, this.configuration.hoverTimeout);
|
|
30
|
+
return true;
|
|
31
|
+
};
|
|
32
|
+
this.onSetToolEnabled = () => {
|
|
33
|
+
this.onSetToolActive();
|
|
34
|
+
};
|
|
35
|
+
this.onSetToolActive = () => {
|
|
36
|
+
this.hoverTimer = null;
|
|
37
|
+
};
|
|
38
|
+
this.onSetToolDisabled = () => {
|
|
39
|
+
this.hoverTimer = null;
|
|
40
|
+
};
|
|
41
|
+
this.hoverTimer = null;
|
|
42
|
+
}
|
|
43
|
+
_setActiveSegment(evt = {}) {
|
|
44
|
+
const { element, currentPoints } = evt.detail;
|
|
45
|
+
const worldPoint = currentPoints.world;
|
|
46
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
47
|
+
if (!enabledElement) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
const { viewport } = enabledElement;
|
|
51
|
+
const activeSegmentation = (0, activeSegmentation_1.getActiveSegmentation)(this.toolGroupId);
|
|
52
|
+
if (activeSegmentation.type === SegmentationRepresentations_1.default.Labelmap) {
|
|
53
|
+
this._setActiveSegmentLabelmap(activeSegmentation, worldPoint, viewport);
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
throw Error('non-labelmap segmentation not supported yet');
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
_setActiveSegmentLabelmap(activeSegmentation, worldPoint, viewport) {
|
|
60
|
+
const imageDataInfo = viewport.getImageData();
|
|
61
|
+
if (!imageDataInfo) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
const labelmapData = activeSegmentation.representationData.LABELMAP;
|
|
65
|
+
let hoveredSegmentIndex;
|
|
66
|
+
if ((0, stackVolumeCheck_1.isVolumeSegmentation)(activeSegmentation.representationData.LABELMAP)) {
|
|
67
|
+
const { volumeId } = labelmapData;
|
|
68
|
+
const segmentationVolume = core_1.cache.getVolume(volumeId);
|
|
69
|
+
if (!segmentationVolume) {
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
hoveredSegmentIndex =
|
|
73
|
+
segmentationVolume.imageData.getScalarValueFromWorld(worldPoint);
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
const { imageIdReferenceMap } = labelmapData;
|
|
77
|
+
const currentImageId = viewport.getCurrentImageId();
|
|
78
|
+
const segmentationImageId = imageIdReferenceMap.get(currentImageId);
|
|
79
|
+
const image = core_1.cache.getImage(segmentationImageId);
|
|
80
|
+
if (!image) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
const activeSegmentationRepresentation = (0, activeSegmentation_1.getActiveSegmentationRepresentation)(this.toolGroupId);
|
|
84
|
+
if (!activeSegmentationRepresentation) {
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
const segmentationActor = viewport.getActor(activeSegmentationRepresentation.segmentationRepresentationUID);
|
|
88
|
+
const imageData = segmentationActor === null || segmentationActor === void 0 ? void 0 : segmentationActor.actor.getMapper().getInputData();
|
|
89
|
+
const indexIJK = core_1.utilities.transformWorldToIndex(imageData, worldPoint);
|
|
90
|
+
const flattenedIndex = indexIJK[0] + indexIJK[1] * image.columns;
|
|
91
|
+
const scalars = imageData.getPointData().getScalars().getData();
|
|
92
|
+
hoveredSegmentIndex = scalars[flattenedIndex];
|
|
93
|
+
}
|
|
94
|
+
if (!hoveredSegmentIndex || hoveredSegmentIndex === 0) {
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
(0, segmentIndex_1.setActiveSegmentIndex)(activeSegmentation.segmentationId, hoveredSegmentIndex);
|
|
98
|
+
const renderingEngine = viewport.getRenderingEngine();
|
|
99
|
+
(0, triggerSegmentationEvents_1.triggerSegmentationModified)(activeSegmentation.segmentationId);
|
|
100
|
+
(0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, renderingEngine.getViewports().map((v) => v.id));
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
SegmentSelectTool.toolName = 'SegmentSelectTool';
|
|
104
|
+
exports.default = SegmentSelectTool;
|
|
105
|
+
//# sourceMappingURL=SegmentSelectTool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SegmentSelectTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/SegmentSelectTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,9 @@ class SphereScissorsTool extends base_1.BaseTool {
|
|
|
28
28
|
}) {
|
|
29
29
|
super(toolProps, defaultToolProps);
|
|
30
30
|
this.preMouseDownCallback = (evt) => {
|
|
31
|
+
if (this.isDrawing === true) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
31
34
|
const eventDetail = evt.detail;
|
|
32
35
|
const { currentPoints, element } = eventDetail;
|
|
33
36
|
const worldPos = currentPoints.world;
|
|
@@ -163,6 +166,7 @@ class SphereScissorsTool extends base_1.BaseTool {
|
|
|
163
166
|
element.addEventListener(enums_1.Events.MOUSE_UP, this._endCallback);
|
|
164
167
|
element.addEventListener(enums_1.Events.MOUSE_DRAG, this._dragCallback);
|
|
165
168
|
element.addEventListener(enums_1.Events.MOUSE_CLICK, this._endCallback);
|
|
169
|
+
element.addEventListener(enums_1.Events.MOUSE_MOVE, this._dragCallback);
|
|
166
170
|
element.addEventListener(enums_1.Events.TOUCH_END, this._endCallback);
|
|
167
171
|
element.addEventListener(enums_1.Events.TOUCH_TAP, this._endCallback);
|
|
168
172
|
element.addEventListener(enums_1.Events.TOUCH_DRAG, this._dragCallback);
|
|
@@ -171,6 +175,7 @@ class SphereScissorsTool extends base_1.BaseTool {
|
|
|
171
175
|
element.removeEventListener(enums_1.Events.MOUSE_UP, this._endCallback);
|
|
172
176
|
element.removeEventListener(enums_1.Events.MOUSE_DRAG, this._dragCallback);
|
|
173
177
|
element.removeEventListener(enums_1.Events.MOUSE_CLICK, this._endCallback);
|
|
178
|
+
element.removeEventListener(enums_1.Events.MOUSE_MOVE, this._dragCallback);
|
|
174
179
|
element.removeEventListener(enums_1.Events.TOUCH_END, this._endCallback);
|
|
175
180
|
element.removeEventListener(enums_1.Events.TOUCH_DRAG, this._dragCallback);
|
|
176
181
|
element.removeEventListener(enums_1.Events.TOUCH_TAP, this._endCallback);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SphereScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/SphereScissorsTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAA+D;AAG/D,kCAAmC;AAQnC,wDAA2D;AAC3D,0DAA6D;AAC7D,uCAAkE;AAClE,iDAA+D;AAC/D,+DAGqC;AAErC,kIAA0G;AAC1G,qEAK4C;AAE5C,4FAAuF;AAMvF,0EAA2E;AAS3E,MAAM,kBAAmB,SAAQ,eAAQ;IAwBvC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,UAAU,EAAE;gBACV,WAAW,EAAE,6BAAgB;gBAC7B,YAAY,EAAE,+BAAiB;aAChC;YACD,eAAe,EAAE,aAAa;YAC9B,cAAc,EAAE,aAAa;SAC9B;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAWrC,yBAAoB,GAAG,CAAC,GAAoC,EAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"SphereScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/SphereScissorsTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { Types } from '@cornerstonejs/core';
|
|
|
2
2
|
import { utilities as csUtils } from '@cornerstonejs/core';
|
|
3
3
|
import { StrategyCallbacks } from '../../../enums';
|
|
4
4
|
import type { LabelmapToolOperationDataAny } from '../../../types/LabelmapToolOperationData';
|
|
5
|
+
import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
|
|
5
6
|
export declare type InitializedOperationData = LabelmapToolOperationDataAny & {
|
|
6
7
|
enabledElement: Types.IEnabledElement;
|
|
7
8
|
centerIJK?: Types.Point3;
|
|
@@ -9,7 +10,7 @@ export declare type InitializedOperationData = LabelmapToolOperationDataAny & {
|
|
|
9
10
|
viewport: Types.IViewport;
|
|
10
11
|
imageVoxelManager: csUtils.VoxelManager<number>;
|
|
11
12
|
segmentationVoxelManager: csUtils.VoxelManager<number>;
|
|
12
|
-
segmentationImageData:
|
|
13
|
+
segmentationImageData: vtkImageData;
|
|
13
14
|
previewVoxelManager: csUtils.VoxelManager<number>;
|
|
14
15
|
previewSegmentIndex?: number;
|
|
15
16
|
brushStrategy: BrushStrategy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrushStrategy.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/BrushStrategy.ts"],"names":[],"mappings":";;;;;AACA,8CAAkE;AAElE,+GAAkH;AAClH,kEAA0C;AAC1C,6DAA0D;AAC1D,+DAAgE;AAChE,0CAAmD;
|
|
1
|
+
{"version":3,"file":"BrushStrategy.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/BrushStrategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,11 @@ exports.createEllipseInPoint = exports.thresholdInsideCircle = exports.fillInsid
|
|
|
7
7
|
const gl_matrix_1 = require("gl-matrix");
|
|
8
8
|
const core_1 = require("@cornerstonejs/core");
|
|
9
9
|
const ellipse_1 = require("../../../utilities/math/ellipse");
|
|
10
|
-
const pointInSphere_1 = __importDefault(require("../../../utilities/math/sphere/pointInSphere"));
|
|
11
10
|
const boundingBox_1 = require("../../../utilities/boundingBox");
|
|
12
11
|
const BrushStrategy_1 = __importDefault(require("./BrushStrategy"));
|
|
13
12
|
const enums_1 = require("../../../enums");
|
|
14
13
|
const compositions_1 = __importDefault(require("./compositions"));
|
|
14
|
+
const sphere_1 = require("../../../utilities/math/sphere");
|
|
15
15
|
const { transformWorldToIndex, isEqual } = core_1.utilities;
|
|
16
16
|
const initializeCircle = {
|
|
17
17
|
[enums_1.StrategyCallbacks.Initialize]: (operationData) => {
|
|
@@ -30,11 +30,11 @@ const initializeCircle = {
|
|
|
30
30
|
const [topLeftCanvas, bottomRightCanvas] = (0, ellipse_1.getCanvasEllipseCorners)(canvasCoordinates);
|
|
31
31
|
const topLeftWorld = viewport.canvasToWorld(topLeftCanvas);
|
|
32
32
|
const bottomRightWorld = viewport.canvasToWorld(bottomRightCanvas);
|
|
33
|
-
const
|
|
34
|
-
transformWorldToIndex(segmentationImageData,
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
segmentationVoxelManager.boundsIJK =
|
|
33
|
+
const circleCornersIJK = points.map((world) => {
|
|
34
|
+
return transformWorldToIndex(segmentationImageData, world);
|
|
35
|
+
});
|
|
36
|
+
const boundsIJK = (0, boundingBox_1.getBoundingBoxAroundShapeIJK)(circleCornersIJK, segmentationImageData.getDimensions());
|
|
37
|
+
segmentationVoxelManager.boundsIJK = boundsIJK;
|
|
38
38
|
imageVoxelManager.isInObject = createPointInEllipse({
|
|
39
39
|
topLeftWorld,
|
|
40
40
|
bottomRightWorld,
|
|
@@ -56,7 +56,7 @@ function createPointInEllipse(worldInfo) {
|
|
|
56
56
|
radius,
|
|
57
57
|
radius2: radius * radius,
|
|
58
58
|
};
|
|
59
|
-
return (pointLPS) => (0,
|
|
59
|
+
return (pointLPS) => (0, sphere_1.pointInSphere)(sphereObj, pointLPS);
|
|
60
60
|
}
|
|
61
61
|
const ellipseObj = {
|
|
62
62
|
center: center,
|
|
@@ -64,8 +64,7 @@ function createPointInEllipse(worldInfo) {
|
|
|
64
64
|
yRadius,
|
|
65
65
|
zRadius,
|
|
66
66
|
};
|
|
67
|
-
const
|
|
68
|
-
const { precalculated } = inverts;
|
|
67
|
+
const { precalculated } = (0, ellipse_1.precalculatePointInEllipse)(ellipseObj, {});
|
|
69
68
|
return precalculated;
|
|
70
69
|
}
|
|
71
70
|
exports.createEllipseInPoint = createPointInEllipse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fillCircle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillCircle.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAiC;AACjC,8CAA2D;AAG3D,6DAGyC;AACzC,
|
|
1
|
+
{"version":3,"file":"fillCircle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillCircle.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,11 @@ const boundingBox_1 = require("../../../utilities/boundingBox");
|
|
|
6
6
|
const utilities_1 = require("../../../utilities");
|
|
7
7
|
const triggerSegmentationEvents_1 = require("../../../stateManagement/segmentation/triggerSegmentationEvents");
|
|
8
8
|
const getStrategyData_1 = require("./utils/getStrategyData");
|
|
9
|
+
const isAxisAlignedRectangle_1 = require("../../../utilities/rectangleROITool/isAxisAlignedRectangle");
|
|
9
10
|
const { transformWorldToIndex } = core_1.utilities;
|
|
10
11
|
function fillRectangle(enabledElement, operationData, inside = true) {
|
|
11
12
|
const { points, segmentsLocked, segmentIndex, segmentationId } = operationData;
|
|
13
|
+
const { viewport } = enabledElement;
|
|
12
14
|
const strategyData = (0, getStrategyData_1.getStrategyData)({
|
|
13
15
|
operationData,
|
|
14
16
|
viewport: enabledElement.viewport,
|
|
@@ -26,15 +28,40 @@ function fillRectangle(enabledElement, operationData, inside = true) {
|
|
|
26
28
|
return Math.round(coord);
|
|
27
29
|
});
|
|
28
30
|
});
|
|
29
|
-
const boundsIJK = (0, boundingBox_1.
|
|
30
|
-
const
|
|
31
|
+
const boundsIJK = (0, boundingBox_1.getBoundingBoxAroundShapeIJK)(rectangleCornersIJK, segmentationImageData.getDimensions());
|
|
32
|
+
const isStackViewport = viewport instanceof core_1.StackViewport;
|
|
33
|
+
const isAligned = isStackViewport || (0, isAxisAlignedRectangle_1.isAxisAlignedRectangle)(rectangleCornersIJK);
|
|
34
|
+
const direction = segmentationImageData.getDirection();
|
|
35
|
+
const spacing = segmentationImageData.getSpacing();
|
|
36
|
+
const { viewPlaneNormal } = viewport.getCamera();
|
|
37
|
+
const EPS = core_1.utilities.getSpacingInNormalDirection({
|
|
38
|
+
direction,
|
|
39
|
+
spacing,
|
|
40
|
+
}, viewPlaneNormal);
|
|
41
|
+
const pointsBoundsLPS = (0, boundingBox_1.getBoundingBoxAroundShapeWorld)(points);
|
|
42
|
+
let [[xMin, xMax], [yMin, yMax], [zMin, zMax]] = pointsBoundsLPS;
|
|
43
|
+
xMin -= EPS;
|
|
44
|
+
xMax += EPS;
|
|
45
|
+
yMin -= EPS;
|
|
46
|
+
yMax += EPS;
|
|
47
|
+
zMin -= EPS;
|
|
48
|
+
zMax += EPS;
|
|
49
|
+
const pointInShapeFn = isAligned
|
|
50
|
+
? () => true
|
|
51
|
+
: (pointLPS) => {
|
|
52
|
+
const [x, y, z] = pointLPS;
|
|
53
|
+
const xInside = x >= xMin && x <= xMax;
|
|
54
|
+
const yInside = y >= yMin && y <= yMax;
|
|
55
|
+
const zInside = z >= zMin && z <= zMax;
|
|
56
|
+
return xInside && yInside && zInside;
|
|
57
|
+
};
|
|
31
58
|
const callback = ({ value, index }) => {
|
|
32
59
|
if (segmentsLocked.includes(value)) {
|
|
33
60
|
return;
|
|
34
61
|
}
|
|
35
62
|
segmentationScalarData[index] = segmentIndex;
|
|
36
63
|
};
|
|
37
|
-
(0, utilities_1.pointInShapeCallback)(segmentationImageData,
|
|
64
|
+
(0, utilities_1.pointInShapeCallback)(segmentationImageData, pointInShapeFn, callback, boundsIJK);
|
|
38
65
|
(0, triggerSegmentationEvents_1.triggerSegmentationDataModified)(segmentationId);
|
|
39
66
|
}
|
|
40
67
|
function fillInsideRectangle(enabledElement, operationData) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fillRectangle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillRectangle.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"fillRectangle.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillRectangle.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.SPHERE_STRATEGY = exports.thresholdInsideSphere = exports.fillInsideSphere = exports.fillOutsideSphere = void 0;
|
|
7
7
|
const core_1 = require("@cornerstonejs/core");
|
|
8
8
|
const gl_matrix_1 = require("gl-matrix");
|
|
9
|
-
const ellipse_1 = require("../../../utilities/math/ellipse");
|
|
10
|
-
const boundingBox_1 = require("../../../utilities/boundingBox");
|
|
11
9
|
const BrushStrategy_1 = __importDefault(require("./BrushStrategy"));
|
|
12
10
|
const compositions_1 = __importDefault(require("./compositions"));
|
|
13
11
|
const StrategyCallbacks_1 = __importDefault(require("../../../enums/StrategyCallbacks"));
|
|
14
12
|
const fillCircle_1 = require("./fillCircle");
|
|
15
13
|
const { transformWorldToIndex } = core_1.utilities;
|
|
14
|
+
const getSphereBoundsInfo_1 = require("../../../utilities/getSphereBoundsInfo");
|
|
16
15
|
const sphereComposition = {
|
|
17
16
|
[StrategyCallbacks_1.default.Initialize]: (operationData) => {
|
|
18
17
|
const { points, imageVoxelManager: imageVoxelManager, viewport, segmentationImageData, segmentationVoxelManager: segmentationVoxelManager, } = operationData;
|
|
@@ -26,24 +25,8 @@ const sphereComposition = {
|
|
|
26
25
|
gl_matrix_1.vec3.scale(center, center, 1 / points.length);
|
|
27
26
|
operationData.centerWorld = center;
|
|
28
27
|
operationData.centerIJK = transformWorldToIndex(segmentationImageData, center);
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
const topLeftWorld = viewport.canvasToWorld(topLeftCanvas);
|
|
32
|
-
const bottomRightWorld = viewport.canvasToWorld(bottomRightCanvas);
|
|
33
|
-
const diameters = topLeftWorld.map((left, index) => Math.abs(bottomRightWorld[index] - left));
|
|
34
|
-
const radius = Math.max(...diameters) / 2;
|
|
35
|
-
topLeftWorld.forEach((left, index) => {
|
|
36
|
-
const right = bottomRightWorld[index];
|
|
37
|
-
if (left === right) {
|
|
38
|
-
topLeftWorld[index] = left - radius;
|
|
39
|
-
bottomRightWorld[index] = left + radius;
|
|
40
|
-
}
|
|
41
|
-
});
|
|
42
|
-
const ellipsoidCornersIJK = [
|
|
43
|
-
transformWorldToIndex(segmentationImageData, topLeftWorld),
|
|
44
|
-
(transformWorldToIndex(segmentationImageData, bottomRightWorld)),
|
|
45
|
-
];
|
|
46
|
-
segmentationVoxelManager.boundsIJK = (0, boundingBox_1.getBoundingBoxAroundShape)(ellipsoidCornersIJK, segmentationVoxelManager.dimensions);
|
|
28
|
+
const { boundsIJK: newBoundsIJK, topLeftWorld, bottomRightWorld, } = (0, getSphereBoundsInfo_1.getSphereBoundsInfo)(points.slice(0, 2), segmentationImageData, viewport);
|
|
29
|
+
segmentationVoxelManager.boundsIJK = newBoundsIJK;
|
|
47
30
|
imageVoxelManager.isInObject = (0, fillCircle_1.createEllipseInPoint)({
|
|
48
31
|
topLeftWorld,
|
|
49
32
|
bottomRightWorld,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fillSphere.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillSphere.ts"],"names":[],"mappings":";;;;;;AACA,8CAA2D;AAC3D,yCAAiC;AAEjC,
|
|
1
|
+
{"version":3,"file":"fillSphere.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/fillSphere.ts"],"names":[],"mappings":";;;;;;AACA,8CAA2D;AAC3D,yCAAiC;AAEjC,oEAA4C;AAE5C,kEAA0C;AAC1C,yFAAiE;AACjE,6CAAoD;AACpD,MAAM,EAAE,qBAAqB,EAAE,GAAG,gBAAO,CAAC;AAC1C,gFAA6E;AAC7E,MAAM,iBAAiB,GAAG;IACxB,CAAC,2BAAiB,CAAC,UAAU,CAAC,EAAE,CAAC,aAAuC,EAAE,EAAE;QAC1E,MAAM,EACJ,MAAM,EACN,iBAAiB,EAAE,iBAAiB,EACpC,QAAQ,EACR,qBAAqB,EACrB,wBAAwB,EAAE,wBAAwB,GACnD,GAAG,aAAa,CAAC;QAGlB,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QAED,MAAM,MAAM,GAAG,gBAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACxC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,gBAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,gBAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAE9C,aAAa,CAAC,WAAW,GAAG,MAAsB,CAAC;QACnD,aAAa,CAAC,SAAS,GAAG,qBAAqB,CAC7C,qBAAqB,EACrB,MAAsB,CACvB,CAAC;QAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,YAAY,EACZ,gBAAgB,GACjB,GAAG,IAAA,yCAAmB,EACrB,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAiC,EAClD,qBAAqB,EACrB,QAAQ,CACT,CAAC;QAEF,wBAAwB,CAAC,SAAS,GAAG,YAAY,CAAC;QAElD,iBAAiB,CAAC,UAAU,GAAG,IAAA,iCAAoB,EAAC;YAClD,YAAY;YACZ,gBAAgB;YAChB,MAAM;SACP,CAAC,CAAC;IACL,CAAC;CACa,CAAC;AAEjB,MAAM,eAAe,GAAG,IAAI,uBAAa,CACvC,QAAQ,EACR,sBAAY,CAAC,UAAU,EACvB,sBAAY,CAAC,QAAQ,EACrB,iBAAiB,EACjB,sBAAY,CAAC,qBAAqB,EAClC,sBAAY,CAAC,OAAO,CACrB,CAAC;AAqCgD,0CAAe;AA7BjE,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,CAAC;AA6BjD,4CAAgB;AA3BzB,MAAM,yBAAyB,GAAG,IAAI,uBAAa,CACjD,iBAAiB,EACjB,GAAG,eAAe,CAAC,YAAY,EAC/B,sBAAY,CAAC,gBAAgB,EAC7B,sBAAY,CAAC,SAAS,EACtB,sBAAY,CAAC,aAAa,CAC3B,CAAC;AASF,MAAM,qBAAqB,GAAG,yBAAyB,CAAC,gBAAgB,CAAC;AAY9C,sDAAqB;AAJhD,SAAgB,iBAAiB;IAC/B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;AACzD,CAAC;AAFD,8CAEC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import type { Types } from '@cornerstonejs/core';
|
|
2
|
-
declare
|
|
3
|
-
export
|
|
2
|
+
declare type BoundingBox = [Types.Point2, Types.Point2, null] | [Types.Point2, Types.Point2, Types.Point2];
|
|
3
|
+
export declare function getBoundingBoxAroundShapeIJK(points: Types.Point2[] | Types.Point3[], dimensions?: Types.Point2 | Types.Point3): BoundingBox;
|
|
4
|
+
export declare function getBoundingBoxAroundShapeWorld(points: Types.Point2[] | Types.Point3[], clipBounds?: Types.Point2 | Types.Point3): BoundingBox;
|
|
5
|
+
export {};
|
|
@@ -1,40 +1,62 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
3
|
+
exports.getBoundingBoxAroundShapeWorld = exports.getBoundingBoxAroundShapeIJK = void 0;
|
|
4
|
+
const core_1 = require("@cornerstonejs/core");
|
|
5
|
+
const { EPSILON } = core_1.CONSTANTS;
|
|
6
|
+
function calculateBoundingBox(points, dimensions, isWorld = false) {
|
|
7
|
+
var _a;
|
|
4
8
|
let xMin = Infinity;
|
|
5
|
-
let xMax = 0;
|
|
9
|
+
let xMax = isWorld ? -Infinity : 0;
|
|
6
10
|
let yMin = Infinity;
|
|
7
|
-
let yMax = 0;
|
|
11
|
+
let yMax = isWorld ? -Infinity : 0;
|
|
8
12
|
let zMin = Infinity;
|
|
9
|
-
let zMax = 0;
|
|
13
|
+
let zMax = isWorld ? -Infinity : 0;
|
|
14
|
+
const is3D = ((_a = points[0]) === null || _a === void 0 ? void 0 : _a.length) === 3;
|
|
10
15
|
points.forEach((p) => {
|
|
16
|
+
var _a, _b;
|
|
11
17
|
xMin = Math.min(p[0], xMin);
|
|
12
18
|
xMax = Math.max(p[0], xMax);
|
|
13
19
|
yMin = Math.min(p[1], yMin);
|
|
14
20
|
yMax = Math.max(p[1], yMax);
|
|
15
|
-
|
|
16
|
-
|
|
21
|
+
if (is3D) {
|
|
22
|
+
zMin = Math.min((_a = p[2]) !== null && _a !== void 0 ? _a : zMin, zMin);
|
|
23
|
+
zMax = Math.max((_b = p[2]) !== null && _b !== void 0 ? _b : zMax, zMax);
|
|
24
|
+
}
|
|
17
25
|
});
|
|
18
|
-
xMin = Math.floor(xMin);
|
|
19
|
-
xMax = Math.floor(xMax);
|
|
20
|
-
yMin = Math.floor(yMin);
|
|
21
|
-
yMax = Math.floor(yMax);
|
|
22
|
-
zMin = Math.floor(zMin);
|
|
23
|
-
zMax = Math.floor(zMax);
|
|
24
26
|
if (dimensions) {
|
|
25
|
-
|
|
27
|
+
xMin = Math.max(isWorld ? dimensions[0] + EPSILON : 0, xMin);
|
|
28
|
+
xMax = Math.min(isWorld ? dimensions[0] - EPSILON : dimensions[0] - 1, xMax);
|
|
29
|
+
yMin = Math.max(isWorld ? dimensions[1] + EPSILON : 0, yMin);
|
|
30
|
+
yMax = Math.min(isWorld ? dimensions[1] - EPSILON : dimensions[1] - 1, yMax);
|
|
31
|
+
if (is3D && dimensions.length === 3) {
|
|
32
|
+
zMin = Math.max(isWorld ? dimensions[2] + EPSILON : 0, zMin);
|
|
33
|
+
zMax = Math.min(isWorld ? dimensions[2] - EPSILON : dimensions[2] - 1, zMax);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
else if (!isWorld) {
|
|
26
37
|
xMin = Math.max(0, xMin);
|
|
27
|
-
xMax = Math.min(
|
|
38
|
+
xMax = Math.min(Infinity, xMax);
|
|
28
39
|
yMin = Math.max(0, yMin);
|
|
29
|
-
yMax = Math.min(
|
|
30
|
-
|
|
31
|
-
|
|
40
|
+
yMax = Math.min(Infinity, yMax);
|
|
41
|
+
if (is3D) {
|
|
42
|
+
zMin = Math.max(0, zMin);
|
|
43
|
+
zMax = Math.min(Infinity, zMax);
|
|
44
|
+
}
|
|
32
45
|
}
|
|
33
|
-
return
|
|
34
|
-
[
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
46
|
+
return is3D
|
|
47
|
+
? [
|
|
48
|
+
[xMin, xMax],
|
|
49
|
+
[yMin, yMax],
|
|
50
|
+
[zMin, zMax],
|
|
51
|
+
]
|
|
52
|
+
: [[xMin, xMax], [yMin, yMax], null];
|
|
53
|
+
}
|
|
54
|
+
function getBoundingBoxAroundShapeIJK(points, dimensions) {
|
|
55
|
+
return calculateBoundingBox(points, dimensions, false);
|
|
56
|
+
}
|
|
57
|
+
exports.getBoundingBoxAroundShapeIJK = getBoundingBoxAroundShapeIJK;
|
|
58
|
+
function getBoundingBoxAroundShapeWorld(points, clipBounds) {
|
|
59
|
+
return calculateBoundingBox(points, clipBounds, true);
|
|
38
60
|
}
|
|
39
|
-
exports.
|
|
61
|
+
exports.getBoundingBoxAroundShapeWorld = getBoundingBoxAroundShapeWorld;
|
|
40
62
|
//# sourceMappingURL=getBoundingBoxAroundShape.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBoundingBoxAroundShape.js","sourceRoot":"","sources":["../../../../src/utilities/boundingBox/getBoundingBoxAroundShape.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getBoundingBoxAroundShape.js","sourceRoot":"","sources":["../../../../src/utilities/boundingBox/getBoundingBoxAroundShape.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import extend2DBoundingBoxInViewAxis from './extend2DBoundingBoxInViewAxis';
|
|
2
|
-
import
|
|
3
|
-
export { extend2DBoundingBoxInViewAxis, getBoundingBoxAroundShape };
|
|
2
|
+
import { getBoundingBoxAroundShapeIJK, getBoundingBoxAroundShapeWorld } from './getBoundingBoxAroundShape';
|
|
3
|
+
export { extend2DBoundingBoxInViewAxis, getBoundingBoxAroundShapeIJK, getBoundingBoxAroundShapeWorld, getBoundingBoxAroundShapeIJK as getBoundingBoxAroundShape, };
|
|
@@ -3,9 +3,11 @@ 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
|
-
exports.getBoundingBoxAroundShape = exports.extend2DBoundingBoxInViewAxis = void 0;
|
|
6
|
+
exports.getBoundingBoxAroundShape = exports.getBoundingBoxAroundShapeWorld = exports.getBoundingBoxAroundShapeIJK = exports.extend2DBoundingBoxInViewAxis = void 0;
|
|
7
7
|
const extend2DBoundingBoxInViewAxis_1 = __importDefault(require("./extend2DBoundingBoxInViewAxis"));
|
|
8
8
|
exports.extend2DBoundingBoxInViewAxis = extend2DBoundingBoxInViewAxis_1.default;
|
|
9
|
-
const getBoundingBoxAroundShape_1 =
|
|
10
|
-
exports
|
|
9
|
+
const getBoundingBoxAroundShape_1 = require("./getBoundingBoxAroundShape");
|
|
10
|
+
Object.defineProperty(exports, "getBoundingBoxAroundShapeIJK", { enumerable: true, get: function () { return getBoundingBoxAroundShape_1.getBoundingBoxAroundShapeIJK; } });
|
|
11
|
+
Object.defineProperty(exports, "getBoundingBoxAroundShape", { enumerable: true, get: function () { return getBoundingBoxAroundShape_1.getBoundingBoxAroundShapeIJK; } });
|
|
12
|
+
Object.defineProperty(exports, "getBoundingBoxAroundShapeWorld", { enumerable: true, get: function () { return getBoundingBoxAroundShape_1.getBoundingBoxAroundShapeWorld; } });
|
|
11
13
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utilities/boundingBox/index.ts"],"names":[],"mappings":";;;;;;AAAA,oGAA4E;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utilities/boundingBox/index.ts"],"names":[],"mappings":";;;;;;AAAA,oGAA4E;AAO1E,wCAPK,uCAA6B,CAOL;AAN/B,2EAGqC;AAInC,6GANA,wDAA4B,OAMA;AAGI,0GAThC,wDAA4B,OAS6B;AAFzD,+GANA,0DAA8B,OAMA"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { Types } from '@cornerstonejs/core';
|
|
2
|
+
import type { vtkImageData } from '@kitware/vtk.js/Common/DataModel/ImageData';
|
|
3
|
+
import { BoundsIJK } from '../types';
|
|
4
|
+
declare function getSphereBoundsInfo(circlePoints: [Types.Point3, Types.Point3], imageData: vtkImageData, viewport: any): {
|
|
5
|
+
boundsIJK: BoundsIJK;
|
|
6
|
+
centerWorld: Types.Point3;
|
|
7
|
+
radiusWorld: number;
|
|
8
|
+
topLeftWorld: Types.Point3;
|
|
9
|
+
bottomRightWorld: Types.Point3;
|
|
10
|
+
};
|
|
11
|
+
export { getSphereBoundsInfo };
|