@cornerstonejs/tools 0.10.1 → 0.12.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/_getHash.d.ts +1 -1
- package/dist/cjs/drawingSvg/_getHash.js +2 -2
- package/dist/cjs/drawingSvg/_getHash.js.map +1 -1
- package/dist/cjs/drawingSvg/drawArrow.d.ts +2 -0
- package/dist/cjs/drawingSvg/drawArrow.js +53 -0
- package/dist/cjs/drawingSvg/drawArrow.js.map +1 -0
- package/dist/cjs/drawingSvg/drawCircle.d.ts +1 -1
- package/dist/cjs/drawingSvg/drawCircle.js +2 -2
- package/dist/cjs/drawingSvg/drawCircle.js.map +1 -1
- package/dist/cjs/drawingSvg/drawEllipse.d.ts +1 -1
- package/dist/cjs/drawingSvg/drawEllipse.js +2 -2
- package/dist/cjs/drawingSvg/drawEllipse.js.map +1 -1
- package/dist/cjs/drawingSvg/drawHandles.d.ts +1 -1
- package/dist/cjs/drawingSvg/drawHandles.js +2 -2
- package/dist/cjs/drawingSvg/drawHandles.js.map +1 -1
- package/dist/cjs/drawingSvg/drawLine.d.ts +1 -1
- package/dist/cjs/drawingSvg/drawLine.js +2 -2
- package/dist/cjs/drawingSvg/drawLine.js.map +1 -1
- package/dist/cjs/drawingSvg/drawLink.d.ts +1 -1
- package/dist/cjs/drawingSvg/drawLink.js +2 -2
- package/dist/cjs/drawingSvg/drawLink.js.map +1 -1
- package/dist/cjs/drawingSvg/drawLinkedTextBox.d.ts +1 -1
- package/dist/cjs/drawingSvg/drawLinkedTextBox.js +3 -3
- package/dist/cjs/drawingSvg/drawLinkedTextBox.js.map +1 -1
- package/dist/cjs/drawingSvg/drawPolyline.d.ts +8 -0
- package/dist/cjs/drawingSvg/drawPolyline.js +50 -0
- package/dist/cjs/drawingSvg/drawPolyline.js.map +1 -0
- package/dist/cjs/drawingSvg/drawRect.d.ts +1 -1
- package/dist/cjs/drawingSvg/drawRect.js +2 -2
- package/dist/cjs/drawingSvg/drawRect.js.map +1 -1
- package/dist/cjs/drawingSvg/drawTextBox.d.ts +1 -1
- package/dist/cjs/drawingSvg/drawTextBox.js +4 -4
- package/dist/cjs/drawingSvg/drawTextBox.js.map +1 -1
- package/dist/cjs/drawingSvg/index.d.ts +3 -1
- package/dist/cjs/drawingSvg/index.js +5 -1
- package/dist/cjs/drawingSvg/index.js.map +1 -1
- package/dist/cjs/index.d.ts +2 -2
- package/dist/cjs/index.js +3 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/config/annotationStyle.js +1 -1
- package/dist/cjs/tools/CrosshairsTool.js +12 -12
- package/dist/cjs/tools/CrosshairsTool.js.map +1 -1
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.d.ts +36 -0
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.js +403 -0
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.js.map +1 -0
- package/dist/cjs/tools/annotation/BidirectionalTool.js +4 -4
- package/dist/cjs/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/cjs/tools/annotation/EllipticalROITool.js +3 -3
- package/dist/cjs/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/LengthTool.js +4 -3
- package/dist/cjs/tools/annotation/LengthTool.js.map +1 -1
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.d.ts +32 -0
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js +192 -0
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js.map +1 -0
- package/dist/cjs/tools/annotation/ProbeTool.js +2 -2
- package/dist/cjs/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/cjs/tools/annotation/RectangleROITool.js +3 -3
- package/dist/cjs/tools/annotation/RectangleROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/planarFreehandROITool/closedContourEditLoop.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/closedContourEditLoop.js +216 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/closedContourEditLoop.js.map +1 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/drawLoop.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/drawLoop.js +182 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/drawLoop.js.map +1 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/editLoopCommon.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/editLoopCommon.js +127 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/editLoopCommon.js.map +1 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEditLoop.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEditLoop.js +289 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEditLoop.js.map +1 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEndEditLoop.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEndEditLoop.js +43 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEndEditLoop.js.map +1 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.js +99 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -0
- package/dist/cjs/tools/index.d.ts +3 -1
- package/dist/cjs/tools/index.js +5 -1
- package/dist/cjs/tools/index.js.map +1 -1
- package/dist/cjs/tools/segmentation/BrushTool.js +1 -1
- package/dist/cjs/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js +1 -1
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js +2 -2
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js +2 -2
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js +1 -1
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/cjs/types/AnnotationTypes.d.ts +1 -0
- package/dist/cjs/types/ToolSpecificAnnotationTypes.d.ts +50 -0
- package/dist/cjs/utilities/math/index.d.ts +2 -1
- package/dist/cjs/utilities/math/index.js +3 -1
- package/dist/cjs/utilities/math/index.js.map +1 -1
- package/dist/cjs/utilities/math/polyline/addCanvasPointsToArray.d.ts +4 -0
- package/dist/cjs/utilities/math/polyline/addCanvasPointsToArray.js +36 -0
- package/dist/cjs/utilities/math/polyline/addCanvasPointsToArray.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/calculateAreaOfPoints.d.ts +2 -0
- package/dist/cjs/utilities/math/polyline/calculateAreaOfPoints.js +14 -0
- package/dist/cjs/utilities/math/polyline/calculateAreaOfPoints.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/getIntersectionWithPolyline.d.ts +7 -0
- package/dist/cjs/utilities/math/polyline/getIntersectionWithPolyline.js +110 -0
- package/dist/cjs/utilities/math/polyline/getIntersectionWithPolyline.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/getSubPixelSpacingAndXYDirections.d.ts +7 -0
- package/dist/cjs/utilities/math/polyline/getSubPixelSpacingAndXYDirections.js +67 -0
- package/dist/cjs/utilities/math/polyline/getSubPixelSpacingAndXYDirections.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/index.d.ts +7 -0
- package/dist/cjs/utilities/math/polyline/index.js +20 -0
- package/dist/cjs/utilities/math/polyline/index.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/planarFreehandROIInternalTypes.d.ts +22 -0
- package/dist/cjs/utilities/math/polyline/planarFreehandROIInternalTypes.js +3 -0
- package/dist/cjs/utilities/math/polyline/planarFreehandROIInternalTypes.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/pointCanProjectOnLine.d.ts +3 -0
- package/dist/cjs/utilities/math/polyline/pointCanProjectOnLine.js +35 -0
- package/dist/cjs/utilities/math/polyline/pointCanProjectOnLine.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/pointsAreWithinCloseContourProximity.d.ts +3 -0
- package/dist/cjs/utilities/math/polyline/pointsAreWithinCloseContourProximity.js +8 -0
- package/dist/cjs/utilities/math/polyline/pointsAreWithinCloseContourProximity.js.map +1 -0
- package/dist/esm/drawingSvg/_getHash.d.ts +1 -1
- package/dist/esm/drawingSvg/_getHash.js +2 -2
- package/dist/esm/drawingSvg/_getHash.js.map +1 -1
- package/dist/esm/drawingSvg/drawArrow.d.ts +2 -0
- package/dist/esm/drawingSvg/drawArrow.js +47 -0
- package/dist/esm/drawingSvg/drawArrow.js.map +1 -0
- package/dist/esm/drawingSvg/drawCircle.d.ts +1 -1
- package/dist/esm/drawingSvg/drawCircle.js +2 -2
- package/dist/esm/drawingSvg/drawCircle.js.map +1 -1
- package/dist/esm/drawingSvg/drawEllipse.d.ts +1 -1
- package/dist/esm/drawingSvg/drawEllipse.js +2 -2
- package/dist/esm/drawingSvg/drawEllipse.js.map +1 -1
- package/dist/esm/drawingSvg/drawHandles.d.ts +1 -1
- package/dist/esm/drawingSvg/drawHandles.js +2 -2
- package/dist/esm/drawingSvg/drawHandles.js.map +1 -1
- package/dist/esm/drawingSvg/drawLine.d.ts +1 -1
- package/dist/esm/drawingSvg/drawLine.js +2 -2
- package/dist/esm/drawingSvg/drawLine.js.map +1 -1
- package/dist/esm/drawingSvg/drawLink.d.ts +1 -1
- package/dist/esm/drawingSvg/drawLink.js +2 -2
- package/dist/esm/drawingSvg/drawLink.js.map +1 -1
- package/dist/esm/drawingSvg/drawLinkedTextBox.d.ts +1 -1
- package/dist/esm/drawingSvg/drawLinkedTextBox.js +3 -3
- package/dist/esm/drawingSvg/drawLinkedTextBox.js.map +1 -1
- package/dist/esm/drawingSvg/drawPolyline.d.ts +8 -0
- package/dist/esm/drawingSvg/drawPolyline.js +44 -0
- package/dist/esm/drawingSvg/drawPolyline.js.map +1 -0
- package/dist/esm/drawingSvg/drawRect.d.ts +1 -1
- package/dist/esm/drawingSvg/drawRect.js +2 -2
- package/dist/esm/drawingSvg/drawRect.js.map +1 -1
- package/dist/esm/drawingSvg/drawTextBox.d.ts +1 -1
- package/dist/esm/drawingSvg/drawTextBox.js +4 -4
- package/dist/esm/drawingSvg/drawTextBox.js.map +1 -1
- package/dist/esm/drawingSvg/index.d.ts +3 -1
- package/dist/esm/drawingSvg/index.js +3 -1
- package/dist/esm/drawingSvg/index.js.map +1 -1
- package/dist/esm/index.d.ts +2 -2
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/stateManagement/annotation/config/annotationStyle.js +1 -1
- package/dist/esm/tools/CrosshairsTool.js +12 -12
- package/dist/esm/tools/CrosshairsTool.js.map +1 -1
- package/dist/esm/tools/annotation/ArrowAnnotateTool.d.ts +36 -0
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js +379 -0
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js.map +1 -0
- package/dist/esm/tools/annotation/BidirectionalTool.js +4 -4
- package/dist/esm/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/esm/tools/annotation/EllipticalROITool.js +3 -3
- package/dist/esm/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/esm/tools/annotation/LengthTool.js +4 -3
- package/dist/esm/tools/annotation/LengthTool.js.map +1 -1
- package/dist/esm/tools/annotation/PlanarFreehandROITool.d.ts +32 -0
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js +187 -0
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js.map +1 -0
- package/dist/esm/tools/annotation/ProbeTool.js +2 -2
- package/dist/esm/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/esm/tools/annotation/RectangleROITool.js +3 -3
- package/dist/esm/tools/annotation/RectangleROITool.js.map +1 -1
- package/dist/esm/tools/annotation/planarFreehandROITool/closedContourEditLoop.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/closedContourEditLoop.js +211 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/closedContourEditLoop.js.map +1 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js +177 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js.map +1 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/editLoopCommon.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/editLoopCommon.js +125 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/editLoopCommon.js.map +1 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEditLoop.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEditLoop.js +284 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEditLoop.js.map +1 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEndEditLoop.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEndEditLoop.js +41 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEndEditLoop.js.map +1 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js +97 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -0
- package/dist/esm/tools/index.d.ts +3 -1
- package/dist/esm/tools/index.js +3 -1
- package/dist/esm/tools/index.js.map +1 -1
- package/dist/esm/tools/segmentation/BrushTool.js +1 -1
- package/dist/esm/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/esm/tools/segmentation/CircleScissorsTool.js +1 -1
- package/dist/esm/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js +2 -2
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js +2 -2
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/SphereScissorsTool.js +1 -1
- package/dist/esm/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/esm/types/AnnotationTypes.d.ts +1 -0
- package/dist/esm/types/ToolSpecificAnnotationTypes.d.ts +50 -0
- package/dist/esm/utilities/math/index.d.ts +2 -1
- package/dist/esm/utilities/math/index.js +2 -1
- package/dist/esm/utilities/math/index.js.map +1 -1
- package/dist/esm/utilities/math/polyline/addCanvasPointsToArray.d.ts +4 -0
- package/dist/esm/utilities/math/polyline/addCanvasPointsToArray.js +34 -0
- package/dist/esm/utilities/math/polyline/addCanvasPointsToArray.js.map +1 -0
- package/dist/esm/utilities/math/polyline/calculateAreaOfPoints.d.ts +2 -0
- package/dist/esm/utilities/math/polyline/calculateAreaOfPoints.js +11 -0
- package/dist/esm/utilities/math/polyline/calculateAreaOfPoints.js.map +1 -0
- package/dist/esm/utilities/math/polyline/getIntersectionWithPolyline.d.ts +7 -0
- package/dist/esm/utilities/math/polyline/getIntersectionWithPolyline.js +106 -0
- package/dist/esm/utilities/math/polyline/getIntersectionWithPolyline.js.map +1 -0
- package/dist/esm/utilities/math/polyline/getSubPixelSpacingAndXYDirections.d.ts +7 -0
- package/dist/esm/utilities/math/polyline/getSubPixelSpacingAndXYDirections.js +65 -0
- package/dist/esm/utilities/math/polyline/getSubPixelSpacingAndXYDirections.js.map +1 -0
- package/dist/esm/utilities/math/polyline/index.d.ts +7 -0
- package/dist/esm/utilities/math/polyline/index.js +8 -0
- package/dist/esm/utilities/math/polyline/index.js.map +1 -0
- package/dist/esm/utilities/math/polyline/planarFreehandROIInternalTypes.d.ts +22 -0
- package/dist/esm/utilities/math/polyline/planarFreehandROIInternalTypes.js +2 -0
- package/dist/esm/utilities/math/polyline/planarFreehandROIInternalTypes.js.map +1 -0
- package/dist/esm/utilities/math/polyline/pointCanProjectOnLine.d.ts +3 -0
- package/dist/esm/utilities/math/polyline/pointCanProjectOnLine.js +33 -0
- package/dist/esm/utilities/math/polyline/pointCanProjectOnLine.js.map +1 -0
- package/dist/esm/utilities/math/polyline/pointsAreWithinCloseContourProximity.d.ts +3 -0
- package/dist/esm/utilities/math/polyline/pointsAreWithinCloseContourProximity.js +6 -0
- package/dist/esm/utilities/math/polyline/pointsAreWithinCloseContourProximity.js.map +1 -0
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
import { vec2 } from 'gl-matrix';
|
|
2
|
+
import { polyline } from '../../../utilities/math';
|
|
3
|
+
const { addCanvasPointsToArray, getFirstIntersectionWithPolyline } = polyline;
|
|
4
|
+
function checkForFirstCrossing(evt, isClosedContour) {
|
|
5
|
+
const eventDetail = evt.detail;
|
|
6
|
+
const { element, currentPoints, lastPoints } = eventDetail;
|
|
7
|
+
const canvasPos = currentPoints.canvas;
|
|
8
|
+
const lastCanvasPoint = lastPoints.canvas;
|
|
9
|
+
const { editCanvasPoints, prevCanvasPoints } = this.editData;
|
|
10
|
+
const crossedLineSegment = getFirstIntersectionWithPolyline(prevCanvasPoints, canvasPos, lastCanvasPoint, isClosedContour);
|
|
11
|
+
if (crossedLineSegment) {
|
|
12
|
+
this.editData.startCrossingIndex = crossedLineSegment[0];
|
|
13
|
+
this.removePointsUpUntilFirstCrossing(isClosedContour);
|
|
14
|
+
}
|
|
15
|
+
else if (editCanvasPoints.length >
|
|
16
|
+
this.configuration.checkCanvasEditFallbackProximity) {
|
|
17
|
+
const firstEditCanvasPoint = editCanvasPoints[0];
|
|
18
|
+
const distanceIndexPairs = [];
|
|
19
|
+
for (let i = 0; i < prevCanvasPoints.length; i++) {
|
|
20
|
+
const prevCanvasPoint = prevCanvasPoints[i];
|
|
21
|
+
const distance = vec2.distance(prevCanvasPoint, firstEditCanvasPoint);
|
|
22
|
+
distanceIndexPairs.push({ distance, index: i });
|
|
23
|
+
}
|
|
24
|
+
distanceIndexPairs.sort((a, b) => a.distance - b.distance);
|
|
25
|
+
const twoClosestDistanceIndexPairs = [
|
|
26
|
+
distanceIndexPairs[0],
|
|
27
|
+
distanceIndexPairs[1],
|
|
28
|
+
];
|
|
29
|
+
const lowestIndex = Math.min(twoClosestDistanceIndexPairs[0].index, twoClosestDistanceIndexPairs[1].index);
|
|
30
|
+
this.editData.startCrossingIndex = lowestIndex;
|
|
31
|
+
}
|
|
32
|
+
else if (editCanvasPoints.length >= 2) {
|
|
33
|
+
const dir = vec2.create();
|
|
34
|
+
vec2.subtract(dir, editCanvasPoints[1], editCanvasPoints[0]);
|
|
35
|
+
vec2.normalize(dir, dir);
|
|
36
|
+
const proximity = 6;
|
|
37
|
+
const extendedPoint = [
|
|
38
|
+
editCanvasPoints[0][0] - dir[0] * proximity,
|
|
39
|
+
editCanvasPoints[0][1] - dir[1] * proximity,
|
|
40
|
+
];
|
|
41
|
+
const crossedLineSegmentFromExtendedPoint = getFirstIntersectionWithPolyline(prevCanvasPoints, extendedPoint, editCanvasPoints[0], isClosedContour);
|
|
42
|
+
if (crossedLineSegmentFromExtendedPoint) {
|
|
43
|
+
const pointsToPrepend = [extendedPoint];
|
|
44
|
+
addCanvasPointsToArray(element, pointsToPrepend, editCanvasPoints[0], this.commonData);
|
|
45
|
+
editCanvasPoints.unshift(...pointsToPrepend);
|
|
46
|
+
this.removePointsUpUntilFirstCrossing(isClosedContour);
|
|
47
|
+
this.editData.editIndex = editCanvasPoints.length - 1;
|
|
48
|
+
this.editData.startCrossingIndex = crossedLineSegmentFromExtendedPoint[0];
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
function removePointsUpUntilFirstCrossing(isClosedContour) {
|
|
53
|
+
const { editCanvasPoints, prevCanvasPoints } = this.editData;
|
|
54
|
+
let numPointsToRemove = 0;
|
|
55
|
+
for (let i = 0; i < editCanvasPoints.length - 1; i++) {
|
|
56
|
+
const firstLine = [editCanvasPoints[i], editCanvasPoints[i + 1]];
|
|
57
|
+
const didCrossLine = !!getFirstIntersectionWithPolyline(prevCanvasPoints, firstLine[0], firstLine[1], isClosedContour);
|
|
58
|
+
numPointsToRemove++;
|
|
59
|
+
if (didCrossLine) {
|
|
60
|
+
break;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
editCanvasPoints.splice(0, numPointsToRemove);
|
|
64
|
+
this.editData.editIndex = editCanvasPoints.length - 1;
|
|
65
|
+
}
|
|
66
|
+
function checkForSecondCrossing(evt, isClosedContour) {
|
|
67
|
+
const eventDetail = evt.detail;
|
|
68
|
+
const { currentPoints, lastPoints } = eventDetail;
|
|
69
|
+
const canvasPos = currentPoints.canvas;
|
|
70
|
+
const lastCanvasPoint = lastPoints.canvas;
|
|
71
|
+
const { prevCanvasPoints } = this.editData;
|
|
72
|
+
const crossedLineSegment = getFirstIntersectionWithPolyline(prevCanvasPoints, canvasPos, lastCanvasPoint, isClosedContour);
|
|
73
|
+
if (!crossedLineSegment) {
|
|
74
|
+
return false;
|
|
75
|
+
}
|
|
76
|
+
return true;
|
|
77
|
+
}
|
|
78
|
+
function removePointsAfterSecondCrossing(isClosedContour) {
|
|
79
|
+
const { prevCanvasPoints, editCanvasPoints } = this.editData;
|
|
80
|
+
for (let i = editCanvasPoints.length - 1; i > 0; i--) {
|
|
81
|
+
const lastLine = [editCanvasPoints[i], editCanvasPoints[i - 1]];
|
|
82
|
+
const didCrossLine = !!getFirstIntersectionWithPolyline(prevCanvasPoints, lastLine[0], lastLine[1], isClosedContour);
|
|
83
|
+
editCanvasPoints.pop();
|
|
84
|
+
if (didCrossLine) {
|
|
85
|
+
break;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
function findSnapIndex() {
|
|
90
|
+
const { editCanvasPoints, prevCanvasPoints, startCrossingIndex } = this.editData;
|
|
91
|
+
if (startCrossingIndex === undefined) {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
const lastEditCanvasPoint = editCanvasPoints[editCanvasPoints.length - 1];
|
|
95
|
+
const distanceIndexPairs = [];
|
|
96
|
+
for (let i = 0; i < prevCanvasPoints.length; i++) {
|
|
97
|
+
const prevCanvasPoint = prevCanvasPoints[i];
|
|
98
|
+
const distance = vec2.distance(prevCanvasPoint, lastEditCanvasPoint);
|
|
99
|
+
distanceIndexPairs.push({ distance, index: i });
|
|
100
|
+
}
|
|
101
|
+
distanceIndexPairs.sort((a, b) => a.distance - b.distance);
|
|
102
|
+
const editCanvasPointsLessLastOne = editCanvasPoints.slice(0, -1);
|
|
103
|
+
for (let i = 0; i < distanceIndexPairs.length; i++) {
|
|
104
|
+
const { index } = distanceIndexPairs[i];
|
|
105
|
+
const snapCanvasPosition = prevCanvasPoints[index];
|
|
106
|
+
const lastEditCanvasPoint = editCanvasPoints[editCanvasPoints.length - 1];
|
|
107
|
+
const crossedLineSegment = getFirstIntersectionWithPolyline(editCanvasPointsLessLastOne, snapCanvasPosition, lastEditCanvasPoint, false);
|
|
108
|
+
if (!crossedLineSegment) {
|
|
109
|
+
return index;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
return -1;
|
|
113
|
+
}
|
|
114
|
+
function registerEditLoopCommon(toolInstance) {
|
|
115
|
+
toolInstance.checkForFirstCrossing = checkForFirstCrossing.bind(toolInstance);
|
|
116
|
+
toolInstance.removePointsUpUntilFirstCrossing =
|
|
117
|
+
removePointsUpUntilFirstCrossing.bind(toolInstance);
|
|
118
|
+
toolInstance.checkForSecondCrossing =
|
|
119
|
+
checkForSecondCrossing.bind(toolInstance);
|
|
120
|
+
toolInstance.findSnapIndex = findSnapIndex.bind(toolInstance);
|
|
121
|
+
toolInstance.removePointsAfterSecondCrossing =
|
|
122
|
+
removePointsAfterSecondCrossing.bind(toolInstance);
|
|
123
|
+
}
|
|
124
|
+
export default registerEditLoopCommon;
|
|
125
|
+
//# sourceMappingURL=editLoopCommon.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"editLoopCommon.js","sourceRoot":"","sources":["../../../../../src/tools/annotation/planarFreehandROITool/editLoopCommon.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,284 @@
|
|
|
1
|
+
import { getEnabledElement } from '@cornerstonejs/core';
|
|
2
|
+
import { state } from '../../../store';
|
|
3
|
+
import { Events } from '../../../enums';
|
|
4
|
+
import { resetElementCursor, hideElementCursor, } from '../../../cursors/elementCursor';
|
|
5
|
+
import { vec3, vec2 } from 'gl-matrix';
|
|
6
|
+
import { polyline } from '../../../utilities/math';
|
|
7
|
+
import triggerAnnotationRenderForViewportIds from '../../../utilities/triggerAnnotationRenderForViewportIds';
|
|
8
|
+
const { addCanvasPointsToArray, getSubPixelSpacingAndXYDirections } = polyline;
|
|
9
|
+
function activateOpenContourEdit(evt, annotation, viewportIdsToRender) {
|
|
10
|
+
this.isEditingOpen = true;
|
|
11
|
+
const eventDetail = evt.detail;
|
|
12
|
+
const { currentPoints, element } = eventDetail;
|
|
13
|
+
const canvasPos = currentPoints.canvas;
|
|
14
|
+
const enabledElement = getEnabledElement(element);
|
|
15
|
+
const { viewport } = enabledElement;
|
|
16
|
+
const prevCanvasPoints = annotation.data.polyline.map(viewport.worldToCanvas);
|
|
17
|
+
const { spacing, xDir, yDir } = getSubPixelSpacingAndXYDirections(viewport, this.configuration.subPixelResolution);
|
|
18
|
+
this.editData = {
|
|
19
|
+
prevCanvasPoints,
|
|
20
|
+
editCanvasPoints: [canvasPos],
|
|
21
|
+
startCrossingIndex: undefined,
|
|
22
|
+
editIndex: 0,
|
|
23
|
+
};
|
|
24
|
+
this.commonData = {
|
|
25
|
+
annotation,
|
|
26
|
+
viewportIdsToRender,
|
|
27
|
+
spacing,
|
|
28
|
+
xDir,
|
|
29
|
+
yDir,
|
|
30
|
+
};
|
|
31
|
+
state.isInteractingWithTool = true;
|
|
32
|
+
element.addEventListener(Events.MOUSE_UP, this.mouseUpOpenContourEditCallback);
|
|
33
|
+
element.addEventListener(Events.MOUSE_DRAG, this.mouseDragOpenContourEditCallback);
|
|
34
|
+
element.addEventListener(Events.MOUSE_CLICK, this.mouseUpOpenContourEditCallback);
|
|
35
|
+
hideElementCursor(element);
|
|
36
|
+
}
|
|
37
|
+
function deactivateOpenContourEdit(element) {
|
|
38
|
+
state.isInteractingWithTool = false;
|
|
39
|
+
element.removeEventListener(Events.MOUSE_UP, this.mouseUpOpenContourEditCallback);
|
|
40
|
+
element.removeEventListener(Events.MOUSE_DRAG, this.mouseDragOpenContourEditCallback);
|
|
41
|
+
element.removeEventListener(Events.MOUSE_CLICK, this.mouseUpOpenContourEditCallback);
|
|
42
|
+
resetElementCursor(element);
|
|
43
|
+
}
|
|
44
|
+
function mouseDragOpenContourEditCallback(evt) {
|
|
45
|
+
const eventDetail = evt.detail;
|
|
46
|
+
const { currentPoints, element } = eventDetail;
|
|
47
|
+
const worldPos = currentPoints.world;
|
|
48
|
+
const canvasPos = currentPoints.canvas;
|
|
49
|
+
const enabledElement = getEnabledElement(element);
|
|
50
|
+
const { renderingEngine, viewport } = enabledElement;
|
|
51
|
+
const { viewportIdsToRender, xDir, yDir, spacing } = this.commonData;
|
|
52
|
+
const { editIndex, editCanvasPoints, startCrossingIndex } = this.editData;
|
|
53
|
+
const lastCanvasPoint = editCanvasPoints[editCanvasPoints.length - 1];
|
|
54
|
+
const lastWorldPoint = viewport.canvasToWorld(lastCanvasPoint);
|
|
55
|
+
const worldPosDiff = vec3.create();
|
|
56
|
+
vec3.subtract(worldPosDiff, worldPos, lastWorldPoint);
|
|
57
|
+
const xDist = Math.abs(vec3.dot(worldPosDiff, xDir));
|
|
58
|
+
const yDist = Math.abs(vec3.dot(worldPosDiff, yDir));
|
|
59
|
+
if (xDist <= spacing[0] && yDist <= spacing[1]) {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
const numPointsAdded = addCanvasPointsToArray(element, editCanvasPoints, canvasPos, this.commonData);
|
|
63
|
+
const currentEditIndex = editIndex + numPointsAdded;
|
|
64
|
+
this.editData.editIndex = currentEditIndex;
|
|
65
|
+
if (startCrossingIndex === undefined && editCanvasPoints.length > 1) {
|
|
66
|
+
this.checkForFirstCrossing(evt, false);
|
|
67
|
+
}
|
|
68
|
+
this.editData.snapIndex = this.findSnapIndex();
|
|
69
|
+
this.editData.fusedCanvasPoints = this.fuseEditPointsWithOpenContour(evt);
|
|
70
|
+
if (startCrossingIndex !== undefined &&
|
|
71
|
+
this.checkForSecondCrossing(evt, false)) {
|
|
72
|
+
this.removePointsAfterSecondCrossing(false);
|
|
73
|
+
this.finishEditOpenOnSecondCrossing(evt);
|
|
74
|
+
}
|
|
75
|
+
else if (this.checkIfShouldOverwriteAnEnd(evt)) {
|
|
76
|
+
this.openContourEditOverwriteEnd(evt);
|
|
77
|
+
}
|
|
78
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
|
|
79
|
+
}
|
|
80
|
+
function openContourEditOverwriteEnd(evt) {
|
|
81
|
+
const eventDetail = evt.detail;
|
|
82
|
+
const { element } = eventDetail;
|
|
83
|
+
const enabledElement = getEnabledElement(element);
|
|
84
|
+
const { viewport } = enabledElement;
|
|
85
|
+
const { annotation, viewportIdsToRender } = this.commonData;
|
|
86
|
+
const fusedCanvasPoints = this.fuseEditPointsForOpenContourEndEdit();
|
|
87
|
+
const worldPoints = fusedCanvasPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
|
|
88
|
+
annotation.data.polyline = worldPoints;
|
|
89
|
+
annotation.data.isOpenContour = true;
|
|
90
|
+
annotation.data.handles.points = [
|
|
91
|
+
worldPoints[0],
|
|
92
|
+
worldPoints[worldPoints.length - 1],
|
|
93
|
+
];
|
|
94
|
+
annotation.data.handles.activeHandleIndex = 1;
|
|
95
|
+
this.triggerAnnotationModified(annotation, enabledElement);
|
|
96
|
+
this.isEditingOpen = false;
|
|
97
|
+
this.editData = undefined;
|
|
98
|
+
this.commonData = undefined;
|
|
99
|
+
this.deactivateOpenContourEdit(element);
|
|
100
|
+
this.activateOpenContourEndEdit(evt, annotation, viewportIdsToRender);
|
|
101
|
+
}
|
|
102
|
+
function checkIfShouldOverwriteAnEnd(evt) {
|
|
103
|
+
const eventDetail = evt.detail;
|
|
104
|
+
const { currentPoints, lastPoints } = eventDetail;
|
|
105
|
+
const canvasPos = currentPoints.canvas;
|
|
106
|
+
const lastCanvasPos = lastPoints.canvas;
|
|
107
|
+
const { snapIndex, prevCanvasPoints, startCrossingIndex } = this.editData;
|
|
108
|
+
if (startCrossingIndex === undefined || snapIndex === undefined) {
|
|
109
|
+
return false;
|
|
110
|
+
}
|
|
111
|
+
if (snapIndex === -1) {
|
|
112
|
+
return true;
|
|
113
|
+
}
|
|
114
|
+
if (snapIndex !== 0 && snapIndex !== prevCanvasPoints.length - 1) {
|
|
115
|
+
return false;
|
|
116
|
+
}
|
|
117
|
+
const p1 = canvasPos;
|
|
118
|
+
const p2 = lastCanvasPos;
|
|
119
|
+
const p3 = prevCanvasPoints[snapIndex];
|
|
120
|
+
const a = vec2.create();
|
|
121
|
+
const b = vec2.create();
|
|
122
|
+
vec2.set(a, p1[0] - p2[0], p1[1] - p2[1]);
|
|
123
|
+
vec2.set(b, p1[0] - p3[0], p1[1] - p3[1]);
|
|
124
|
+
const aDotb = vec2.dot(a, b);
|
|
125
|
+
const magA = Math.sqrt(a[0] * a[0] + a[1] * a[1]);
|
|
126
|
+
const magB = Math.sqrt(b[0] * b[0] + b[1] * b[1]);
|
|
127
|
+
const theta = Math.acos(aDotb / (magA * magB));
|
|
128
|
+
if (theta < Math.PI / 2) {
|
|
129
|
+
return true;
|
|
130
|
+
}
|
|
131
|
+
return false;
|
|
132
|
+
}
|
|
133
|
+
function fuseEditPointsForOpenContourEndEdit() {
|
|
134
|
+
const { snapIndex, prevCanvasPoints, editCanvasPoints, startCrossingIndex } = this.editData;
|
|
135
|
+
const newCanvasPoints = [];
|
|
136
|
+
if (snapIndex === 0) {
|
|
137
|
+
for (let i = prevCanvasPoints.length - 1; i >= startCrossingIndex; i--) {
|
|
138
|
+
const canvasPoint = prevCanvasPoints[i];
|
|
139
|
+
newCanvasPoints.push([canvasPoint[0], canvasPoint[1]]);
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
for (let i = 0; i < startCrossingIndex; i++) {
|
|
144
|
+
const canvasPoint = prevCanvasPoints[i];
|
|
145
|
+
newCanvasPoints.push([canvasPoint[0], canvasPoint[1]]);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
const distanceBetweenCrossingIndexAndFirstPoint = vec2.distance(prevCanvasPoints[startCrossingIndex], editCanvasPoints[0]);
|
|
149
|
+
const distanceBetweenCrossingIndexAndLastPoint = vec2.distance(prevCanvasPoints[startCrossingIndex], editCanvasPoints[editCanvasPoints.length - 1]);
|
|
150
|
+
if (distanceBetweenCrossingIndexAndFirstPoint <
|
|
151
|
+
distanceBetweenCrossingIndexAndLastPoint) {
|
|
152
|
+
for (let i = 0; i < editCanvasPoints.length; i++) {
|
|
153
|
+
const canvasPoint = editCanvasPoints[i];
|
|
154
|
+
newCanvasPoints.push([canvasPoint[0], canvasPoint[1]]);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
for (let i = editCanvasPoints.length - 1; i >= 0; i--) {
|
|
159
|
+
const canvasPoint = editCanvasPoints[i];
|
|
160
|
+
newCanvasPoints.push([canvasPoint[0], canvasPoint[1]]);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
return newCanvasPoints;
|
|
164
|
+
}
|
|
165
|
+
function fuseEditPointsWithOpenContour(evt) {
|
|
166
|
+
const { prevCanvasPoints, editCanvasPoints, startCrossingIndex, snapIndex } = this.editData;
|
|
167
|
+
if (startCrossingIndex === undefined || snapIndex === undefined) {
|
|
168
|
+
return undefined;
|
|
169
|
+
}
|
|
170
|
+
const eventDetail = evt.detail;
|
|
171
|
+
const { element } = eventDetail;
|
|
172
|
+
const augmentedEditCanvasPoints = [...editCanvasPoints];
|
|
173
|
+
addCanvasPointsToArray(element, augmentedEditCanvasPoints, prevCanvasPoints[snapIndex], this.commonData);
|
|
174
|
+
if (augmentedEditCanvasPoints.length > editCanvasPoints.length) {
|
|
175
|
+
augmentedEditCanvasPoints.pop();
|
|
176
|
+
}
|
|
177
|
+
let lowIndex;
|
|
178
|
+
let highIndex;
|
|
179
|
+
if (startCrossingIndex > snapIndex) {
|
|
180
|
+
lowIndex = snapIndex;
|
|
181
|
+
highIndex = startCrossingIndex;
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
lowIndex = startCrossingIndex;
|
|
185
|
+
highIndex = snapIndex;
|
|
186
|
+
}
|
|
187
|
+
const distanceBetweenLowAndFirstPoint = vec2.distance(prevCanvasPoints[lowIndex], augmentedEditCanvasPoints[0]);
|
|
188
|
+
const distanceBetweenLowAndLastPoint = vec2.distance(prevCanvasPoints[lowIndex], augmentedEditCanvasPoints[augmentedEditCanvasPoints.length - 1]);
|
|
189
|
+
const distanceBetweenHighAndFirstPoint = vec2.distance(prevCanvasPoints[highIndex], augmentedEditCanvasPoints[0]);
|
|
190
|
+
const distanceBetweenHighAndLastPoint = vec2.distance(prevCanvasPoints[highIndex], augmentedEditCanvasPoints[augmentedEditCanvasPoints.length - 1]);
|
|
191
|
+
const pointsToRender = [];
|
|
192
|
+
for (let i = 0; i < lowIndex; i++) {
|
|
193
|
+
const canvasPoint = prevCanvasPoints[i];
|
|
194
|
+
pointsToRender.push([canvasPoint[0], canvasPoint[1]]);
|
|
195
|
+
}
|
|
196
|
+
const inPlaceDistance = distanceBetweenLowAndFirstPoint + distanceBetweenHighAndLastPoint;
|
|
197
|
+
const reverseDistance = distanceBetweenLowAndLastPoint + distanceBetweenHighAndFirstPoint;
|
|
198
|
+
if (inPlaceDistance < reverseDistance) {
|
|
199
|
+
for (let i = 0; i < augmentedEditCanvasPoints.length; i++) {
|
|
200
|
+
const canvasPoint = augmentedEditCanvasPoints[i];
|
|
201
|
+
pointsToRender.push([canvasPoint[0], canvasPoint[1]]);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
else {
|
|
205
|
+
for (let i = augmentedEditCanvasPoints.length - 1; i >= 0; i--) {
|
|
206
|
+
const canvasPoint = augmentedEditCanvasPoints[i];
|
|
207
|
+
pointsToRender.push([canvasPoint[0], canvasPoint[1]]);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
for (let i = highIndex; i < prevCanvasPoints.length; i++) {
|
|
211
|
+
const canvasPoint = prevCanvasPoints[i];
|
|
212
|
+
pointsToRender.push([canvasPoint[0], canvasPoint[1]]);
|
|
213
|
+
}
|
|
214
|
+
return pointsToRender;
|
|
215
|
+
}
|
|
216
|
+
function finishEditOpenOnSecondCrossing(evt) {
|
|
217
|
+
const eventDetail = evt.detail;
|
|
218
|
+
const { element } = eventDetail;
|
|
219
|
+
const enabledElement = getEnabledElement(element);
|
|
220
|
+
const { viewport, renderingEngine } = enabledElement;
|
|
221
|
+
const { annotation, viewportIdsToRender } = this.commonData;
|
|
222
|
+
const { fusedCanvasPoints, editCanvasPoints } = this.editData;
|
|
223
|
+
const worldPoints = fusedCanvasPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
|
|
224
|
+
annotation.data.polyline = worldPoints;
|
|
225
|
+
annotation.data.isOpenContour = true;
|
|
226
|
+
annotation.data.handles.points = [
|
|
227
|
+
worldPoints[0],
|
|
228
|
+
worldPoints[worldPoints.length - 1],
|
|
229
|
+
];
|
|
230
|
+
this.triggerAnnotationModified(annotation, enabledElement);
|
|
231
|
+
const lastEditCanvasPoint = editCanvasPoints.pop();
|
|
232
|
+
this.editData = {
|
|
233
|
+
prevCanvasPoints: fusedCanvasPoints,
|
|
234
|
+
editCanvasPoints: [lastEditCanvasPoint],
|
|
235
|
+
startCrossingIndex: undefined,
|
|
236
|
+
editIndex: 0,
|
|
237
|
+
};
|
|
238
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
|
|
239
|
+
}
|
|
240
|
+
function mouseUpOpenContourEditCallback(evt) {
|
|
241
|
+
const eventDetail = evt.detail;
|
|
242
|
+
const { element } = eventDetail;
|
|
243
|
+
const enabledElement = getEnabledElement(element);
|
|
244
|
+
const { viewport, renderingEngine } = enabledElement;
|
|
245
|
+
const { annotation, viewportIdsToRender } = this.commonData;
|
|
246
|
+
const { fusedCanvasPoints } = this.editData;
|
|
247
|
+
if (fusedCanvasPoints) {
|
|
248
|
+
const worldPoints = fusedCanvasPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
|
|
249
|
+
annotation.data.polyline = worldPoints;
|
|
250
|
+
annotation.data.isOpenContour = true;
|
|
251
|
+
annotation.data.handles.points = [
|
|
252
|
+
worldPoints[0],
|
|
253
|
+
worldPoints[worldPoints.length - 1],
|
|
254
|
+
];
|
|
255
|
+
this.triggerAnnotationModified(annotation, enabledElement);
|
|
256
|
+
}
|
|
257
|
+
this.isEditingOpen = false;
|
|
258
|
+
this.editData = undefined;
|
|
259
|
+
this.commonData = undefined;
|
|
260
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
|
|
261
|
+
this.deactivateOpenContourEdit(element);
|
|
262
|
+
}
|
|
263
|
+
function registerOpenContourEditLoop(toolInstance) {
|
|
264
|
+
toolInstance.activateOpenContourEdit =
|
|
265
|
+
activateOpenContourEdit.bind(toolInstance);
|
|
266
|
+
toolInstance.deactivateOpenContourEdit =
|
|
267
|
+
deactivateOpenContourEdit.bind(toolInstance);
|
|
268
|
+
toolInstance.mouseDragOpenContourEditCallback =
|
|
269
|
+
mouseDragOpenContourEditCallback.bind(toolInstance);
|
|
270
|
+
toolInstance.mouseUpOpenContourEditCallback =
|
|
271
|
+
mouseUpOpenContourEditCallback.bind(toolInstance);
|
|
272
|
+
toolInstance.fuseEditPointsWithOpenContour =
|
|
273
|
+
fuseEditPointsWithOpenContour.bind(toolInstance);
|
|
274
|
+
toolInstance.finishEditOpenOnSecondCrossing =
|
|
275
|
+
finishEditOpenOnSecondCrossing.bind(toolInstance);
|
|
276
|
+
toolInstance.checkIfShouldOverwriteAnEnd =
|
|
277
|
+
checkIfShouldOverwriteAnEnd.bind(toolInstance);
|
|
278
|
+
toolInstance.fuseEditPointsForOpenContourEndEdit =
|
|
279
|
+
fuseEditPointsForOpenContourEndEdit.bind(toolInstance);
|
|
280
|
+
toolInstance.openContourEditOverwriteEnd =
|
|
281
|
+
openContourEditOverwriteEnd.bind(toolInstance);
|
|
282
|
+
}
|
|
283
|
+
export default registerOpenContourEditLoop;
|
|
284
|
+
//# sourceMappingURL=openContourEditLoop.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openContourEditLoop.js","sourceRoot":"","sources":["../../../../../src/tools/annotation/planarFreehandROITool/openContourEditLoop.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { getEnabledElement } from '@cornerstonejs/core';
|
|
2
|
+
import { state } from '../../../store';
|
|
3
|
+
import { Events } from '../../../enums';
|
|
4
|
+
import { hideElementCursor } from '../../../cursors/elementCursor';
|
|
5
|
+
import { polyline } from '../../../utilities/math';
|
|
6
|
+
const { getSubPixelSpacingAndXYDirections } = polyline;
|
|
7
|
+
function activateOpenContourEndEdit(evt, annotation, viewportIdsToRender) {
|
|
8
|
+
this.isDrawing = true;
|
|
9
|
+
const eventDetail = evt.detail;
|
|
10
|
+
const { element } = eventDetail;
|
|
11
|
+
const enabledElement = getEnabledElement(element);
|
|
12
|
+
const { viewport } = enabledElement;
|
|
13
|
+
const { spacing, xDir, yDir } = getSubPixelSpacingAndXYDirections(viewport, this.configuration.subPixelResolution);
|
|
14
|
+
const canvasPoints = annotation.data.polyline.map(viewport.worldToCanvas);
|
|
15
|
+
const handleIndexGrabbed = annotation.data.handles.activeHandleIndex;
|
|
16
|
+
if (handleIndexGrabbed === 0) {
|
|
17
|
+
canvasPoints.reverse();
|
|
18
|
+
}
|
|
19
|
+
this.drawData = {
|
|
20
|
+
canvasPoints: canvasPoints,
|
|
21
|
+
polylineIndex: canvasPoints.length - 1,
|
|
22
|
+
};
|
|
23
|
+
this.commonData = {
|
|
24
|
+
annotation,
|
|
25
|
+
viewportIdsToRender,
|
|
26
|
+
spacing,
|
|
27
|
+
xDir,
|
|
28
|
+
yDir,
|
|
29
|
+
};
|
|
30
|
+
state.isInteractingWithTool = true;
|
|
31
|
+
element.addEventListener(Events.MOUSE_UP, this.mouseUpDrawCallback);
|
|
32
|
+
element.addEventListener(Events.MOUSE_DRAG, this.mouseDragDrawCallback);
|
|
33
|
+
element.addEventListener(Events.MOUSE_CLICK, this.mouseUpDrawCallback);
|
|
34
|
+
hideElementCursor(element);
|
|
35
|
+
}
|
|
36
|
+
function registerOpenContourEndEditLoop(toolInstance) {
|
|
37
|
+
toolInstance.activateOpenContourEndEdit =
|
|
38
|
+
activateOpenContourEndEdit.bind(toolInstance);
|
|
39
|
+
}
|
|
40
|
+
export default registerOpenContourEndEditLoop;
|
|
41
|
+
//# sourceMappingURL=openContourEndEditLoop.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openContourEndEditLoop.js","sourceRoot":"","sources":["../../../../../src/tools/annotation/planarFreehandROITool/openContourEndEditLoop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,MAAM,EAAE,iCAAiC,EAAE,GAAG,QAAQ,CAAC;AAMvD,SAAS,0BAA0B,CACjC,GAA0C,EAC1C,UAAsB,EACtB,mBAA6B;IAE7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IAEtB,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAChC,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,iCAAiC,CAC/D,QAAQ,EACR,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACtC,CAAC;IAEF,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC1E,MAAM,kBAAkB,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;IAIrE,IAAI,kBAAkB,KAAK,CAAC,EAAE;QAC5B,YAAY,CAAC,OAAO,EAAE,CAAC;KACxB;IAED,IAAI,CAAC,QAAQ,GAAG;QACd,YAAY,EAAE,YAAY;QAC1B,aAAa,EAAE,YAAY,CAAC,MAAM,GAAG,CAAC;KACvC,CAAC;IAEF,IAAI,CAAC,UAAU,GAAG;QAChB,UAAU;QACV,mBAAmB;QACnB,OAAO;QACP,IAAI;QACJ,IAAI;KACL,CAAC;IAEF,KAAK,CAAC,qBAAqB,GAAG,IAAI,CAAC;IAGnC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACpE,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACxE,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAEvE,iBAAiB,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC;AAKD,SAAS,8BAA8B,CAAC,YAAY;IAClD,YAAY,CAAC,0BAA0B;QACrC,0BAA0B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAClD,CAAC;AAED,eAAe,8BAA8B,CAAC"}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { Settings } from '@cornerstonejs/core';
|
|
2
|
+
import { drawHandles as drawHandlesSvg, drawPolyline as drawPolylineSvg, } from '../../../drawingSvg';
|
|
3
|
+
import { polyline } from '../../../utilities/math';
|
|
4
|
+
const { pointsAreWithinCloseContourProximity } = polyline;
|
|
5
|
+
function _getRenderingOptions(annotation) {
|
|
6
|
+
const settings = Settings.getObjectSettings(annotation, this.getToolName());
|
|
7
|
+
const lineWidth = this.getStyle(settings, 'lineWidth', annotation);
|
|
8
|
+
const color = this.getStyle(settings, 'color', annotation);
|
|
9
|
+
const isOpenContour = annotation.data.isOpenContour;
|
|
10
|
+
const options = {
|
|
11
|
+
color: color === undefined ? undefined : color,
|
|
12
|
+
width: lineWidth === undefined ? undefined : lineWidth,
|
|
13
|
+
connectLastToFirst: !isOpenContour,
|
|
14
|
+
};
|
|
15
|
+
return options;
|
|
16
|
+
}
|
|
17
|
+
function renderContour(enabledElement, svgDrawingHelper, annotation) {
|
|
18
|
+
if (annotation.data.isOpenContour) {
|
|
19
|
+
this.renderOpenContour(enabledElement, svgDrawingHelper, annotation);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
this.renderClosedContour(enabledElement, svgDrawingHelper, annotation);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function renderClosedContour(enabledElement, svgDrawingHelper, annotation) {
|
|
26
|
+
const { viewport } = enabledElement;
|
|
27
|
+
const options = this._getRenderingOptions(annotation);
|
|
28
|
+
const canvasPoints = annotation.data.polyline.map((worldPos) => viewport.worldToCanvas(worldPos));
|
|
29
|
+
const polylineUID = '1';
|
|
30
|
+
drawPolylineSvg(svgDrawingHelper, annotation.annotationUID, polylineUID, canvasPoints, options);
|
|
31
|
+
}
|
|
32
|
+
function renderOpenContour(enabledElement, svgDrawingHelper, annotation) {
|
|
33
|
+
const { viewport } = enabledElement;
|
|
34
|
+
const options = this._getRenderingOptions(annotation);
|
|
35
|
+
const canvasPoints = annotation.data.polyline.map((worldPos) => viewport.worldToCanvas(worldPos));
|
|
36
|
+
const polylineUID = '1';
|
|
37
|
+
drawPolylineSvg(svgDrawingHelper, annotation.annotationUID, polylineUID, canvasPoints, options);
|
|
38
|
+
const activeHandleIndex = annotation.data.handles.activeHandleIndex;
|
|
39
|
+
if (activeHandleIndex !== null) {
|
|
40
|
+
const handleGroupUID = '0';
|
|
41
|
+
const indexOfCanvasPoints = activeHandleIndex === 0 ? 0 : canvasPoints.length - 1;
|
|
42
|
+
const handlePoint = canvasPoints[indexOfCanvasPoints];
|
|
43
|
+
drawHandlesSvg(svgDrawingHelper, annotation.annotationUID, handleGroupUID, [handlePoint], { color: options.color });
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
function renderContourBeingDrawn(enabledElement, svgDrawingHelper, annotation) {
|
|
47
|
+
const options = this._getRenderingOptions(annotation);
|
|
48
|
+
const { allowOpenContours } = this.configuration;
|
|
49
|
+
const { canvasPoints } = this.drawData;
|
|
50
|
+
options.connectLastToFirst = false;
|
|
51
|
+
drawPolylineSvg(svgDrawingHelper, annotation.annotationUID, '1', canvasPoints, options);
|
|
52
|
+
if (allowOpenContours) {
|
|
53
|
+
const firstPoint = canvasPoints[0];
|
|
54
|
+
const lastPoint = canvasPoints[canvasPoints.length - 1];
|
|
55
|
+
if (pointsAreWithinCloseContourProximity(firstPoint, lastPoint, this.configuration.closeContourProximity)) {
|
|
56
|
+
drawPolylineSvg(svgDrawingHelper, annotation.annotationUID, '2', [lastPoint, firstPoint], options);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
const handleGroupUID = '0';
|
|
60
|
+
drawHandlesSvg(svgDrawingHelper, annotation.annotationUID, handleGroupUID, [firstPoint], { color: options.color, handleRadius: 2 });
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
function renderClosedContourBeingEdited(enabledElement, svgDrawingHelper, annotation) {
|
|
65
|
+
const { fusedCanvasPoints } = this.editData;
|
|
66
|
+
if (fusedCanvasPoints === undefined) {
|
|
67
|
+
this.renderClosedContour(enabledElement, svgDrawingHelper, annotation);
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
const options = this._getRenderingOptions(annotation);
|
|
71
|
+
const polylineUIDToRender = 'preview-1';
|
|
72
|
+
drawPolylineSvg(svgDrawingHelper, annotation.annotationUID, polylineUIDToRender, fusedCanvasPoints, options);
|
|
73
|
+
}
|
|
74
|
+
function renderOpenContourBeingEdited(enabledElement, svgDrawingHelper, annotation) {
|
|
75
|
+
const { fusedCanvasPoints } = this.editData;
|
|
76
|
+
if (fusedCanvasPoints === undefined) {
|
|
77
|
+
this.renderOpenContour(enabledElement, svgDrawingHelper, annotation);
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
const options = this._getRenderingOptions(annotation);
|
|
81
|
+
const polylineUIDToRender = 'preview-1';
|
|
82
|
+
drawPolylineSvg(svgDrawingHelper, annotation.annotationUID, polylineUIDToRender, fusedCanvasPoints, options);
|
|
83
|
+
}
|
|
84
|
+
function registerRenderMethods(toolInstance) {
|
|
85
|
+
toolInstance.renderContour = renderContour.bind(toolInstance);
|
|
86
|
+
toolInstance.renderClosedContour = renderClosedContour.bind(toolInstance);
|
|
87
|
+
toolInstance.renderOpenContour = renderOpenContour.bind(toolInstance);
|
|
88
|
+
toolInstance.renderContourBeingDrawn =
|
|
89
|
+
renderContourBeingDrawn.bind(toolInstance);
|
|
90
|
+
toolInstance.renderClosedContourBeingEdited =
|
|
91
|
+
renderClosedContourBeingEdited.bind(toolInstance);
|
|
92
|
+
toolInstance.renderOpenContourBeingEdited =
|
|
93
|
+
renderOpenContourBeingEdited.bind(toolInstance);
|
|
94
|
+
toolInstance._getRenderingOptions = _getRenderingOptions.bind(toolInstance);
|
|
95
|
+
}
|
|
96
|
+
export default registerRenderMethods;
|
|
97
|
+
//# sourceMappingURL=renderMethods.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"renderMethods.js","sourceRoot":"","sources":["../../../../../src/tools/annotation/planarFreehandROITool/renderMethods.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EACL,WAAW,IAAI,cAAc,EAC7B,YAAY,IAAI,eAAe,GAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,MAAM,EAAE,oCAAoC,EAAE,GAAG,QAAQ,CAAC;AAQ1D,SAAS,oBAAoB,CAC3B,UAAuC;IAEvC,MAAM,QAAQ,GAAG,QAAQ,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IAE5E,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IACnE,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IAE3D,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC;IAEpD,MAAM,OAAO,GAAG;QACd,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAS,KAAK;QACtD,KAAK,EAAE,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAS,SAAS;QAC9D,kBAAkB,EAAE,CAAC,aAAa;KACnC,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AAKD,SAAS,aAAa,CACpB,cAAqC,EACrC,gBAAqB,EACrB,UAAuC;IAEvC,IAAI,UAAU,CAAC,IAAI,CAAC,aAAa,EAAE;QACjC,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAC;KACtE;SAAM;QACL,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAC;KACxE;AACH,CAAC;AAKD,SAAS,mBAAmB,CAC1B,cAAqC,EACrC,gBAAqB,EACrB,UAAuC;IAEvC,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAOtD,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC7D,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CACjC,CAAC;IAEF,MAAM,WAAW,GAAG,GAAG,CAAC;IAExB,eAAe,CACb,gBAAgB,EAChB,UAAU,CAAC,aAAa,EACxB,WAAW,EACX,YAAY,EACZ,OAAO,CACR,CAAC;AACJ,CAAC;AAKD,SAAS,iBAAiB,CACxB,cAAqC,EACrC,gBAAqB,EACrB,UAAuC;IAEvC,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAEtD,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC7D,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CACjC,CAAC;IAEF,MAAM,WAAW,GAAG,GAAG,CAAC;IAExB,eAAe,CACb,gBAAgB,EAChB,UAAU,CAAC,aAAa,EACxB,WAAW,EACX,YAAY,EACZ,OAAO,CACR,CAAC;IAEF,MAAM,iBAAiB,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;IAEpE,IAAI,iBAAiB,KAAK,IAAI,EAAE;QAE9B,MAAM,cAAc,GAAG,GAAG,CAAC;QAI3B,MAAM,mBAAmB,GACvB,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;QAExD,MAAM,WAAW,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAC;QAEtD,cAAc,CACZ,gBAAgB,EAChB,UAAU,CAAC,aAAa,EACxB,cAAc,EACd,CAAC,WAAW,CAAC,EACb,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CACzB,CAAC;KACH;AACH,CAAC;AAMD,SAAS,uBAAuB,CAC9B,cAAqC,EACrC,gBAAqB,EACrB,UAAuC;IAEvC,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAEtD,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;IACjD,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;IAIvC,OAAO,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAEnC,eAAe,CACb,gBAAgB,EAChB,UAAU,CAAC,aAAa,EACxB,GAAG,EACH,YAAY,EACZ,OAAO,CACR,CAAC;IAEF,IAAI,iBAAiB,EAAE;QACrB,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAGxD,IACE,oCAAoC,CAClC,UAAU,EACV,SAAS,EACT,IAAI,CAAC,aAAa,CAAC,qBAAqB,CACzC,EACD;YAEA,eAAe,CACb,gBAAgB,EAChB,UAAU,CAAC,aAAa,EACxB,GAAG,EACH,CAAC,SAAS,EAAE,UAAU,CAAC,EACvB,OAAO,CACR,CAAC;SACH;aAAM;YAEL,MAAM,cAAc,GAAG,GAAG,CAAC;YAE3B,cAAc,CACZ,gBAAgB,EAChB,UAAU,CAAC,aAAa,EACxB,cAAc,EACd,CAAC,UAAU,CAAC,EACZ,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,CAC1C,CAAC;SACH;KACF;AACH,CAAC;AAKD,SAAS,8BAA8B,CACrC,cAAc,EACd,gBAAgB,EAChB,UAAU;IAEV,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;IAE5C,IAAI,iBAAiB,KAAK,SAAS,EAAE;QAEnC,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAC;QAEvE,OAAO;KACR;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAEtD,MAAM,mBAAmB,GAAG,WAAW,CAAC;IAExC,eAAe,CACb,gBAAgB,EAChB,UAAU,CAAC,aAAa,EACxB,mBAAmB,EACnB,iBAAiB,EACjB,OAAO,CACR,CAAC;AACJ,CAAC;AAKD,SAAS,4BAA4B,CACnC,cAAqC,EACrC,gBAAqB,EACrB,UAAuC;IAEvC,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;IAE5C,IAAI,iBAAiB,KAAK,SAAS,EAAE;QAEnC,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAC;QAErE,OAAO;KACR;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAEtD,MAAM,mBAAmB,GAAG,WAAW,CAAC;IAExC,eAAe,CACb,gBAAgB,EAChB,UAAU,CAAC,aAAa,EACxB,mBAAmB,EACnB,iBAAiB,EACjB,OAAO,CACR,CAAC;AACJ,CAAC;AAKD,SAAS,qBAAqB,CAAC,YAAY;IACzC,YAAY,CAAC,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9D,YAAY,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1E,YAAY,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAEtE,YAAY,CAAC,uBAAuB;QAClC,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAE7C,YAAY,CAAC,8BAA8B;QACzC,8BAA8B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACpD,YAAY,CAAC,4BAA4B;QACvC,4BAA4B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClD,YAAY,CAAC,oBAAoB,GAAG,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAC9E,CAAC;AAED,eAAe,qBAAqB,CAAC"}
|
|
@@ -12,6 +12,8 @@ import LengthTool from './annotation/LengthTool';
|
|
|
12
12
|
import ProbeTool from './annotation/ProbeTool';
|
|
13
13
|
import RectangleROITool from './annotation/RectangleROITool';
|
|
14
14
|
import EllipticalROITool from './annotation/EllipticalROITool';
|
|
15
|
+
import PlanarFreehandROITool from './annotation/PlanarFreehandROITool';
|
|
16
|
+
import ArrowAnnotateTool from './annotation/ArrowAnnotateTool';
|
|
15
17
|
import SegmentationDisplayTool from './displayTools/SegmentationDisplayTool';
|
|
16
18
|
import RectangleScissorsTool from './segmentation/RectangleScissorsTool';
|
|
17
19
|
import CircleScissorsTool from './segmentation/CircleScissorsTool';
|
|
@@ -19,4 +21,4 @@ import SphereScissorsTool from './segmentation/SphereScissorsTool';
|
|
|
19
21
|
import RectangleROIThresholdTool from './segmentation/RectangleROIThresholdTool';
|
|
20
22
|
import RectangleROIStartEndThresholdTool from './segmentation/RectangleROIStartEndThresholdTool';
|
|
21
23
|
import BrushTool from './segmentation/BrushTool';
|
|
22
|
-
export { BaseTool, AnnotationTool, PanTool, WindowLevelTool, StackScrollTool, StackScrollMouseWheelTool, ZoomTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, CrosshairsTool, BidirectionalTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, BrushTool, };
|
|
24
|
+
export { BaseTool, AnnotationTool, PanTool, WindowLevelTool, StackScrollTool, StackScrollMouseWheelTool, ZoomTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, CrosshairsTool, BidirectionalTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, PlanarFreehandROITool, ArrowAnnotateTool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, BrushTool, };
|