@cornerstonejs/tools 1.52.0 → 1.53.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/drawingSvg/drawPath.d.ts +11 -0
- package/dist/cjs/drawingSvg/drawPath.js +55 -0
- package/dist/cjs/drawingSvg/drawPath.js.map +1 -0
- package/dist/cjs/drawingSvg/drawPolyline.d.ts +1 -1
- package/dist/cjs/drawingSvg/drawPolyline.js +2 -10
- package/dist/cjs/drawingSvg/drawPolyline.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/eventDispatchers/shared/getActiveToolForMouseEvent.js.map +1 -1
- package/dist/cjs/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.d.ts +1 -1
- package/dist/cjs/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js +165 -78
- package/dist/cjs/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/annotationState.d.ts +6 -1
- package/dist/cjs/stateManagement/annotation/annotationState.js +49 -1
- package/dist/cjs/stateManagement/annotation/annotationState.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/helpers/state.d.ts +2 -1
- package/dist/cjs/stateManagement/annotation/helpers/state.js +14 -3
- package/dist/cjs/stateManagement/annotation/helpers/state.js.map +1 -1
- package/dist/cjs/stateManagement/index.d.ts +6 -1
- package/dist/cjs/stateManagement/index.js +6 -1
- package/dist/cjs/stateManagement/index.js.map +1 -1
- package/dist/cjs/store/ToolGroupManager/ToolGroup.d.ts +3 -1
- package/dist/cjs/store/ToolGroupManager/ToolGroup.js +3 -2
- package/dist/cjs/store/ToolGroupManager/ToolGroup.js.map +1 -1
- package/dist/cjs/tools/SegmentationIntersectionTool.js +1 -1
- package/dist/cjs/tools/SegmentationIntersectionTool.js.map +1 -1
- package/dist/cjs/tools/annotation/LivewireContourSegmentationTool.js +1 -1
- package/dist/cjs/tools/annotation/LivewireContourSegmentationTool.js.map +1 -1
- package/dist/cjs/tools/annotation/LivewireContourTool.d.ts +4 -3
- package/dist/cjs/tools/annotation/LivewireContourTool.js +26 -26
- package/dist/cjs/tools/annotation/LivewireContourTool.js.map +1 -1
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js +1 -0
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/SplineROITool.d.ts +6 -3
- package/dist/cjs/tools/annotation/SplineROITool.js +37 -18
- package/dist/cjs/tools/annotation/SplineROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/planarFreehandROITool/closedContourEditLoop.js +12 -7
- package/dist/cjs/tools/annotation/planarFreehandROITool/closedContourEditLoop.js.map +1 -1
- package/dist/cjs/tools/annotation/planarFreehandROITool/drawLoop.js +24 -18
- package/dist/cjs/tools/annotation/planarFreehandROITool/drawLoop.js.map +1 -1
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEditLoop.js +16 -10
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEditLoop.js.map +1 -1
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.js +19 -7
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -1
- package/dist/cjs/tools/annotation/splines/LinearSpline.js +1 -1
- package/dist/cjs/tools/annotation/splines/LinearSpline.js.map +1 -1
- package/dist/cjs/tools/annotation/splines/Spline.d.ts +2 -0
- package/dist/cjs/tools/annotation/splines/Spline.js +7 -3
- package/dist/cjs/tools/annotation/splines/Spline.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
- package/dist/cjs/tools/base/ContourBaseTool.d.ts +1 -0
- package/dist/cjs/tools/base/ContourBaseTool.js +18 -1
- package/dist/cjs/tools/base/ContourBaseTool.js.map +1 -1
- package/dist/cjs/tools/base/ContourSegmentationBaseTool.js +4 -0
- package/dist/cjs/tools/base/ContourSegmentationBaseTool.js.map +1 -1
- package/dist/cjs/tools/displayTools/Contour/contourConfig.js +1 -0
- package/dist/cjs/tools/displayTools/Contour/contourConfig.js.map +1 -1
- package/dist/cjs/types/AnnotationTypes.d.ts +2 -0
- package/dist/cjs/types/ContourAnnotation.d.ts +6 -0
- package/dist/cjs/types/ContourAnnotation.js +7 -0
- package/dist/cjs/types/ContourAnnotation.js.map +1 -1
- package/dist/cjs/types/ContourTypes.d.ts +1 -0
- package/dist/cjs/types/EventTypes.d.ts +4 -1
- package/dist/cjs/types/ISpline.d.ts +1 -0
- package/dist/cjs/types/SplineProps.d.ts +1 -0
- package/dist/cjs/utilities/contours/getContourHolesDataCanvas.d.ts +3 -0
- package/dist/cjs/utilities/contours/getContourHolesDataCanvas.js +21 -0
- package/dist/cjs/utilities/contours/getContourHolesDataCanvas.js.map +1 -0
- package/dist/cjs/utilities/contours/getContourHolesDataWorld.d.ts +3 -0
- package/dist/cjs/utilities/contours/getContourHolesDataWorld.js +10 -0
- package/dist/cjs/utilities/contours/getContourHolesDataWorld.js.map +1 -0
- package/dist/cjs/utilities/contours/index.d.ts +4 -1
- package/dist/cjs/utilities/contours/index.js +7 -1
- package/dist/cjs/utilities/contours/index.js.map +1 -1
- package/dist/cjs/utilities/contours/updateContourPolyline.d.ts +10 -0
- package/dist/cjs/utilities/contours/updateContourPolyline.js +64 -0
- package/dist/cjs/utilities/contours/updateContourPolyline.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/containsPoints.d.ts +2 -0
- package/dist/cjs/utilities/math/polyline/containsPoints.js +16 -0
- package/dist/cjs/utilities/math/polyline/containsPoints.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/getWindingDirection.d.ts +2 -0
- package/dist/cjs/utilities/math/polyline/getWindingDirection.js +12 -0
- package/dist/cjs/utilities/math/polyline/getWindingDirection.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/index.d.ts +3 -1
- package/dist/cjs/utilities/math/polyline/index.js +5 -1
- package/dist/cjs/utilities/math/polyline/index.js.map +1 -1
- package/dist/cjs/utilities/math/polyline/planarFreehandROIInternalTypes.d.ts +1 -0
- package/dist/esm/drawingSvg/drawPath.js +49 -0
- package/dist/esm/drawingSvg/drawPath.js.map +1 -0
- package/dist/esm/drawingSvg/drawPolyline.js +2 -10
- package/dist/esm/drawingSvg/drawPolyline.js.map +1 -1
- package/dist/esm/drawingSvg/index.js +2 -1
- package/dist/esm/drawingSvg/index.js.map +1 -1
- package/dist/esm/eventDispatchers/shared/getActiveToolForMouseEvent.js.map +1 -1
- package/dist/esm/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js +106 -32
- package/dist/esm/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js.map +1 -1
- package/dist/esm/stateManagement/annotation/annotationState.js +42 -1
- package/dist/esm/stateManagement/annotation/annotationState.js.map +1 -1
- package/dist/esm/stateManagement/annotation/helpers/state.js +12 -2
- package/dist/esm/stateManagement/annotation/helpers/state.js.map +1 -1
- package/dist/esm/stateManagement/index.js +2 -2
- package/dist/esm/stateManagement/index.js.map +1 -1
- package/dist/esm/store/ToolGroupManager/ToolGroup.js +3 -2
- package/dist/esm/store/ToolGroupManager/ToolGroup.js.map +1 -1
- package/dist/esm/tools/SegmentationIntersectionTool.js +1 -1
- package/dist/esm/tools/SegmentationIntersectionTool.js.map +1 -1
- package/dist/esm/tools/annotation/LivewireContourSegmentationTool.js +1 -1
- package/dist/esm/tools/annotation/LivewireContourSegmentationTool.js.map +1 -1
- package/dist/esm/tools/annotation/LivewireContourTool.js +28 -28
- package/dist/esm/tools/annotation/LivewireContourTool.js.map +1 -1
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js +2 -1
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js.map +1 -1
- package/dist/esm/tools/annotation/SplineROITool.js +37 -19
- package/dist/esm/tools/annotation/SplineROITool.js.map +1 -1
- package/dist/esm/tools/annotation/planarFreehandROITool/closedContourEditLoop.js +12 -7
- package/dist/esm/tools/annotation/planarFreehandROITool/closedContourEditLoop.js.map +1 -1
- package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js +25 -19
- package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js.map +1 -1
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEditLoop.js +16 -10
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEditLoop.js.map +1 -1
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js +20 -8
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -1
- package/dist/esm/tools/annotation/splines/LinearSpline.js +1 -1
- package/dist/esm/tools/annotation/splines/LinearSpline.js.map +1 -1
- package/dist/esm/tools/annotation/splines/Spline.js +5 -1
- package/dist/esm/tools/annotation/splines/Spline.js.map +1 -1
- package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
- package/dist/esm/tools/base/ContourBaseTool.js +20 -3
- package/dist/esm/tools/base/ContourBaseTool.js.map +1 -1
- package/dist/esm/tools/base/ContourSegmentationBaseTool.js +4 -0
- package/dist/esm/tools/base/ContourSegmentationBaseTool.js.map +1 -1
- package/dist/esm/tools/displayTools/Contour/contourConfig.js +1 -0
- package/dist/esm/tools/displayTools/Contour/contourConfig.js.map +1 -1
- package/dist/esm/types/ContourAnnotation.js +6 -1
- package/dist/esm/types/ContourAnnotation.js.map +1 -1
- package/dist/esm/utilities/contours/getContourHolesDataCanvas.js +15 -0
- package/dist/esm/utilities/contours/getContourHolesDataCanvas.js.map +1 -0
- package/dist/esm/utilities/contours/getContourHolesDataWorld.js +6 -0
- package/dist/esm/utilities/contours/getContourHolesDataWorld.js.map +1 -0
- package/dist/esm/utilities/contours/index.js +4 -1
- package/dist/esm/utilities/contours/index.js.map +1 -1
- package/dist/esm/utilities/contours/updateContourPolyline.js +38 -0
- package/dist/esm/utilities/contours/updateContourPolyline.js.map +1 -0
- package/dist/esm/utilities/math/polyline/containsPoints.js +10 -0
- package/dist/esm/utilities/math/polyline/containsPoints.js.map +1 -0
- package/dist/esm/utilities/math/polyline/getWindingDirection.js +6 -0
- package/dist/esm/utilities/math/polyline/getWindingDirection.js.map +1 -0
- package/dist/esm/utilities/math/polyline/index.js +3 -1
- package/dist/esm/utilities/math/polyline/index.js.map +1 -1
- package/dist/types/drawingSvg/drawPath.d.ts +12 -0
- package/dist/types/drawingSvg/drawPath.d.ts.map +1 -0
- package/dist/types/drawingSvg/drawPolyline.d.ts +1 -1
- package/dist/types/drawingSvg/drawPolyline.d.ts.map +1 -1
- package/dist/types/drawingSvg/index.d.ts +2 -1
- package/dist/types/drawingSvg/index.d.ts.map +1 -1
- package/dist/types/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.d.ts +1 -1
- package/dist/types/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.d.ts.map +1 -1
- package/dist/types/stateManagement/annotation/annotationState.d.ts +6 -1
- package/dist/types/stateManagement/annotation/annotationState.d.ts.map +1 -1
- package/dist/types/stateManagement/annotation/helpers/state.d.ts +2 -1
- package/dist/types/stateManagement/annotation/helpers/state.d.ts.map +1 -1
- package/dist/types/stateManagement/index.d.ts +6 -1
- package/dist/types/store/ToolGroupManager/ToolGroup.d.ts +3 -1
- package/dist/types/store/ToolGroupManager/ToolGroup.d.ts.map +1 -1
- package/dist/types/tools/annotation/LivewireContourTool.d.ts +4 -3
- package/dist/types/tools/annotation/LivewireContourTool.d.ts.map +1 -1
- package/dist/types/tools/annotation/PlanarFreehandROITool.d.ts.map +1 -1
- package/dist/types/tools/annotation/SplineROITool.d.ts +6 -3
- package/dist/types/tools/annotation/SplineROITool.d.ts.map +1 -1
- package/dist/types/tools/annotation/planarFreehandROITool/closedContourEditLoop.d.ts.map +1 -1
- package/dist/types/tools/annotation/planarFreehandROITool/drawLoop.d.ts.map +1 -1
- package/dist/types/tools/annotation/planarFreehandROITool/openContourEditLoop.d.ts.map +1 -1
- package/dist/types/tools/annotation/planarFreehandROITool/renderMethods.d.ts.map +1 -1
- package/dist/types/tools/annotation/splines/Spline.d.ts +2 -0
- package/dist/types/tools/annotation/splines/Spline.d.ts.map +1 -1
- package/dist/types/tools/base/AnnotationTool.d.ts.map +1 -1
- package/dist/types/tools/base/ContourBaseTool.d.ts +1 -0
- package/dist/types/tools/base/ContourBaseTool.d.ts.map +1 -1
- package/dist/types/tools/base/ContourSegmentationBaseTool.d.ts.map +1 -1
- package/dist/types/tools/displayTools/Contour/contourConfig.d.ts.map +1 -1
- package/dist/types/types/AnnotationTypes.d.ts +2 -0
- package/dist/types/types/AnnotationTypes.d.ts.map +1 -1
- package/dist/types/types/ContourAnnotation.d.ts +6 -0
- package/dist/types/types/ContourAnnotation.d.ts.map +1 -1
- package/dist/types/types/ContourTypes.d.ts +1 -0
- package/dist/types/types/ContourTypes.d.ts.map +1 -1
- package/dist/types/types/EventTypes.d.ts +4 -1
- package/dist/types/types/EventTypes.d.ts.map +1 -1
- package/dist/types/types/ISpline.d.ts +1 -0
- package/dist/types/types/ISpline.d.ts.map +1 -1
- package/dist/types/types/SplineProps.d.ts +1 -0
- package/dist/types/types/SplineProps.d.ts.map +1 -1
- package/dist/types/utilities/contours/getContourHolesDataCanvas.d.ts +4 -0
- package/dist/types/utilities/contours/getContourHolesDataCanvas.d.ts.map +1 -0
- package/dist/types/utilities/contours/getContourHolesDataWorld.d.ts +4 -0
- package/dist/types/utilities/contours/getContourHolesDataWorld.d.ts.map +1 -0
- package/dist/types/utilities/contours/index.d.ts +4 -1
- package/dist/types/utilities/contours/index.d.ts.map +1 -1
- package/dist/types/utilities/contours/updateContourPolyline.d.ts +11 -0
- package/dist/types/utilities/contours/updateContourPolyline.d.ts.map +1 -0
- package/dist/types/utilities/math/polyline/containsPoints.d.ts +3 -0
- package/dist/types/utilities/math/polyline/containsPoints.d.ts.map +1 -0
- package/dist/types/utilities/math/polyline/getWindingDirection.d.ts +3 -0
- package/dist/types/utilities/math/polyline/getWindingDirection.d.ts.map +1 -0
- package/dist/types/utilities/math/polyline/index.d.ts +3 -1
- package/dist/types/utilities/math/polyline/index.d.ts.map +1 -1
- package/dist/types/utilities/math/polyline/planarFreehandROIInternalTypes.d.ts +1 -0
- package/dist/types/utilities/math/polyline/planarFreehandROIInternalTypes.d.ts.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +3 -3
- package/src/drawingSvg/drawPath.ts +96 -0
- package/src/drawingSvg/drawPolyline.ts +12 -16
- package/src/drawingSvg/index.ts +2 -0
- package/src/eventDispatchers/shared/getActiveToolForMouseEvent.ts +1 -1
- package/src/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.ts +194 -58
- package/src/stateManagement/annotation/annotationState.ts +101 -0
- package/src/stateManagement/annotation/helpers/state.ts +29 -1
- package/src/stateManagement/index.js +10 -0
- package/src/store/ToolGroupManager/ToolGroup.ts +9 -2
- package/src/tools/SegmentationIntersectionTool.ts +1 -1
- package/src/tools/annotation/LivewireContourSegmentationTool.ts +1 -1
- package/src/tools/annotation/LivewireContourTool.ts +65 -38
- package/src/tools/annotation/PlanarFreehandROITool.ts +6 -1
- package/src/tools/annotation/SplineROITool.ts +75 -28
- package/src/tools/annotation/planarFreehandROITool/closedContourEditLoop.ts +20 -11
- package/src/tools/annotation/planarFreehandROITool/drawLoop.ts +40 -21
- package/src/tools/annotation/planarFreehandROITool/openContourEditLoop.ts +28 -13
- package/src/tools/annotation/planarFreehandROITool/renderMethods.ts +28 -10
- package/src/tools/annotation/splines/LinearSpline.ts +1 -1
- package/src/tools/annotation/splines/Spline.ts +13 -1
- package/src/tools/base/AnnotationTool.ts +1 -0
- package/src/tools/base/ContourBaseTool.ts +45 -3
- package/src/tools/base/ContourSegmentationBaseTool.ts +6 -0
- package/src/tools/displayTools/Contour/contourConfig.ts +1 -0
- package/src/types/AnnotationTypes.ts +14 -0
- package/src/types/ContourAnnotation.ts +13 -0
- package/src/types/ContourTypes.ts +3 -0
- package/src/types/EventTypes.ts +9 -0
- package/src/types/ISpline.ts +3 -0
- package/src/types/SplineProps.ts +10 -0
- package/src/utilities/contours/getContourHolesDataCanvas.ts +33 -0
- package/src/utilities/contours/getContourHolesDataWorld.ts +19 -0
- package/src/utilities/contours/index.ts +6 -0
- package/src/utilities/contours/updateContourPolyline.ts +74 -0
- package/src/utilities/math/polyline/containsPoint.ts +1 -1
- package/src/utilities/math/polyline/containsPoints.ts +22 -0
- package/src/utilities/math/polyline/getWindingDirection.ts +14 -0
- package/src/utilities/math/polyline/index.ts +4 -0
- package/src/utilities/math/polyline/planarFreehandROIInternalTypes.ts +1 -0
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { Types } from '@cornerstonejs/core';
|
|
2
|
+
import { SVGDrawingHelper } from '../types';
|
|
3
|
+
export default function drawPath(svgDrawingHelper: SVGDrawingHelper, annotationUID: string, pathUID: string, points: Types.Point2[] | Types.Point2[][], options: {
|
|
4
|
+
color?: string;
|
|
5
|
+
fillColor?: string;
|
|
6
|
+
fillOpacity?: number;
|
|
7
|
+
width?: number;
|
|
8
|
+
lineWidth?: number;
|
|
9
|
+
lineDash?: string;
|
|
10
|
+
closePath?: boolean;
|
|
11
|
+
}): void;
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const _getHash_1 = __importDefault(require("./_getHash"));
|
|
7
|
+
const setNewAttributesIfValid_1 = __importDefault(require("./setNewAttributesIfValid"));
|
|
8
|
+
const setAttributesIfNecessary_1 = __importDefault(require("./setAttributesIfNecessary"));
|
|
9
|
+
function drawPath(svgDrawingHelper, annotationUID, pathUID, points, options) {
|
|
10
|
+
const hasSubArrays = points.length && points[0].length && Array.isArray(points[0][0]);
|
|
11
|
+
const pointsArrays = hasSubArrays ? points : [points];
|
|
12
|
+
const { color = 'dodgerblue', width = 10, fillColor = 'none', fillOpacity = 0, lineWidth, lineDash, closePath = false, } = options;
|
|
13
|
+
const strokeWidth = lineWidth || width;
|
|
14
|
+
const svgns = 'http://www.w3.org/2000/svg';
|
|
15
|
+
const svgNodeHash = (0, _getHash_1.default)(annotationUID, 'path', pathUID);
|
|
16
|
+
const existingNode = svgDrawingHelper.getSvgNode(svgNodeHash);
|
|
17
|
+
let pointsAttribute = '';
|
|
18
|
+
for (let i = 0, numArrays = pointsArrays.length; i < numArrays; i++) {
|
|
19
|
+
const points = pointsArrays[i];
|
|
20
|
+
const numPoints = points.length;
|
|
21
|
+
if (numPoints < 2) {
|
|
22
|
+
continue;
|
|
23
|
+
}
|
|
24
|
+
for (let j = 0; j < numPoints; j++) {
|
|
25
|
+
const point = points[j];
|
|
26
|
+
const cmd = j ? 'L' : 'M';
|
|
27
|
+
pointsAttribute += `${cmd} ${point[0]},${point[1]} `;
|
|
28
|
+
}
|
|
29
|
+
if (closePath) {
|
|
30
|
+
pointsAttribute += 'Z ';
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
if (!pointsAttribute) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
const attributes = {
|
|
37
|
+
d: pointsAttribute,
|
|
38
|
+
stroke: color,
|
|
39
|
+
fill: fillColor,
|
|
40
|
+
'fill-opacity': fillOpacity,
|
|
41
|
+
'stroke-width': strokeWidth,
|
|
42
|
+
'stroke-dasharray': lineDash,
|
|
43
|
+
};
|
|
44
|
+
if (existingNode) {
|
|
45
|
+
(0, setAttributesIfNecessary_1.default)(attributes, existingNode);
|
|
46
|
+
svgDrawingHelper.setNodeTouched(svgNodeHash);
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
const newNode = document.createElementNS(svgns, 'path');
|
|
50
|
+
(0, setNewAttributesIfValid_1.default)(attributes, newNode);
|
|
51
|
+
svgDrawingHelper.appendNode(newNode, svgNodeHash);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
exports.default = drawPath;
|
|
55
|
+
//# sourceMappingURL=drawPath.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"drawPath.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawPath.ts"],"names":[],"mappings":";;;;;AACA,0DAAkC;AAClC,wFAAgE;AAChE,0FAAkE;AASlE,SAAwB,QAAQ,CAC9B,gBAAkC,EAClC,aAAqB,EACrB,OAAe,EACf,MAAyC,EACzC,OAQC;IAID,MAAM,YAAY,GAChB,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnE,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACtD,MAAM,EACJ,KAAK,GAAG,YAAY,EACpB,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,MAAM,EAClB,WAAW,GAAG,CAAC,EACf,SAAS,EACT,QAAQ,EACR,SAAS,GAAG,KAAK,GAClB,GAAG,OAAO,CAAC;IAGZ,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAEvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC9D,IAAI,eAAe,GAAG,EAAE,CAAC;IAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;QACnE,MAAM,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;QAEhC,IAAI,SAAS,GAAG,CAAC,EAAE;YACjB,SAAS;SACV;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;YAClC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YAE1B,eAAe,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;SACtD;QAED,IAAI,SAAS,EAAE;YACb,eAAe,IAAI,IAAI,CAAC;SACzB;KACF;IAED,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO;KACR;IAED,MAAM,UAAU,GAAG;QACjB,CAAC,EAAE,eAAe;QAClB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,SAAS;QACf,cAAc,EAAE,WAAW;QAC3B,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,YAAY,EAAE;QAEhB,IAAA,kCAAwB,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEnD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAExD,IAAA,iCAAuB,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC7C,gBAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;KACnD;AACH,CAAC;AAnFD,2BAmFC"}
|
|
@@ -10,15 +10,7 @@ function drawPolyline(svgDrawingHelper, annotationUID, polylineUID, points, opti
|
|
|
10
10
|
if (points.length < 2) {
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
13
|
-
const {
|
|
14
|
-
color: 'dodgerblue',
|
|
15
|
-
width: '2',
|
|
16
|
-
fillColor: 'none',
|
|
17
|
-
fillOpacity: 0,
|
|
18
|
-
lineWidth: undefined,
|
|
19
|
-
lineDash: undefined,
|
|
20
|
-
connectLastToFirst: false,
|
|
21
|
-
}, options);
|
|
13
|
+
const { color = 'dodgerblue', width = 10, fillColor = 'none', fillOpacity = 0, lineWidth, lineDash, closePath = false, } = options;
|
|
22
14
|
const strokeWidth = lineWidth || width;
|
|
23
15
|
const svgns = 'http://www.w3.org/2000/svg';
|
|
24
16
|
const svgNodeHash = (0, _getHash_1.default)(annotationUID, 'polyline', polylineUID);
|
|
@@ -27,7 +19,7 @@ function drawPolyline(svgDrawingHelper, annotationUID, polylineUID, points, opti
|
|
|
27
19
|
for (const point of points) {
|
|
28
20
|
pointsAttribute += `${point[0].toFixed(1)}, ${point[1].toFixed(1)} `;
|
|
29
21
|
}
|
|
30
|
-
if (
|
|
22
|
+
if (closePath) {
|
|
31
23
|
const firstPoint = points[0];
|
|
32
24
|
pointsAttribute += `${firstPoint[0]}, ${firstPoint[1]}`;
|
|
33
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawPolyline.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawPolyline.ts"],"names":[],"mappings":";;;;;AACA,0DAAkC;AAClC,wFAAgE;AAChE,0FAAkE;AASlE,SAAwB,YAAY,CAClC,gBAAkC,EAClC,aAAqB,EACrB,WAAmB,EACnB,MAAsB,EACtB,OAQC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,OAAO;KACR;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"drawPolyline.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawPolyline.ts"],"names":[],"mappings":";;;;;AACA,0DAAkC;AAClC,wFAAgE;AAChE,0FAAkE;AASlE,SAAwB,YAAY,CAClC,gBAAkC,EAClC,aAAqB,EACrB,WAAmB,EACnB,MAAsB,EACtB,OAQC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,OAAO;KACR;IAED,MAAM,EACJ,KAAK,GAAG,YAAY,EACpB,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,MAAM,EAClB,WAAW,GAAG,CAAC,EACf,SAAS,EACT,QAAQ,EACR,SAAS,GAAG,KAAK,GAClB,GAAG,OAAO,CAAC;IAGZ,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAEvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAAC,aAAa,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACrE,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,eAAe,GAAG,EAAE,CAAC;IAEzB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,eAAe,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;KACtE;IAED,IAAI,SAAS,EAAE;QACb,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAE7B,eAAe,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;KACzD;IAED,MAAM,UAAU,GAAG;QACjB,MAAM,EAAE,eAAe;QACvB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,SAAS;QACf,cAAc,EAAE,WAAW;QAC3B,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,gBAAgB,EAAE;QAEpB,IAAA,kCAAwB,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAEvD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAEhE,IAAA,iCAAuB,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAEjD,gBAAgB,CAAC,UAAU,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;KACvD;AACH,CAAC;AArED,+BAqEC"}
|
|
@@ -6,6 +6,7 @@ import drawHandles from './drawHandles';
|
|
|
6
6
|
import drawHandle from './drawHandle';
|
|
7
7
|
import drawLine from './drawLine';
|
|
8
8
|
import drawPolyline from './drawPolyline';
|
|
9
|
+
import drawPath from './drawPath';
|
|
9
10
|
import drawLinkedTextBox from './drawLinkedTextBox';
|
|
10
11
|
import drawRect from './drawRect';
|
|
11
12
|
import drawTextBox from './drawTextBox';
|
|
@@ -13,4 +14,4 @@ import drawArrow from './drawArrow';
|
|
|
13
14
|
import drawRedactionRect from './drawRedactionRect';
|
|
14
15
|
import setAttributesIfNecessary from './setAttributesIfNecessary';
|
|
15
16
|
import setNewAttributesIfValid from './setNewAttributesIfValid';
|
|
16
|
-
export { draw, drawCircle, drawEllipse, drawEllipseByCoordinates, drawHandles, drawHandle, drawLine, drawPolyline, drawLinkedTextBox, drawRect, drawTextBox, drawArrow, drawRedactionRect, setAttributesIfNecessary, setNewAttributesIfValid, };
|
|
17
|
+
export { draw, drawCircle, drawEllipse, drawEllipseByCoordinates, drawHandles, drawHandle, drawLine, drawPolyline, drawPath, drawLinkedTextBox, drawRect, drawTextBox, drawArrow, drawRedactionRect, setAttributesIfNecessary, setNewAttributesIfValid, };
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.setNewAttributesIfValid = exports.setAttributesIfNecessary = exports.drawRedactionRect = exports.drawArrow = exports.drawTextBox = exports.drawRect = exports.drawLinkedTextBox = exports.drawPolyline = exports.drawLine = exports.drawHandle = exports.drawHandles = exports.drawEllipseByCoordinates = exports.drawEllipse = exports.drawCircle = exports.draw = void 0;
|
|
6
|
+
exports.setNewAttributesIfValid = exports.setAttributesIfNecessary = exports.drawRedactionRect = exports.drawArrow = exports.drawTextBox = exports.drawRect = exports.drawLinkedTextBox = exports.drawPath = exports.drawPolyline = exports.drawLine = exports.drawHandle = exports.drawHandles = exports.drawEllipseByCoordinates = exports.drawEllipse = exports.drawCircle = exports.draw = void 0;
|
|
7
7
|
const draw_1 = __importDefault(require("./draw"));
|
|
8
8
|
exports.draw = draw_1.default;
|
|
9
9
|
const drawCircle_1 = __importDefault(require("./drawCircle"));
|
|
@@ -20,6 +20,8 @@ const drawLine_1 = __importDefault(require("./drawLine"));
|
|
|
20
20
|
exports.drawLine = drawLine_1.default;
|
|
21
21
|
const drawPolyline_1 = __importDefault(require("./drawPolyline"));
|
|
22
22
|
exports.drawPolyline = drawPolyline_1.default;
|
|
23
|
+
const drawPath_1 = __importDefault(require("./drawPath"));
|
|
24
|
+
exports.drawPath = drawPath_1.default;
|
|
23
25
|
const drawLinkedTextBox_1 = __importDefault(require("./drawLinkedTextBox"));
|
|
24
26
|
exports.drawLinkedTextBox = drawLinkedTextBox_1.default;
|
|
25
27
|
const drawRect_1 = __importDefault(require("./drawRect"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/drawingSvg/index.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/drawingSvg/index.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAkBxB,eAlBK,cAAI,CAkBL;AAjBN,8DAAsC;AAkBpC,qBAlBK,oBAAU,CAkBL;AAjBZ,gEAAwC;AAkBtC,sBAlBK,qBAAW,CAkBL;AAjBb,0FAAkE;AAkBhE,mCAlBK,kCAAwB,CAkBL;AAjB1B,gEAAwC;AAkBtC,sBAlBK,qBAAW,CAkBL;AAjBb,8DAAsC;AAkBpC,qBAlBK,oBAAU,CAkBL;AAjBZ,0DAAkC;AAkBhC,mBAlBK,kBAAQ,CAkBL;AAjBV,kEAA0C;AAkBxC,uBAlBK,sBAAY,CAkBL;AAjBd,0DAAkC;AAkBhC,mBAlBK,kBAAQ,CAkBL;AAjBV,4EAAoD;AAkBlD,4BAlBK,2BAAiB,CAkBL;AAjBnB,0DAAkC;AAkBhC,mBAlBK,kBAAQ,CAkBL;AAjBV,gEAAwC;AAkBtC,sBAlBK,qBAAW,CAkBL;AAjBb,4DAAoC;AAkBlC,oBAlBK,mBAAS,CAkBL;AAjBX,4EAAoD;AAkBlD,4BAlBK,2BAAiB,CAkBL;AAjBnB,0FAAkE;AAkBhE,mCAlBK,kCAAwB,CAkBL;AAjB1B,wFAAgE;AAkB9D,kCAlBK,iCAAuB,CAkBL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getActiveToolForMouseEvent.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getActiveToolForMouseEvent.ts"],"names":[],"mappings":";;;;;AAAA,uCAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"getActiveToolForMouseEvent.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getActiveToolForMouseEvent.ts"],"names":[],"mappings":";;;;;AAAA,uCAA+C;AAC/C,uCAAwC;AACxC,yDAAwD;AAExD,0EAAkD;AAElD,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAS,CAAC;AAW7B,SAAwB,0BAA0B,CAChD,GAAwC;IAGxC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;IAKpC,MAAM,WAAW,GACf,IAAA,0BAAgB,EAAC,UAAU,CAAC,IAAI,iCAAgB,CAAC,cAAc,EAAE,CAAC;IAEpE,MAAM,SAAS,GAAG,wBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,mBAAmB,GAAG,SAAS,CAAC,sBAAsB,EAAE,CAAC;IAE/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAIpD,MAAM,cAAc,GAClB,WAAW,CAAC,QAAQ,CAAC,MAAM;YAC3B,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBACpC,OAAO,CACL,OAAO,CAAC,WAAW;oBACjB,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC;oBACzD,OAAO,CAAC,WAAW,KAAK,WAAW,CACpC,CAAC;YACJ,CAAC,CAAC,CAAC;QAEL,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,IAAI,cAAc,EAAE;YACjD,OAAO,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;SAC5C;KACF;AACH,CAAC;AA7CD,6CA6CC"}
|
package/dist/cjs/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { AnnotationCompletedEventType } from '../../../types/EventTypes';
|
|
2
|
-
export default function contourSegmentationCompletedListener(evt: AnnotationCompletedEventType): void
|
|
2
|
+
export default function contourSegmentationCompletedListener(evt: AnnotationCompletedEventType): Promise<void>;
|
package/dist/cjs/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js
CHANGED
|
@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
25
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
35
|
const core_1 = require("@cornerstonejs/core");
|
|
27
36
|
const utilities_1 = require("../../../utilities");
|
|
@@ -31,28 +40,40 @@ const contourUtils = __importStar(require("../../../utilities/contours"));
|
|
|
31
40
|
const contourSegUtils = __importStar(require("../../../utilities/contourSegmentation"));
|
|
32
41
|
const store_1 = require("../../../store");
|
|
33
42
|
const tools_1 = require("../../../tools");
|
|
43
|
+
const ContourAnnotation_1 = require("../../../types/ContourAnnotation");
|
|
34
44
|
const DEFAULT_CONTOUR_SEG_TOOLNAME = 'PlanarFreehandContourSegmentationTool';
|
|
35
45
|
function contourSegmentationCompletedListener(evt) {
|
|
36
|
-
|
|
37
|
-
.
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
46
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
47
|
+
const sourceAnnotation = evt.detail
|
|
48
|
+
.annotation;
|
|
49
|
+
if (!contourSegUtils.isContourSegmentationAnnotation(sourceAnnotation)) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
const viewport = (0, utilities_1.getViewportForAnnotation)(sourceAnnotation);
|
|
53
|
+
const contourSegmentationAnnotations = getValidContourSegmentationAnnotations(sourceAnnotation);
|
|
54
|
+
if (!contourSegmentationAnnotations.length) {
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
const sourcePolyline = convertContourPolylineToCanvasSpace(sourceAnnotation.data.contour.polyline, viewport);
|
|
58
|
+
const targetAnnotationInfo = findIntersectingContour(viewport, sourcePolyline, contourSegmentationAnnotations);
|
|
59
|
+
if (!targetAnnotationInfo) {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
if (!isFreehandContourSegToolRegistered(viewport)) {
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
const { targetAnnotation, targetPolyline, isContourHole } = targetAnnotationInfo;
|
|
66
|
+
if (isContourHole) {
|
|
67
|
+
const { contourHoleProcessingEnabled = false } = evt.detail;
|
|
68
|
+
if (!contourHoleProcessingEnabled) {
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
createPolylineHole(viewport, targetAnnotation, sourceAnnotation);
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
combinePolylines(viewport, targetAnnotation, targetPolyline, sourceAnnotation, sourcePolyline);
|
|
75
|
+
}
|
|
76
|
+
});
|
|
56
77
|
}
|
|
57
78
|
exports.default = contourSegmentationCompletedListener;
|
|
58
79
|
function isFreehandContourSegToolRegistered(viewport) {
|
|
@@ -80,17 +101,12 @@ function convertContourPolylineToCanvasSpace(polyline, viewport) {
|
|
|
80
101
|
}
|
|
81
102
|
return projectedPolyline;
|
|
82
103
|
}
|
|
83
|
-
function convertPolylineToWorldSpace(polyline, viewport) {
|
|
84
|
-
const numPoints = polyline.length;
|
|
85
|
-
const projectedPolyline = new Array(numPoints);
|
|
86
|
-
for (let i = 0; i < numPoints; i++) {
|
|
87
|
-
projectedPolyline[i] = viewport.canvasToWorld(polyline[i]);
|
|
88
|
-
}
|
|
89
|
-
return projectedPolyline;
|
|
90
|
-
}
|
|
91
104
|
function getValidContourSegmentationAnnotations(sourceAnnotation) {
|
|
92
105
|
const { annotationUID: sourceAnnotationUID } = sourceAnnotation;
|
|
93
106
|
const { FrameOfReferenceUID } = sourceAnnotation.metadata;
|
|
107
|
+
if (!FrameOfReferenceUID) {
|
|
108
|
+
return [];
|
|
109
|
+
}
|
|
94
110
|
const toolName = undefined;
|
|
95
111
|
const annotationsGroups = (0, annotationState_1.getAnnotations)(toolName, FrameOfReferenceUID);
|
|
96
112
|
const toolNames = Object.keys(annotationsGroups);
|
|
@@ -109,66 +125,137 @@ function findIntersectingContour(viewport, sourcePolyline, contourSegmentationAn
|
|
|
109
125
|
const targetAnnotation = contourSegmentationAnnotations[i];
|
|
110
126
|
const targetPolyline = convertContourPolylineToCanvasSpace(targetAnnotation.data.contour.polyline, viewport);
|
|
111
127
|
const targetAABB = utilities_1.math.polyline.getAABB(targetPolyline);
|
|
112
|
-
const
|
|
128
|
+
const aabbIntersect = utilities_1.math.aabb.intersectAABB(sourceAABB, targetAABB);
|
|
129
|
+
const lineSegmentsIntersect = aabbIntersect &&
|
|
113
130
|
utilities_1.math.polyline.intersectPolyline(sourcePolyline, targetPolyline);
|
|
114
|
-
|
|
115
|
-
|
|
131
|
+
const isContourHole = aabbIntersect &&
|
|
132
|
+
!lineSegmentsIntersect &&
|
|
133
|
+
utilities_1.math.polyline.containsPoints(targetPolyline, sourcePolyline);
|
|
134
|
+
if (lineSegmentsIntersect || isContourHole) {
|
|
135
|
+
return { targetAnnotation, targetPolyline, isContourHole };
|
|
116
136
|
}
|
|
117
137
|
}
|
|
118
138
|
}
|
|
119
|
-
function
|
|
120
|
-
const
|
|
121
|
-
const
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
newPolylines.push(mergedPolyline);
|
|
126
|
-
}
|
|
127
|
-
else {
|
|
128
|
-
const subtractedPolylines = utilities_1.math.polyline.subtractPolylines(targetPolyline, sourcePolyline);
|
|
129
|
-
subtractedPolylines.forEach((newPolyline) => newPolylines.push(newPolyline));
|
|
139
|
+
function createPolylineHole(viewport, targetAnnotation, holeAnnotation) {
|
|
140
|
+
const { windingDirection: targetWindingDirection } = targetAnnotation.data.contour;
|
|
141
|
+
const { windingDirection: holeWindingDirection } = holeAnnotation.data.contour;
|
|
142
|
+
if (targetWindingDirection === holeWindingDirection) {
|
|
143
|
+
holeAnnotation.data.contour.polyline.reverse();
|
|
144
|
+
holeAnnotation.data.contour.windingDirection = targetWindingDirection * -1;
|
|
130
145
|
}
|
|
131
|
-
(0, annotationState_1.
|
|
132
|
-
(0, annotationState_1.removeAnnotation)(targetAnnotation.annotationUID);
|
|
146
|
+
(0, annotationState_1.addChildAnnotation)(targetAnnotation, holeAnnotation);
|
|
133
147
|
const { element } = viewport;
|
|
134
148
|
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
135
149
|
const { renderingEngine } = enabledElement;
|
|
136
|
-
const
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
const
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
150
|
+
const updatedToolNames = new Set([
|
|
151
|
+
DEFAULT_CONTOUR_SEG_TOOLNAME,
|
|
152
|
+
targetAnnotation.metadata.toolName,
|
|
153
|
+
holeAnnotation.metadata.toolName,
|
|
154
|
+
]);
|
|
155
|
+
for (const toolName of updatedToolNames.values()) {
|
|
156
|
+
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, toolName);
|
|
157
|
+
(0, utilities_1.triggerAnnotationRenderForViewportIds)(renderingEngine, viewportIdsToRender);
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
function getContourHolesData(viewport, annotation) {
|
|
161
|
+
return (0, annotationState_1.getChildAnnotations)(annotation).map((holeAnnotation) => {
|
|
162
|
+
const polyline = convertContourPolylineToCanvasSpace(holeAnnotation.data.contour.polyline, viewport);
|
|
163
|
+
return { annotation: holeAnnotation, polyline };
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
function combinePolylines(viewport, targetAnnotation, targetPolyline, sourceAnnotation, sourcePolyline) {
|
|
167
|
+
var _a;
|
|
168
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
169
|
+
const sourceStartPoint = sourcePolyline[0];
|
|
170
|
+
const mergePolylines = utilities_1.math.polyline.containsPoint(targetPolyline, sourceStartPoint);
|
|
171
|
+
const contourHolesData = getContourHolesData(viewport, targetAnnotation);
|
|
172
|
+
const unassignedContourHolesSet = new Set(contourHolesData);
|
|
173
|
+
const reassignedContourHolesMap = new Map();
|
|
174
|
+
const assignHoleToPolyline = (parentPolyline, holeData) => {
|
|
175
|
+
let holes = reassignedContourHolesMap.get(parentPolyline);
|
|
176
|
+
if (!holes) {
|
|
177
|
+
holes = [];
|
|
178
|
+
reassignedContourHolesMap.set(parentPolyline, holes);
|
|
179
|
+
}
|
|
180
|
+
holes.push(holeData);
|
|
181
|
+
unassignedContourHolesSet.delete(holeData);
|
|
162
182
|
};
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
183
|
+
const newPolylines = [];
|
|
184
|
+
if (mergePolylines) {
|
|
185
|
+
const mergedPolyline = utilities_1.math.polyline.mergePolylines(targetPolyline, sourcePolyline);
|
|
186
|
+
newPolylines.push(mergedPolyline);
|
|
187
|
+
Array.from(unassignedContourHolesSet.keys()).forEach((holeData) => assignHoleToPolyline(mergedPolyline, holeData));
|
|
188
|
+
}
|
|
189
|
+
else {
|
|
190
|
+
const subtractedPolylines = utilities_1.math.polyline.subtractPolylines(targetPolyline, sourcePolyline);
|
|
191
|
+
subtractedPolylines.forEach((newPolyline) => {
|
|
192
|
+
newPolylines.push(newPolyline);
|
|
193
|
+
Array.from(unassignedContourHolesSet.keys()).forEach((holeData) => {
|
|
194
|
+
const containsHole = utilities_1.math.polyline.containsPoints(newPolyline, holeData.polyline);
|
|
195
|
+
if (containsHole) {
|
|
196
|
+
assignHoleToPolyline(newPolyline, holeData);
|
|
197
|
+
unassignedContourHolesSet.delete(holeData);
|
|
198
|
+
}
|
|
199
|
+
});
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
Array.from(reassignedContourHolesMap.values()).forEach((contourHolesDataArray) => contourHolesDataArray.forEach((contourHoleData) => (0, annotationState_1.clearParentAnnotation)(contourHoleData.annotation)));
|
|
203
|
+
const { element } = viewport;
|
|
204
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
205
|
+
const { metadata, data } = targetAnnotation;
|
|
206
|
+
const { handles, segmentation } = data;
|
|
207
|
+
const { textBox } = handles;
|
|
208
|
+
(0, annotationState_1.removeAnnotation)(sourceAnnotation.annotationUID);
|
|
209
|
+
(0, annotationState_1.removeAnnotation)(targetAnnotation.annotationUID);
|
|
210
|
+
for (let i = 0; i < newPolylines.length; i++) {
|
|
211
|
+
const polyline = newPolylines[i];
|
|
212
|
+
const startPoint = viewport.canvasToWorld(polyline[0]);
|
|
213
|
+
const endPoint = viewport.canvasToWorld(polyline[polyline.length - 1]);
|
|
214
|
+
const newAnnotation = {
|
|
215
|
+
metadata: Object.assign(Object.assign({}, metadata), { toolName: DEFAULT_CONTOUR_SEG_TOOLNAME }),
|
|
216
|
+
data: {
|
|
217
|
+
cachedStats: {},
|
|
218
|
+
handles: {
|
|
219
|
+
points: [startPoint, endPoint],
|
|
220
|
+
textBox: textBox ? Object.assign({}, textBox) : undefined,
|
|
221
|
+
},
|
|
222
|
+
contour: {
|
|
223
|
+
polyline: [],
|
|
224
|
+
closed: true,
|
|
225
|
+
},
|
|
226
|
+
segmentation: Object.assign({}, segmentation),
|
|
227
|
+
},
|
|
228
|
+
annotationUID: core_1.utilities.uuidv4(),
|
|
229
|
+
highlighted: true,
|
|
230
|
+
invalidated: true,
|
|
231
|
+
isLocked: false,
|
|
232
|
+
isVisible: undefined,
|
|
233
|
+
};
|
|
234
|
+
contourUtils.updateContourPolyline(newAnnotation, {
|
|
235
|
+
points: polyline,
|
|
236
|
+
closed: true,
|
|
237
|
+
targetWindingDirection: ContourAnnotation_1.ContourWindingDirection.Clockwise,
|
|
238
|
+
}, viewport);
|
|
239
|
+
(0, annotationState_1.addAnnotation)(newAnnotation, element);
|
|
240
|
+
(_a = reassignedContourHolesMap
|
|
241
|
+
.get(polyline)) === null || _a === void 0 ? void 0 : _a.forEach((holeData) => (0, annotationState_1.addChildAnnotation)(newAnnotation, holeData.annotation));
|
|
171
242
|
}
|
|
243
|
+
updateViewports(enabledElement, targetAnnotation, sourceAnnotation);
|
|
244
|
+
});
|
|
245
|
+
}
|
|
246
|
+
function updateViewports(enabledElement, targetAnnotation, sourceAnnotation) {
|
|
247
|
+
const { viewport } = enabledElement;
|
|
248
|
+
const { element } = viewport;
|
|
249
|
+
const { renderingEngine } = enabledElement;
|
|
250
|
+
const updatedTtoolNames = new Set([
|
|
251
|
+
DEFAULT_CONTOUR_SEG_TOOLNAME,
|
|
252
|
+
targetAnnotation.metadata.toolName,
|
|
253
|
+
sourceAnnotation.metadata.toolName,
|
|
254
|
+
]);
|
|
255
|
+
for (const toolName of updatedTtoolNames.values()) {
|
|
256
|
+
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, toolName);
|
|
257
|
+
(0, utilities_1.triggerAnnotationRenderForViewportIds)(renderingEngine, viewportIdsToRender);
|
|
172
258
|
}
|
|
259
|
+
return new Promise((resolve) => window.requestAnimationFrame(resolve));
|
|
173
260
|
}
|
|
174
261
|
//# sourceMappingURL=contourSegmentationCompleted.js.map
|
package/dist/cjs/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contourSegmentationCompleted.js","sourceRoot":"","sources":["../../../../../src/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"contourSegmentationCompleted.js","sourceRoot":"","sources":["../../../../../src/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,14 @@ declare function getAnnotationManager(): import("./FrameOfReferenceSpecificAnnot
|
|
|
4
4
|
declare function setAnnotationManager(annotationManager: any): void;
|
|
5
5
|
declare function resetAnnotationManager(): void;
|
|
6
6
|
declare function getAnnotations(toolName: string, annotationGroupSelector: AnnotationGroupSelector): Annotations;
|
|
7
|
+
declare function clearParentAnnotation(annotation: Annotation): void;
|
|
8
|
+
declare function addChildAnnotation(parentAnnotation: Annotation, childAnnotation: Annotation): void;
|
|
9
|
+
declare function getParentAnnotation(annotation: Annotation): Annotation;
|
|
10
|
+
declare function getChildAnnotations(annotation: Annotation): Annotation[];
|
|
7
11
|
declare function addAnnotation(annotation: Annotation, annotationGroupSelector: AnnotationGroupSelector): string;
|
|
8
12
|
declare function getNumberOfAnnotations(toolName: string, annotationGroupSelector: AnnotationGroupSelector): number;
|
|
9
13
|
declare function removeAnnotation(annotationUID: string): void;
|
|
10
14
|
declare function getAnnotation(annotationUID: string): Annotation;
|
|
11
15
|
declare function removeAllAnnotations(): void;
|
|
12
|
-
|
|
16
|
+
declare function invalidateAnnotation(annotation: Annotation): void;
|
|
17
|
+
export { getAnnotations, getParentAnnotation, getChildAnnotations, clearParentAnnotation, addChildAnnotation, getNumberOfAnnotations, addAnnotation, getAnnotation, removeAnnotation, removeAllAnnotations, setAnnotationManager, getAnnotationManager, resetAnnotationManager, invalidateAnnotation, };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resetAnnotationManager = exports.getAnnotationManager = exports.setAnnotationManager = exports.removeAllAnnotations = exports.removeAnnotation = exports.getAnnotation = exports.addAnnotation = exports.getNumberOfAnnotations = exports.getAnnotations = void 0;
|
|
3
|
+
exports.invalidateAnnotation = exports.resetAnnotationManager = exports.getAnnotationManager = exports.setAnnotationManager = exports.removeAllAnnotations = exports.removeAnnotation = exports.getAnnotation = exports.addAnnotation = exports.getNumberOfAnnotations = exports.addChildAnnotation = exports.clearParentAnnotation = exports.getChildAnnotations = exports.getParentAnnotation = exports.getAnnotations = void 0;
|
|
4
4
|
const core_1 = require("@cornerstonejs/core");
|
|
5
5
|
const enums_1 = require("../../enums");
|
|
6
6
|
const FrameOfReferenceSpecificAnnotationManager_1 = require("./FrameOfReferenceSpecificAnnotationManager");
|
|
@@ -24,6 +24,42 @@ function getAnnotations(toolName, annotationGroupSelector) {
|
|
|
24
24
|
return manager.getAnnotations(groupKey, toolName);
|
|
25
25
|
}
|
|
26
26
|
exports.getAnnotations = getAnnotations;
|
|
27
|
+
function clearParentAnnotation(annotation) {
|
|
28
|
+
const { annotationUID: childUID, parentAnnotationUID } = annotation;
|
|
29
|
+
if (!parentAnnotationUID) {
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
const parentAnnotation = getAnnotation(parentAnnotationUID);
|
|
33
|
+
const childUIDIndex = parentAnnotation.childAnnotationUIDs.indexOf(childUID);
|
|
34
|
+
parentAnnotation.childAnnotationUIDs.splice(childUIDIndex, 1);
|
|
35
|
+
annotation.parentAnnotationUID = undefined;
|
|
36
|
+
}
|
|
37
|
+
exports.clearParentAnnotation = clearParentAnnotation;
|
|
38
|
+
function addChildAnnotation(parentAnnotation, childAnnotation) {
|
|
39
|
+
const { annotationUID: parentUID } = parentAnnotation;
|
|
40
|
+
const { annotationUID: childUID } = childAnnotation;
|
|
41
|
+
clearParentAnnotation(childAnnotation);
|
|
42
|
+
if (!parentAnnotation.childAnnotationUIDs) {
|
|
43
|
+
parentAnnotation.childAnnotationUIDs = [];
|
|
44
|
+
}
|
|
45
|
+
if (parentAnnotation.childAnnotationUIDs.includes(childUID)) {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
parentAnnotation.childAnnotationUIDs.push(childUID);
|
|
49
|
+
childAnnotation.parentAnnotationUID = parentUID;
|
|
50
|
+
}
|
|
51
|
+
exports.addChildAnnotation = addChildAnnotation;
|
|
52
|
+
function getParentAnnotation(annotation) {
|
|
53
|
+
return annotation.parentAnnotationUID
|
|
54
|
+
? getAnnotation(annotation.parentAnnotationUID)
|
|
55
|
+
: undefined;
|
|
56
|
+
}
|
|
57
|
+
exports.getParentAnnotation = getParentAnnotation;
|
|
58
|
+
function getChildAnnotations(annotation) {
|
|
59
|
+
var _a, _b;
|
|
60
|
+
return ((_b = (_a = annotation.childAnnotationUIDs) === null || _a === void 0 ? void 0 : _a.map((childAnnotationUID) => getAnnotation(childAnnotationUID))) !== null && _b !== void 0 ? _b : []);
|
|
61
|
+
}
|
|
62
|
+
exports.getChildAnnotations = getChildAnnotations;
|
|
27
63
|
function addAnnotation(annotation, annotationGroupSelector) {
|
|
28
64
|
if (!annotation.annotationUID) {
|
|
29
65
|
annotation.annotationUID = core_1.utilities.uuidv4();
|
|
@@ -48,6 +84,7 @@ function getNumberOfAnnotations(toolName, annotationGroupSelector) {
|
|
|
48
84
|
}
|
|
49
85
|
exports.getNumberOfAnnotations = getNumberOfAnnotations;
|
|
50
86
|
function removeAnnotation(annotationUID) {
|
|
87
|
+
var _a;
|
|
51
88
|
if (!annotationUID) {
|
|
52
89
|
return;
|
|
53
90
|
}
|
|
@@ -56,6 +93,7 @@ function removeAnnotation(annotationUID) {
|
|
|
56
93
|
if (!annotation) {
|
|
57
94
|
return;
|
|
58
95
|
}
|
|
96
|
+
(_a = annotation.childAnnotationUIDs) === null || _a === void 0 ? void 0 : _a.forEach((childAnnotationUID) => removeAnnotation(childAnnotationUID));
|
|
59
97
|
manager.removeAnnotation(annotationUID);
|
|
60
98
|
const eventType = enums_1.Events.ANNOTATION_REMOVED;
|
|
61
99
|
const eventDetail = {
|
|
@@ -76,4 +114,14 @@ function removeAllAnnotations() {
|
|
|
76
114
|
manager.removeAllAnnotations();
|
|
77
115
|
}
|
|
78
116
|
exports.removeAllAnnotations = removeAllAnnotations;
|
|
117
|
+
function invalidateAnnotation(annotation) {
|
|
118
|
+
let currAnnotation = annotation;
|
|
119
|
+
while (currAnnotation) {
|
|
120
|
+
currAnnotation.invalidated = true;
|
|
121
|
+
currAnnotation = currAnnotation.parentAnnotationUID
|
|
122
|
+
? getAnnotation(currAnnotation.parentAnnotationUID)
|
|
123
|
+
: undefined;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
exports.invalidateAnnotation = invalidateAnnotation;
|
|
79
127
|
//# sourceMappingURL=annotationState.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationState.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAC7B,uCAAqC;AACrC,2GAA+G;AAI/G,2CAGyB;AAGzB,IAAI,cAAc,GAAG,4FAAgD,CAAC;AAMtE,SAAS,oBAAoB;IAC3B,OAAO,cAAc,CAAC;AACxB,CAAC;
|
|
1
|
+
{"version":3,"file":"annotationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationState.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAC7B,uCAAqC;AACrC,2GAA+G;AAI/G,2CAGyB;AAGzB,IAAI,cAAc,GAAG,4FAAgD,CAAC;AAMtE,SAAS,oBAAoB;IAC3B,OAAO,cAAc,CAAC;AACxB,CAAC;AAgQC,oDAAoB;AA1PtB,SAAS,oBAAoB,CAAC,iBAAiB;IAC7C,cAAc,GAAG,iBAAiB,CAAC;AACrC,CAAC;AAuPC,oDAAoB;AApPtB,SAAS,sBAAsB;IAC7B,cAAc,GAAG,4FAAgD,CAAC;AACpE,CAAC;AAoPC,wDAAsB;AArOxB,SAAS,cAAc,CACrB,QAAgB,EAChB,uBAAgD;IAEhD,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAC9D,OAAO,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAgB,CAAC;AACnE,CAAC;AAiNC,wCAAc;AA1MhB,SAAS,qBAAqB,CAAC,UAAsB;IACnD,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,UAAU,CAAC;IAEpE,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO;KACR;IAED,MAAM,gBAAgB,GAAG,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,gBAAgB,CAAC,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE7E,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IAC9D,UAAU,CAAC,mBAAmB,GAAG,SAAS,CAAC;AAC7C,CAAC;AAiMC,sDAAqB;AAxLvB,SAAS,kBAAkB,CACzB,gBAA4B,EAC5B,eAA2B;IAE3B,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,gBAAgB,CAAC;IACtD,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC;IAGpD,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAEvC,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE;QACzC,gBAAgB,CAAC,mBAAmB,GAAG,EAAE,CAAC;KAC3C;IAGD,IAAI,gBAAgB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAC3D,OAAO;KACR;IAED,gBAAgB,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACpD,eAAe,CAAC,mBAAmB,GAAG,SAAS,CAAC;AAClD,CAAC;AAoKC,gDAAkB;AA5JpB,SAAS,mBAAmB,CAAC,UAAsB;IACjD,OAAO,UAAU,CAAC,mBAAmB;QACnC,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,mBAAmB,CAAC;QAC/C,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAqJC,kDAAmB;AA7IrB,SAAS,mBAAmB,CAAC,UAAsB;;IACjD,OAAO,CACL,MAAA,MAAA,UAAU,CAAC,mBAAmB,0CAAE,GAAG,CAAC,CAAC,kBAAkB,EAAE,EAAE,CACzD,aAAa,CAAC,kBAAkB,CAAC,CAClC,mCAAI,EAAE,CACR,CAAC;AACJ,CAAC;AAwIC,kDAAmB;AA1HrB,SAAS,aAAa,CACpB,UAAsB,EACtB,uBAAgD;IAEhD,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE;QAC7B,UAAU,CAAC,aAAa,GAAG,gBAAO,CAAC,MAAM,EAAY,CAAC;KACvD;IAED,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAIvC,IAAI,uBAAuB,YAAY,cAAc,EAAE;QACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;QAC9D,OAAO,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAC5C,IAAA,wCAAgC,EAAC,UAAU,EAAE,uBAAuB,CAAC,CAAC;KACvE;SAAM;QAIL,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAClC,IAAA,oCAA4B,EAAC,UAAU,CAAC,CAAC;KAC1C;IAED,OAAO,UAAU,CAAC,aAAa,CAAC;AAClC,CAAC;AAqGC,sCAAa;AAtFf,SAAS,sBAAsB,CAC7B,QAAgB,EAChB,uBAAgD;IAEhD,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAE9D,OAAO,OAAO,CAAC,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC5D,CAAC;AA6EC,wDAAsB;AAvExB,SAAS,gBAAgB,CAAC,aAAqB;;IAC7C,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO;KACR;IACD,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAGxD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;KACR;IAGD,MAAA,UAAU,CAAC,mBAAmB,0CAAE,OAAO,CAAC,CAAC,kBAAkB,EAAE,EAAE,CAC7D,gBAAgB,CAAC,kBAAkB,CAAC,CACrC,CAAC;IAEF,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAGxC,MAAM,SAAS,GAAG,cAAM,CAAC,kBAAkB,CAAC;IAE5C,MAAM,WAAW,GAAiC;QAChD,UAAU;QACV,oBAAoB,EAAE,OAAO,CAAC,GAAG;KAClC,CAAC;IAEF,IAAA,mBAAY,EAAC,kBAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;AA8CC,4CAAgB;AAxClB,SAAS,aAAa,CAAC,aAAqB;IAC1C,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAExD,OAAO,UAAU,CAAC;AACpB,CAAC;AAkCC,sCAAa;AA7Bf,SAAS,oBAAoB;IAC3B,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,OAAO,CAAC,oBAAoB,EAAE,CAAC;AACjC,CAAC;AA4BC,oDAAoB;AAtBtB,SAAS,oBAAoB,CAAC,UAAsB;IAClD,IAAI,cAAc,GAAG,UAAU,CAAC;IAEhC,OAAO,cAAc,EAAE;QACrB,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC;QAElC,cAAc,GAAG,cAAc,CAAC,mBAAmB;YACjD,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,mBAAmB,CAAC;YACnD,CAAC,CAAC,SAAS,CAAC;KACf;AACH,CAAC;AAiBC,oDAAoB"}
|