@cornerstonejs/tools 0.11.0 → 0.13.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/cursors/SVGMouseCursor.js +2 -2
- package/dist/cjs/cursors/SVGMouseCursor.js.map +1 -1
- package/dist/cjs/drawingSvg/drawArrow.js +0 -2
- package/dist/cjs/drawingSvg/drawArrow.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/drawTextBox.js +9 -0
- package/dist/cjs/drawingSvg/drawTextBox.js.map +1 -1
- package/dist/cjs/drawingSvg/index.d.ts +2 -1
- package/dist/cjs/drawingSvg/index.js +3 -1
- package/dist/cjs/drawingSvg/index.js.map +1 -1
- package/dist/cjs/index.d.ts +2 -2
- package/dist/cjs/index.js +4 -2
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/config/ToolStyle.d.ts +18 -0
- package/dist/cjs/stateManagement/annotation/config/ToolStyle.js +129 -0
- package/dist/cjs/stateManagement/annotation/config/ToolStyle.js.map +1 -0
- package/dist/cjs/stateManagement/annotation/config/getFont.d.ts +2 -2
- package/dist/cjs/stateManagement/annotation/config/getFont.js +4 -6
- package/dist/cjs/stateManagement/annotation/config/getFont.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/config/helpers.d.ts +4 -0
- package/dist/cjs/stateManagement/annotation/config/helpers.js +26 -0
- package/dist/cjs/stateManagement/annotation/config/helpers.js.map +1 -0
- package/dist/cjs/stateManagement/annotation/config/index.d.ts +2 -5
- package/dist/cjs/stateManagement/annotation/config/index.js +3 -9
- package/dist/cjs/stateManagement/annotation/config/index.js.map +1 -1
- package/dist/cjs/stateManagement/index.d.ts +1 -4
- package/dist/cjs/stateManagement/index.js +1 -10
- package/dist/cjs/stateManagement/index.js.map +1 -1
- package/dist/cjs/tools/annotation/{ArrowTool.d.ts → ArrowAnnotateTool.d.ts} +2 -2
- package/dist/cjs/tools/annotation/{ArrowTool.js → ArrowAnnotateTool.js} +16 -11
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.js.map +1 -0
- package/dist/cjs/tools/annotation/BidirectionalTool.js +11 -8
- package/dist/cjs/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/cjs/tools/annotation/DragProbeTool.d.ts +23 -0
- package/dist/cjs/tools/annotation/DragProbeTool.js +109 -0
- package/dist/cjs/tools/annotation/DragProbeTool.js.map +1 -0
- package/dist/cjs/tools/annotation/EllipticalROITool.js +42 -30
- package/dist/cjs/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/LengthTool.js +11 -8
- 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 +191 -0
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js.map +1 -0
- package/dist/cjs/tools/annotation/ProbeTool.js +8 -4
- package/dist/cjs/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/cjs/tools/annotation/RectangleROITool.js +11 -8
- 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 +105 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -0
- package/dist/cjs/tools/base/AnnotationTool.d.ts +3 -3
- package/dist/cjs/tools/base/AnnotationTool.js +10 -10
- package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
- package/dist/cjs/tools/index.d.ts +4 -2
- package/dist/cjs/tools/index.js +7 -3
- package/dist/cjs/tools/index.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js +10 -7
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js +10 -7
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js +0 -3
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/cjs/types/AnnotationStyle.d.ts +29 -0
- package/dist/cjs/types/AnnotationStyle.js +3 -0
- package/dist/cjs/types/AnnotationStyle.js.map +1 -0
- package/dist/cjs/types/AnnotationTypes.d.ts +1 -0
- package/dist/cjs/types/ToolSpecificAnnotationTypes.d.ts +31 -0
- package/dist/cjs/types/index.d.ts +2 -1
- 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/cursors/SVGMouseCursor.js +2 -2
- package/dist/esm/cursors/SVGMouseCursor.js.map +1 -1
- package/dist/esm/drawingSvg/drawArrow.js +0 -2
- package/dist/esm/drawingSvg/drawArrow.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/drawTextBox.js +9 -0
- package/dist/esm/drawingSvg/drawTextBox.js.map +1 -1
- package/dist/esm/drawingSvg/index.d.ts +2 -1
- package/dist/esm/drawingSvg/index.js +2 -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/ToolStyle.d.ts +18 -0
- package/dist/esm/stateManagement/annotation/config/ToolStyle.js +136 -0
- package/dist/esm/stateManagement/annotation/config/ToolStyle.js.map +1 -0
- package/dist/esm/stateManagement/annotation/config/getFont.d.ts +2 -2
- package/dist/esm/stateManagement/annotation/config/getFont.js +4 -6
- package/dist/esm/stateManagement/annotation/config/getFont.js.map +1 -1
- package/dist/esm/stateManagement/annotation/config/helpers.d.ts +4 -0
- package/dist/esm/stateManagement/annotation/config/helpers.js +20 -0
- package/dist/esm/stateManagement/annotation/config/helpers.js.map +1 -0
- package/dist/esm/stateManagement/annotation/config/index.d.ts +2 -5
- package/dist/esm/stateManagement/annotation/config/index.js +2 -5
- package/dist/esm/stateManagement/annotation/config/index.js.map +1 -1
- package/dist/esm/stateManagement/index.d.ts +1 -4
- package/dist/esm/stateManagement/index.js +1 -4
- package/dist/esm/stateManagement/index.js.map +1 -1
- package/dist/esm/tools/annotation/{ArrowTool.d.ts → ArrowAnnotateTool.d.ts} +2 -2
- package/dist/esm/tools/annotation/{ArrowTool.js → ArrowAnnotateTool.js} +17 -12
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js.map +1 -0
- package/dist/esm/tools/annotation/BidirectionalTool.js +12 -9
- package/dist/esm/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/esm/tools/annotation/DragProbeTool.d.ts +23 -0
- package/dist/esm/tools/annotation/DragProbeTool.js +103 -0
- package/dist/esm/tools/annotation/DragProbeTool.js.map +1 -0
- package/dist/esm/tools/annotation/EllipticalROITool.js +43 -31
- package/dist/esm/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/esm/tools/annotation/LengthTool.js +12 -9
- 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 +186 -0
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js.map +1 -0
- package/dist/esm/tools/annotation/ProbeTool.js +9 -5
- package/dist/esm/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/esm/tools/annotation/RectangleROITool.js +12 -9
- 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 +103 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -0
- package/dist/esm/tools/base/AnnotationTool.d.ts +3 -3
- package/dist/esm/tools/base/AnnotationTool.js +10 -10
- package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
- package/dist/esm/tools/index.d.ts +4 -2
- package/dist/esm/tools/index.js +4 -2
- package/dist/esm/tools/index.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js +11 -8
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js +11 -8
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js +1 -4
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/esm/types/AnnotationStyle.d.ts +29 -0
- package/dist/esm/types/AnnotationStyle.js +2 -0
- package/dist/esm/types/AnnotationStyle.js.map +1 -0
- package/dist/esm/types/AnnotationTypes.d.ts +1 -0
- package/dist/esm/types/ToolSpecificAnnotationTypes.d.ts +31 -0
- package/dist/esm/types/index.d.ts +2 -1
- 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
- package/dist/cjs/stateManagement/annotation/config/annotationStyle.d.ts +0 -5
- package/dist/cjs/stateManagement/annotation/config/annotationStyle.js +0 -74
- package/dist/cjs/stateManagement/annotation/config/annotationStyle.js.map +0 -1
- package/dist/cjs/stateManagement/annotation/config/getStyle.d.ts +0 -2
- package/dist/cjs/stateManagement/annotation/config/getStyle.js +0 -22
- package/dist/cjs/stateManagement/annotation/config/getStyle.js.map +0 -1
- package/dist/cjs/stateManagement/annotation/config/setAnnotationStyle.d.ts +0 -2
- package/dist/cjs/stateManagement/annotation/config/setAnnotationStyle.js +0 -17
- package/dist/cjs/stateManagement/annotation/config/setAnnotationStyle.js.map +0 -1
- package/dist/cjs/stateManagement/annotation/config/setGlobalStyle.d.ts +0 -1
- package/dist/cjs/stateManagement/annotation/config/setGlobalStyle.js +0 -8
- package/dist/cjs/stateManagement/annotation/config/setGlobalStyle.js.map +0 -1
- package/dist/cjs/stateManagement/annotation/config/setToolStyle.d.ts +0 -1
- package/dist/cjs/stateManagement/annotation/config/setToolStyle.js +0 -17
- package/dist/cjs/stateManagement/annotation/config/setToolStyle.js.map +0 -1
- package/dist/cjs/tools/annotation/ArrowTool.js.map +0 -1
- package/dist/esm/stateManagement/annotation/config/annotationStyle.d.ts +0 -5
- package/dist/esm/stateManagement/annotation/config/annotationStyle.js +0 -70
- package/dist/esm/stateManagement/annotation/config/annotationStyle.js.map +0 -1
- package/dist/esm/stateManagement/annotation/config/getStyle.d.ts +0 -2
- package/dist/esm/stateManagement/annotation/config/getStyle.js +0 -16
- package/dist/esm/stateManagement/annotation/config/getStyle.js.map +0 -1
- package/dist/esm/stateManagement/annotation/config/setAnnotationStyle.d.ts +0 -2
- package/dist/esm/stateManagement/annotation/config/setAnnotationStyle.js +0 -12
- package/dist/esm/stateManagement/annotation/config/setAnnotationStyle.js.map +0 -1
- package/dist/esm/stateManagement/annotation/config/setGlobalStyle.d.ts +0 -1
- package/dist/esm/stateManagement/annotation/config/setGlobalStyle.js +0 -5
- package/dist/esm/stateManagement/annotation/config/setGlobalStyle.js.map +0 -1
- package/dist/esm/stateManagement/annotation/config/setToolStyle.d.ts +0 -1
- package/dist/esm/stateManagement/annotation/config/setToolStyle.js +0 -11
- package/dist/esm/stateManagement/annotation/config/setToolStyle.js.map +0 -1
- package/dist/esm/tools/annotation/ArrowTool.js.map +0 -1
|
@@ -0,0 +1,211 @@
|
|
|
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 { polyline } from '../../../utilities/math';
|
|
6
|
+
import { vec3, vec2 } from 'gl-matrix';
|
|
7
|
+
import triggerAnnotationRenderForViewportIds from '../../../utilities/triggerAnnotationRenderForViewportIds';
|
|
8
|
+
const { getSubPixelSpacingAndXYDirections, addCanvasPointsToArray, calculateAreaOfPoints, } = polyline;
|
|
9
|
+
function activateClosedContourEdit(evt, annotation, viewportIdsToRender) {
|
|
10
|
+
this.isEditingClosed = 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.mouseUpClosedContourEditCallback);
|
|
33
|
+
element.addEventListener(Events.MOUSE_DRAG, this.mouseDragClosedContourEditCallback);
|
|
34
|
+
element.addEventListener(Events.MOUSE_CLICK, this.mouseUpClosedContourEditCallback);
|
|
35
|
+
hideElementCursor(element);
|
|
36
|
+
}
|
|
37
|
+
function deactivateClosedContourEdit(element) {
|
|
38
|
+
state.isInteractingWithTool = false;
|
|
39
|
+
element.removeEventListener(Events.MOUSE_UP, this.mouseUpClosedContourEditCallback);
|
|
40
|
+
element.removeEventListener(Events.MOUSE_DRAG, this.mouseDragClosedContourEditCallback);
|
|
41
|
+
element.removeEventListener(Events.MOUSE_CLICK, this.mouseUpClosedContourEditCallback);
|
|
42
|
+
resetElementCursor(element);
|
|
43
|
+
}
|
|
44
|
+
function mouseDragClosedContourEditCallback(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, true);
|
|
67
|
+
}
|
|
68
|
+
this.editData.snapIndex = this.findSnapIndex();
|
|
69
|
+
if (this.editData.snapIndex === -1) {
|
|
70
|
+
this.finishEditAndStartNewEdit(evt);
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
this.editData.fusedCanvasPoints = this.fuseEditPointsWithClosedContour(evt);
|
|
74
|
+
if (startCrossingIndex !== undefined &&
|
|
75
|
+
this.checkForSecondCrossing(evt, true)) {
|
|
76
|
+
this.removePointsAfterSecondCrossing(true);
|
|
77
|
+
this.finishEditAndStartNewEdit(evt);
|
|
78
|
+
}
|
|
79
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
|
|
80
|
+
}
|
|
81
|
+
function finishEditAndStartNewEdit(evt) {
|
|
82
|
+
const eventDetail = evt.detail;
|
|
83
|
+
const { element } = eventDetail;
|
|
84
|
+
const enabledElement = getEnabledElement(element);
|
|
85
|
+
const { viewport, renderingEngine } = enabledElement;
|
|
86
|
+
const { annotation, viewportIdsToRender } = this.commonData;
|
|
87
|
+
const { fusedCanvasPoints, editCanvasPoints } = this.editData;
|
|
88
|
+
const worldPoints = fusedCanvasPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
|
|
89
|
+
annotation.data.polyline = worldPoints;
|
|
90
|
+
annotation.data.isOpenContour = false;
|
|
91
|
+
this.triggerAnnotationModified(annotation, enabledElement);
|
|
92
|
+
const lastEditCanvasPoint = editCanvasPoints.pop();
|
|
93
|
+
this.editData = {
|
|
94
|
+
prevCanvasPoints: fusedCanvasPoints,
|
|
95
|
+
editCanvasPoints: [lastEditCanvasPoint],
|
|
96
|
+
startCrossingIndex: undefined,
|
|
97
|
+
editIndex: 0,
|
|
98
|
+
snapIndex: undefined,
|
|
99
|
+
};
|
|
100
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
|
|
101
|
+
}
|
|
102
|
+
function fuseEditPointsWithClosedContour(evt) {
|
|
103
|
+
const { prevCanvasPoints, editCanvasPoints, startCrossingIndex, snapIndex } = this.editData;
|
|
104
|
+
if (startCrossingIndex === undefined || snapIndex === undefined) {
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
const eventDetail = evt.detail;
|
|
108
|
+
const { element } = eventDetail;
|
|
109
|
+
const augmentedEditCanvasPoints = [...editCanvasPoints];
|
|
110
|
+
addCanvasPointsToArray(element, augmentedEditCanvasPoints, prevCanvasPoints[snapIndex], this.commonData);
|
|
111
|
+
if (augmentedEditCanvasPoints.length > editCanvasPoints.length) {
|
|
112
|
+
augmentedEditCanvasPoints.pop();
|
|
113
|
+
}
|
|
114
|
+
let lowIndex;
|
|
115
|
+
let highIndex;
|
|
116
|
+
if (startCrossingIndex > snapIndex) {
|
|
117
|
+
lowIndex = snapIndex;
|
|
118
|
+
highIndex = startCrossingIndex;
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
lowIndex = startCrossingIndex;
|
|
122
|
+
highIndex = snapIndex;
|
|
123
|
+
}
|
|
124
|
+
const distanceBetweenLowAndFirstPoint = vec2.distance(prevCanvasPoints[lowIndex], augmentedEditCanvasPoints[0]);
|
|
125
|
+
const distanceBetweenLowAndLastPoint = vec2.distance(prevCanvasPoints[lowIndex], augmentedEditCanvasPoints[augmentedEditCanvasPoints.length - 1]);
|
|
126
|
+
const distanceBetweenHighAndFirstPoint = vec2.distance(prevCanvasPoints[highIndex], augmentedEditCanvasPoints[0]);
|
|
127
|
+
const distanceBetweenHighAndLastPoint = vec2.distance(prevCanvasPoints[highIndex], augmentedEditCanvasPoints[augmentedEditCanvasPoints.length - 1]);
|
|
128
|
+
const pointSet1 = [];
|
|
129
|
+
for (let i = 0; i < lowIndex; i++) {
|
|
130
|
+
const canvasPoint = prevCanvasPoints[i];
|
|
131
|
+
pointSet1.push([canvasPoint[0], canvasPoint[1]]);
|
|
132
|
+
}
|
|
133
|
+
let inPlaceDistance = distanceBetweenLowAndFirstPoint + distanceBetweenHighAndLastPoint;
|
|
134
|
+
let reverseDistance = distanceBetweenLowAndLastPoint + distanceBetweenHighAndFirstPoint;
|
|
135
|
+
if (inPlaceDistance < reverseDistance) {
|
|
136
|
+
for (let i = 0; i < augmentedEditCanvasPoints.length; i++) {
|
|
137
|
+
const canvasPoint = augmentedEditCanvasPoints[i];
|
|
138
|
+
pointSet1.push([canvasPoint[0], canvasPoint[1]]);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
for (let i = augmentedEditCanvasPoints.length - 1; i >= 0; i--) {
|
|
143
|
+
const canvasPoint = augmentedEditCanvasPoints[i];
|
|
144
|
+
pointSet1.push([canvasPoint[0], canvasPoint[1]]);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
for (let i = highIndex; i < prevCanvasPoints.length; i++) {
|
|
148
|
+
const canvasPoint = prevCanvasPoints[i];
|
|
149
|
+
pointSet1.push([canvasPoint[0], canvasPoint[1]]);
|
|
150
|
+
}
|
|
151
|
+
const pointSet2 = [];
|
|
152
|
+
for (let i = lowIndex; i < highIndex; i++) {
|
|
153
|
+
const canvasPoint = prevCanvasPoints[i];
|
|
154
|
+
pointSet2.push([canvasPoint[0], canvasPoint[1]]);
|
|
155
|
+
}
|
|
156
|
+
inPlaceDistance =
|
|
157
|
+
distanceBetweenHighAndFirstPoint + distanceBetweenLowAndLastPoint;
|
|
158
|
+
reverseDistance =
|
|
159
|
+
distanceBetweenHighAndLastPoint + distanceBetweenLowAndFirstPoint;
|
|
160
|
+
if (inPlaceDistance < reverseDistance) {
|
|
161
|
+
for (let i = 0; i < augmentedEditCanvasPoints.length; i++) {
|
|
162
|
+
const canvasPoint = augmentedEditCanvasPoints[i];
|
|
163
|
+
pointSet2.push([canvasPoint[0], canvasPoint[1]]);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
else {
|
|
167
|
+
for (let i = augmentedEditCanvasPoints.length - 1; i >= 0; i--) {
|
|
168
|
+
const canvasPoint = augmentedEditCanvasPoints[i];
|
|
169
|
+
pointSet2.push([canvasPoint[0], canvasPoint[1]]);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
const areaPointSet1 = calculateAreaOfPoints(pointSet1);
|
|
173
|
+
const areaPointSet2 = calculateAreaOfPoints(pointSet2);
|
|
174
|
+
const pointsToRender = areaPointSet1 > areaPointSet2 ? pointSet1 : pointSet2;
|
|
175
|
+
return pointsToRender;
|
|
176
|
+
}
|
|
177
|
+
function mouseUpClosedContourEditCallback(evt) {
|
|
178
|
+
const eventDetail = evt.detail;
|
|
179
|
+
const { element } = eventDetail;
|
|
180
|
+
const enabledElement = getEnabledElement(element);
|
|
181
|
+
const { viewport, renderingEngine } = enabledElement;
|
|
182
|
+
const { annotation, viewportIdsToRender } = this.commonData;
|
|
183
|
+
const { fusedCanvasPoints } = this.editData;
|
|
184
|
+
if (fusedCanvasPoints) {
|
|
185
|
+
const worldPoints = fusedCanvasPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
|
|
186
|
+
annotation.data.polyline = worldPoints;
|
|
187
|
+
annotation.data.isOpenContour = false;
|
|
188
|
+
this.triggerAnnotationModified(annotation, enabledElement);
|
|
189
|
+
}
|
|
190
|
+
this.isEditingClosed = false;
|
|
191
|
+
this.editData = undefined;
|
|
192
|
+
this.commonData = undefined;
|
|
193
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
|
|
194
|
+
this.deactivateClosedContourEdit(element);
|
|
195
|
+
}
|
|
196
|
+
function registerClosedContourEditLoop(toolInstance) {
|
|
197
|
+
toolInstance.activateClosedContourEdit =
|
|
198
|
+
activateClosedContourEdit.bind(toolInstance);
|
|
199
|
+
toolInstance.deactivateClosedContourEdit =
|
|
200
|
+
deactivateClosedContourEdit.bind(toolInstance);
|
|
201
|
+
toolInstance.mouseDragClosedContourEditCallback =
|
|
202
|
+
mouseDragClosedContourEditCallback.bind(toolInstance);
|
|
203
|
+
toolInstance.mouseUpClosedContourEditCallback =
|
|
204
|
+
mouseUpClosedContourEditCallback.bind(toolInstance);
|
|
205
|
+
toolInstance.finishEditAndStartNewEdit =
|
|
206
|
+
finishEditAndStartNewEdit.bind(toolInstance);
|
|
207
|
+
toolInstance.fuseEditPointsWithClosedContour =
|
|
208
|
+
fuseEditPointsWithClosedContour.bind(toolInstance);
|
|
209
|
+
}
|
|
210
|
+
export default registerClosedContourEditLoop;
|
|
211
|
+
//# sourceMappingURL=closedContourEditLoop.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"closedContourEditLoop.js","sourceRoot":"","sources":["../../../../../src/tools/annotation/planarFreehandROITool/closedContourEditLoop.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
import { getEnabledElement } from '@cornerstonejs/core';
|
|
2
|
+
import { resetElementCursor, hideElementCursor, } from '../../../cursors/elementCursor';
|
|
3
|
+
import { Events } from '../../../enums';
|
|
4
|
+
import { state } from '../../../store';
|
|
5
|
+
import { vec3 } from 'gl-matrix';
|
|
6
|
+
import triggerAnnotationRenderForViewportIds from '../../../utilities/triggerAnnotationRenderForViewportIds';
|
|
7
|
+
import { polyline } from '../../../utilities/math';
|
|
8
|
+
const { addCanvasPointsToArray, pointsAreWithinCloseContourProximity, getFirstIntersectionWithPolyline, getSubPixelSpacingAndXYDirections, } = polyline;
|
|
9
|
+
function activateDraw(evt, annotation, viewportIdsToRender) {
|
|
10
|
+
this.isDrawing = 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 { spacing, xDir, yDir } = getSubPixelSpacingAndXYDirections(viewport, this.configuration.subPixelResolution);
|
|
17
|
+
this.drawData = {
|
|
18
|
+
canvasPoints: [canvasPos],
|
|
19
|
+
polylineIndex: 0,
|
|
20
|
+
};
|
|
21
|
+
this.commonData = {
|
|
22
|
+
annotation,
|
|
23
|
+
viewportIdsToRender,
|
|
24
|
+
spacing,
|
|
25
|
+
xDir,
|
|
26
|
+
yDir,
|
|
27
|
+
};
|
|
28
|
+
state.isInteractingWithTool = true;
|
|
29
|
+
element.addEventListener(Events.MOUSE_UP, this.mouseUpDrawCallback);
|
|
30
|
+
element.addEventListener(Events.MOUSE_DRAG, this.mouseDragDrawCallback);
|
|
31
|
+
element.addEventListener(Events.MOUSE_CLICK, this.mouseUpDrawCallback);
|
|
32
|
+
hideElementCursor(element);
|
|
33
|
+
}
|
|
34
|
+
function deactivateDraw(element) {
|
|
35
|
+
state.isInteractingWithTool = false;
|
|
36
|
+
element.removeEventListener(Events.MOUSE_UP, this.mouseUpDrawCallback);
|
|
37
|
+
element.removeEventListener(Events.MOUSE_DRAG, this.mouseDragDrawCallback);
|
|
38
|
+
element.removeEventListener(Events.MOUSE_CLICK, this.mouseUpDrawCallback);
|
|
39
|
+
resetElementCursor(element);
|
|
40
|
+
}
|
|
41
|
+
function mouseDragDrawCallback(evt) {
|
|
42
|
+
const eventDetail = evt.detail;
|
|
43
|
+
const { currentPoints, element } = eventDetail;
|
|
44
|
+
const worldPos = currentPoints.world;
|
|
45
|
+
const canvasPos = currentPoints.canvas;
|
|
46
|
+
const enabledElement = getEnabledElement(element);
|
|
47
|
+
const { renderingEngine, viewport } = enabledElement;
|
|
48
|
+
const { viewportIdsToRender, xDir, yDir, spacing } = this.commonData;
|
|
49
|
+
const { polylineIndex, canvasPoints } = this.drawData;
|
|
50
|
+
const lastCanvasPoint = canvasPoints[canvasPoints.length - 1];
|
|
51
|
+
const lastWorldPoint = viewport.canvasToWorld(lastCanvasPoint);
|
|
52
|
+
const worldPosDiff = vec3.create();
|
|
53
|
+
vec3.subtract(worldPosDiff, worldPos, lastWorldPoint);
|
|
54
|
+
const xDist = Math.abs(vec3.dot(worldPosDiff, xDir));
|
|
55
|
+
const yDist = Math.abs(vec3.dot(worldPosDiff, yDir));
|
|
56
|
+
if (xDist <= spacing[0] && yDist <= spacing[1]) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
const crossingIndex = this.findCrossingIndexDuringCreate(evt);
|
|
60
|
+
if (crossingIndex !== undefined) {
|
|
61
|
+
this.applyCreateOnCross(evt, crossingIndex);
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
const numPointsAdded = addCanvasPointsToArray(element, canvasPoints, canvasPos, this.commonData);
|
|
65
|
+
this.drawData.polylineIndex = polylineIndex + numPointsAdded;
|
|
66
|
+
}
|
|
67
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
|
|
68
|
+
}
|
|
69
|
+
function mouseUpDrawCallback(evt) {
|
|
70
|
+
const { allowOpenContours } = this.configuration;
|
|
71
|
+
const { canvasPoints } = this.drawData;
|
|
72
|
+
const firstPoint = canvasPoints[0];
|
|
73
|
+
const lastPoint = canvasPoints[canvasPoints.length - 1];
|
|
74
|
+
if (allowOpenContours &&
|
|
75
|
+
!pointsAreWithinCloseContourProximity(firstPoint, lastPoint, this.configuration.closeContourProximity)) {
|
|
76
|
+
this.completeDrawOpenContour(evt);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
this.completeDrawClosedContour(evt);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
function completeDrawClosedContour(evt) {
|
|
83
|
+
this.removeCrossedLinesOnCompleteDraw();
|
|
84
|
+
const { canvasPoints } = this.drawData;
|
|
85
|
+
const { annotation, viewportIdsToRender } = this.commonData;
|
|
86
|
+
const eventDetail = evt.detail;
|
|
87
|
+
const { element } = eventDetail;
|
|
88
|
+
const enabledElement = getEnabledElement(element);
|
|
89
|
+
const { viewport, renderingEngine } = enabledElement;
|
|
90
|
+
addCanvasPointsToArray(element, canvasPoints, canvasPoints[0], this.commonData);
|
|
91
|
+
canvasPoints.pop();
|
|
92
|
+
const worldPoints = canvasPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
|
|
93
|
+
annotation.data.polyline = worldPoints;
|
|
94
|
+
annotation.data.isOpenContour = false;
|
|
95
|
+
this.triggerAnnotationCompleted(annotation);
|
|
96
|
+
this.isDrawing = false;
|
|
97
|
+
this.drawData = undefined;
|
|
98
|
+
this.commonData = undefined;
|
|
99
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
|
|
100
|
+
this.deactivateDraw(element);
|
|
101
|
+
}
|
|
102
|
+
function removeCrossedLinesOnCompleteDraw() {
|
|
103
|
+
const { canvasPoints } = this.drawData;
|
|
104
|
+
const numPoints = canvasPoints.length;
|
|
105
|
+
const endToStart = [canvasPoints[0], canvasPoints[numPoints - 1]];
|
|
106
|
+
const canvasPointsMinusEnds = canvasPoints.slice(0, -1).slice(1);
|
|
107
|
+
const lineSegment = getFirstIntersectionWithPolyline(canvasPointsMinusEnds, endToStart[0], endToStart[1], false);
|
|
108
|
+
if (lineSegment) {
|
|
109
|
+
const indexToRemoveUpTo = lineSegment[1];
|
|
110
|
+
this.drawData.canvasPoints = canvasPoints.splice(0, indexToRemoveUpTo);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
function completeDrawOpenContour(evt) {
|
|
114
|
+
const { canvasPoints } = this.drawData;
|
|
115
|
+
const { annotation, viewportIdsToRender } = this.commonData;
|
|
116
|
+
const eventDetail = evt.detail;
|
|
117
|
+
const { element } = eventDetail;
|
|
118
|
+
const enabledElement = getEnabledElement(element);
|
|
119
|
+
const { viewport, renderingEngine } = enabledElement;
|
|
120
|
+
const worldPoints = canvasPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
|
|
121
|
+
annotation.data.polyline = worldPoints;
|
|
122
|
+
annotation.data.isOpenContour = true;
|
|
123
|
+
annotation.data.handles.points = [
|
|
124
|
+
worldPoints[0],
|
|
125
|
+
worldPoints[worldPoints.length - 1],
|
|
126
|
+
];
|
|
127
|
+
this.triggerAnnotationCompleted(annotation);
|
|
128
|
+
this.isDrawing = false;
|
|
129
|
+
this.drawData = undefined;
|
|
130
|
+
this.commonData = undefined;
|
|
131
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
|
|
132
|
+
this.deactivateDraw(element);
|
|
133
|
+
}
|
|
134
|
+
function findCrossingIndexDuringCreate(evt) {
|
|
135
|
+
const eventDetail = evt.detail;
|
|
136
|
+
const { currentPoints, lastPoints } = eventDetail;
|
|
137
|
+
const canvasPos = currentPoints.canvas;
|
|
138
|
+
const lastCanvasPoint = lastPoints.canvas;
|
|
139
|
+
const { canvasPoints } = this.drawData;
|
|
140
|
+
const pointsLessLastOne = canvasPoints.slice(0, -1);
|
|
141
|
+
const lineSegment = getFirstIntersectionWithPolyline(pointsLessLastOne, canvasPos, lastCanvasPoint, false);
|
|
142
|
+
if (lineSegment === undefined) {
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
const crossingIndex = lineSegment[0];
|
|
146
|
+
return crossingIndex;
|
|
147
|
+
}
|
|
148
|
+
function applyCreateOnCross(evt, crossingIndex) {
|
|
149
|
+
const eventDetail = evt.detail;
|
|
150
|
+
const { element } = eventDetail;
|
|
151
|
+
const { canvasPoints } = this.drawData;
|
|
152
|
+
const { annotation, viewportIdsToRender } = this.commonData;
|
|
153
|
+
addCanvasPointsToArray(element, canvasPoints, canvasPoints[crossingIndex], this.commonData);
|
|
154
|
+
canvasPoints.pop();
|
|
155
|
+
for (let i = 0; i < crossingIndex; i++) {
|
|
156
|
+
canvasPoints.shift();
|
|
157
|
+
}
|
|
158
|
+
this.completeDrawClosedContour(evt);
|
|
159
|
+
this.activateClosedContourEdit(evt, annotation, viewportIdsToRender);
|
|
160
|
+
}
|
|
161
|
+
function registerDrawLoop(toolInstance) {
|
|
162
|
+
toolInstance.activateDraw = activateDraw.bind(toolInstance);
|
|
163
|
+
toolInstance.deactivateDraw = deactivateDraw.bind(toolInstance);
|
|
164
|
+
toolInstance.applyCreateOnCross = applyCreateOnCross.bind(toolInstance);
|
|
165
|
+
toolInstance.findCrossingIndexDuringCreate =
|
|
166
|
+
findCrossingIndexDuringCreate.bind(toolInstance);
|
|
167
|
+
toolInstance.completeDrawOpenContour =
|
|
168
|
+
completeDrawOpenContour.bind(toolInstance);
|
|
169
|
+
toolInstance.removeCrossedLinesOnCompleteDraw =
|
|
170
|
+
removeCrossedLinesOnCompleteDraw.bind(toolInstance);
|
|
171
|
+
toolInstance.mouseDragDrawCallback = mouseDragDrawCallback.bind(toolInstance);
|
|
172
|
+
toolInstance.mouseUpDrawCallback = mouseUpDrawCallback.bind(toolInstance);
|
|
173
|
+
toolInstance.completeDrawClosedContour =
|
|
174
|
+
completeDrawClosedContour.bind(toolInstance);
|
|
175
|
+
}
|
|
176
|
+
export default registerDrawLoop;
|
|
177
|
+
//# sourceMappingURL=drawLoop.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"drawLoop.js","sourceRoot":"","sources":["../../../../../src/tools/annotation/planarFreehandROITool/drawLoop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EACL,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,qCAAqC,MAAM,0DAA0D,CAAC;AAE7G,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,MAAM,EACJ,sBAAsB,EACtB,oCAAoC,EACpC,gCAAgC,EAChC,iCAAiC,GAClC,GAAG,QAAQ,CAAC;AAKb,SAAS,YAAY,CACnB,GAA0C,EAC1C,UAAuC,EACvC,mBAA6B;IAE7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IAEtB,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAC/C,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC;IACvC,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,IAAI,CAAC,QAAQ,GAAG;QACd,YAAY,EAAE,CAAC,SAAS,CAAC;QACzB,aAAa,EAAE,CAAC;KACjB,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;IAEnC,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;AAID,SAAS,cAAc,CAAC,OAAuB;IAC7C,KAAK,CAAC,qBAAqB,GAAG,KAAK,CAAC;IAEpC,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACvE,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC3E,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAE1E,kBAAkB,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAMD,SAAS,qBAAqB,CAC5B,GAAkE;IAElE,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAC/C,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC;IACrC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC;IACvC,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAErD,MAAM,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;IACrE,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;IAEtD,MAAM,eAAe,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC9D,MAAM,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAEnC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;IAEtD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IACrD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IAGrD,IAAI,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;QAE9C,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,6BAA6B,CAAC,GAAG,CAAC,CAAC;IAE9D,IAAI,aAAa,KAAK,SAAS,EAAE;QAG/B,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;KAC7C;SAAM;QACL,MAAM,cAAc,GAAG,sBAAsB,CAC3C,OAAO,EACP,YAAY,EACZ,SAAS,EACT,IAAI,CAAC,UAAU,CAChB,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,aAAa,GAAG,aAAa,GAAG,cAAc,CAAC;KAC9D;IAED,qCAAqC,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;AAC9E,CAAC;AAQD,SAAS,mBAAmB,CAC1B,GAAiE;IAEjE,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;IACjD,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;IACvC,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAExD,IACE,iBAAiB;QACjB,CAAC,oCAAoC,CACnC,UAAU,EACV,SAAS,EACT,IAAI,CAAC,aAAa,CAAC,qBAAqB,CACzC,EACD;QACA,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;KACnC;SAAM;QACL,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;KACrC;AACH,CAAC;AAKD,SAAS,yBAAyB,CAChC,GAGiC;IAEjC,IAAI,CAAC,gCAAgC,EAAE,CAAC;IACxC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;IACvC,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;IAC5D,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,eAAe,EAAE,GAAG,cAAc,CAAC;IAGrD,sBAAsB,CACpB,OAAO,EACP,YAAY,EACZ,YAAY,CAAC,CAAC,CAAC,EACf,IAAI,CAAC,UAAU,CAChB,CAAC;IAEF,YAAY,CAAC,GAAG,EAAE,CAAC;IAKnB,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CACnD,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,CACpC,CAAC;IAEF,UAAU,CAAC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;IACvC,UAAU,CAAC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAEtC,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC;IAE5C,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACvB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC1B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAE5B,qCAAqC,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;IAE5E,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC;AAMD,SAAS,gCAAgC;IACvC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;IACvC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC;IAEtC,MAAM,UAAU,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,qBAAqB,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEjE,MAAM,WAAW,GAAG,gCAAgC,CAClD,qBAAqB,EACrB,UAAU,CAAC,CAAC,CAAC,EACb,UAAU,CAAC,CAAC,CAAC,EACb,KAAK,CACN,CAAC;IAEF,IAAI,WAAW,EAAE;QACf,MAAM,iBAAiB,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAEzC,IAAI,CAAC,QAAQ,CAAC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;KACxE;AACH,CAAC;AAKD,SAAS,uBAAuB,CAC9B,GAGiC;IAEjC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;IACvC,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;IAC5D,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,eAAe,EAAE,GAAG,cAAc,CAAC;IAKrD,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CACnD,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,CACpC,CAAC;IAEF,UAAU,CAAC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;IACvC,UAAU,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAIrC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG;QAC/B,WAAW,CAAC,CAAC,CAAC;QACd,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;KACpC,CAAC;IAEF,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC;IAE5C,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACvB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC1B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAE5B,qCAAqC,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;IAE5E,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC;AAMD,SAAS,6BAA6B,CACpC,GAAkC;IAGlC,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IAClD,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC;IACvC,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC;IAE1C,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;IACvC,MAAM,iBAAiB,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAEpD,MAAM,WAAW,GAAG,gCAAgC,CAClD,iBAAiB,EACjB,SAAS,EACT,eAAe,EACf,KAAK,CACN,CAAC;IAEF,IAAI,WAAW,KAAK,SAAS,EAAE;QAC7B,OAAO;KACR;IAED,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAErC,OAAO,aAAa,CAAC;AACvB,CAAC;AAMD,SAAS,kBAAkB,CACzB,GAAkE,EAClE,aAAqB;IAErB,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAChC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;IACvC,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;IAG5D,sBAAsB,CACpB,OAAO,EACP,YAAY,EACZ,YAAY,CAAC,aAAa,CAAC,EAC3B,IAAI,CAAC,UAAU,CAChB,CAAC;IAEF,YAAY,CAAC,GAAG,EAAE,CAAC;IAGnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE;QACtC,YAAY,CAAC,KAAK,EAAE,CAAC;KACtB;IAED,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAC;AACvE,CAAC;AAKD,SAAS,gBAAgB,CAAC,YAAY;IACpC,YAAY,CAAC,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5D,YAAY,CAAC,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAEhE,YAAY,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACxE,YAAY,CAAC,6BAA6B;QACxC,6BAA6B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACnD,YAAY,CAAC,uBAAuB;QAClC,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC7C,YAAY,CAAC,gCAAgC;QAC3C,gCAAgC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtD,YAAY,CAAC,qBAAqB,GAAG,qBAAqB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9E,YAAY,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1E,YAAY,CAAC,yBAAyB;QACpC,yBAAyB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACjD,CAAC;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -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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"}
|