@cornerstonejs/tools 1.58.1 → 1.58.2
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/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js +6 -1
- package/dist/cjs/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js.map +1 -1
- package/dist/cjs/types/ContourSegmentationAnnotation.d.ts +5 -0
- package/dist/cjs/types/IToolGroup.d.ts +3 -1
- package/dist/cjs/types/ToolSpecificAnnotationTypes.d.ts +2 -1
- package/dist/cjs/utilities/contours/interpolation/getInterpolationData.js +15 -2
- package/dist/cjs/utilities/contours/interpolation/getInterpolationData.js.map +1 -1
- package/dist/cjs/utilities/contours/interpolation/interpolate.js +1 -4
- package/dist/cjs/utilities/contours/interpolation/interpolate.js.map +1 -1
- package/dist/cjs/utilities/contours/interpolation/selectHandles.js +2 -3
- package/dist/cjs/utilities/contours/interpolation/selectHandles.js.map +1 -1
- package/dist/cjs/utilities/math/line/index.d.ts +2 -1
- package/dist/cjs/utilities/math/line/index.js +3 -1
- package/dist/cjs/utilities/math/line/index.js.map +1 -1
- package/dist/cjs/utilities/math/line/isPointOnLineSegment.d.ts +2 -0
- package/dist/cjs/utilities/math/line/isPointOnLineSegment.js +22 -0
- package/dist/cjs/utilities/math/line/isPointOnLineSegment.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/combinePolyline.js +2 -2
- package/dist/cjs/utilities/math/polyline/combinePolyline.js.map +1 -1
- package/dist/cjs/utilities/math/polyline/getLineSegmentIntersectionsCoordinates.js +2 -2
- package/dist/cjs/utilities/math/polyline/getLineSegmentIntersectionsCoordinates.js.map +1 -1
- package/dist/cjs/utilities/math/polyline/getLinesIntersection.d.ts +2 -0
- package/dist/cjs/utilities/math/polyline/getLinesIntersection.js +78 -0
- package/dist/cjs/utilities/math/polyline/getLinesIntersection.js.map +1 -0
- package/dist/cjs/utilities/segmentation/InterpolationManager/InterpolationManager.js +30 -12
- package/dist/cjs/utilities/segmentation/InterpolationManager/InterpolationManager.js.map +1 -1
- package/dist/esm/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js +6 -0
- package/dist/esm/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js.map +1 -1
- package/dist/esm/utilities/contours/interpolation/getInterpolationData.js +15 -2
- package/dist/esm/utilities/contours/interpolation/getInterpolationData.js.map +1 -1
- package/dist/esm/utilities/contours/interpolation/interpolate.js +1 -4
- package/dist/esm/utilities/contours/interpolation/interpolate.js.map +1 -1
- package/dist/esm/utilities/contours/interpolation/selectHandles.js +2 -3
- package/dist/esm/utilities/contours/interpolation/selectHandles.js.map +1 -1
- package/dist/esm/utilities/math/line/index.js +2 -1
- package/dist/esm/utilities/math/line/index.js.map +1 -1
- package/dist/esm/utilities/math/line/isPointOnLineSegment.js +19 -0
- package/dist/esm/utilities/math/line/isPointOnLineSegment.js.map +1 -0
- package/dist/esm/utilities/math/polyline/combinePolyline.js +2 -2
- package/dist/esm/utilities/math/polyline/combinePolyline.js.map +1 -1
- package/dist/esm/utilities/math/polyline/getLineSegmentIntersectionsCoordinates.js +2 -2
- package/dist/esm/utilities/math/polyline/getLineSegmentIntersectionsCoordinates.js.map +1 -1
- package/dist/esm/utilities/math/polyline/getLinesIntersection.js +52 -0
- package/dist/esm/utilities/math/polyline/getLinesIntersection.js.map +1 -0
- package/dist/esm/utilities/segmentation/InterpolationManager/InterpolationManager.js +30 -12
- package/dist/esm/utilities/segmentation/InterpolationManager/InterpolationManager.js.map +1 -1
- package/dist/types/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.d.ts.map +1 -1
- package/dist/types/types/ContourSegmentationAnnotation.d.ts +5 -0
- package/dist/types/types/ContourSegmentationAnnotation.d.ts.map +1 -1
- package/dist/types/types/IToolGroup.d.ts +3 -1
- package/dist/types/types/IToolGroup.d.ts.map +1 -1
- package/dist/types/types/ToolSpecificAnnotationTypes.d.ts +2 -1
- package/dist/types/types/ToolSpecificAnnotationTypes.d.ts.map +1 -1
- package/dist/types/utilities/contours/interpolation/getInterpolationData.d.ts.map +1 -1
- package/dist/types/utilities/contours/interpolation/interpolate.d.ts.map +1 -1
- package/dist/types/utilities/contours/interpolation/selectHandles.d.ts.map +1 -1
- package/dist/types/utilities/math/line/index.d.ts +2 -1
- package/dist/types/utilities/math/line/index.d.ts.map +1 -1
- package/dist/types/utilities/math/line/isPointOnLineSegment.d.ts +3 -0
- package/dist/types/utilities/math/line/isPointOnLineSegment.d.ts.map +1 -0
- package/dist/types/utilities/math/polyline/combinePolyline.d.ts.map +1 -1
- package/dist/types/utilities/math/polyline/getLinesIntersection.d.ts +3 -0
- package/dist/types/utilities/math/polyline/getLinesIntersection.d.ts.map +1 -0
- package/dist/types/utilities/segmentation/InterpolationManager/InterpolationManager.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/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.ts +8 -0
- package/src/types/ContourSegmentationAnnotation.ts +6 -0
- package/src/types/IToolGroup.ts +1 -1
- package/src/types/ToolSpecificAnnotationTypes.ts +18 -11
- package/src/utilities/contours/interpolation/getInterpolationData.ts +24 -5
- package/src/utilities/contours/interpolation/interpolate.ts +1 -5
- package/src/utilities/contours/interpolation/selectHandles.ts +9 -4
- package/src/utilities/math/line/index.ts +2 -0
- package/src/utilities/math/line/isPointOnLineSegment.ts +44 -0
- package/src/utilities/math/polyline/combinePolyline.ts +5 -7
- package/src/utilities/math/polyline/getLineSegmentIntersectionsCoordinates.ts +2 -2
- package/src/utilities/math/polyline/getLinesIntersection.ts +94 -0
- package/src/utilities/segmentation/InterpolationManager/InterpolationManager.ts +52 -14
- package/dist/cjs/utilities/math/polyline/getLineSegmentsIntersection.d.ts +0 -2
- package/dist/cjs/utilities/math/polyline/getLineSegmentsIntersection.js +0 -21
- package/dist/cjs/utilities/math/polyline/getLineSegmentsIntersection.js.map +0 -1
- package/dist/esm/utilities/math/polyline/getLineSegmentsIntersection.js +0 -18
- package/dist/esm/utilities/math/polyline/getLineSegmentsIntersection.js.map +0 -1
- package/dist/types/utilities/math/polyline/getLineSegmentsIntersection.d.ts +0 -3
- package/dist/types/utilities/math/polyline/getLineSegmentsIntersection.d.ts.map +0 -1
- package/src/utilities/math/polyline/getLineSegmentsIntersection.ts +0 -47
|
@@ -11,6 +11,7 @@ const interpolate_1 = __importDefault(require("../../contours/interpolation/inte
|
|
|
11
11
|
const deleteRelatedAnnotations_1 = __importDefault(require("./deleteRelatedAnnotations"));
|
|
12
12
|
const ChangeTypes_1 = __importDefault(require("../../../enums/ChangeTypes"));
|
|
13
13
|
const getViewportForAnnotation_1 = __importDefault(require("../../getViewportForAnnotation"));
|
|
14
|
+
const addContourSegmentationAnnotation_1 = require("../../contourSegmentation/addContourSegmentationAnnotation");
|
|
14
15
|
const { uuidv4 } = core_1.utilities;
|
|
15
16
|
const ChangeTypesForInterpolation = [
|
|
16
17
|
ChangeTypes_1.default.HandlesUpdated,
|
|
@@ -30,7 +31,10 @@ class InterpolationManager {
|
|
|
30
31
|
continue;
|
|
31
32
|
}
|
|
32
33
|
for (const annotation of annotations) {
|
|
33
|
-
const { data, autoGenerated, metadata } = annotation;
|
|
34
|
+
const { interpolationUID, data, autoGenerated, metadata } = annotation;
|
|
35
|
+
if (interpolationUID) {
|
|
36
|
+
annotation.interpolationCompleted = true;
|
|
37
|
+
}
|
|
34
38
|
if (!autoGenerated) {
|
|
35
39
|
continue;
|
|
36
40
|
}
|
|
@@ -46,6 +50,7 @@ class InterpolationManager {
|
|
|
46
50
|
segmentationId !== data.segmentation.segmentationId) {
|
|
47
51
|
continue;
|
|
48
52
|
}
|
|
53
|
+
(0, addContourSegmentationAnnotation_1.addContourSegmentationAnnotation)(annotation);
|
|
49
54
|
annotation.autoGenerated = false;
|
|
50
55
|
}
|
|
51
56
|
}
|
|
@@ -60,10 +65,12 @@ InterpolationManager.handleAnnotationCompleted = (evt) => {
|
|
|
60
65
|
if (!(annotation === null || annotation === void 0 ? void 0 : annotation.metadata)) {
|
|
61
66
|
return;
|
|
62
67
|
}
|
|
63
|
-
const { toolName } = annotation.metadata;
|
|
64
|
-
if (!_a.toolNames.includes(toolName)
|
|
68
|
+
const { toolName, originalToolName } = annotation.metadata;
|
|
69
|
+
if (!_a.toolNames.includes(toolName) &&
|
|
70
|
+
!_a.toolNames.includes(originalToolName)) {
|
|
65
71
|
return;
|
|
66
72
|
}
|
|
73
|
+
console.log('Interpolation annotation', annotation.annotationUID);
|
|
67
74
|
const viewport = (0, getViewportForAnnotation_1.default)(annotation);
|
|
68
75
|
if (!viewport) {
|
|
69
76
|
console.warn('Unable to find viewport for', annotation);
|
|
@@ -101,12 +108,19 @@ InterpolationManager.handleAnnotationCompleted = (evt) => {
|
|
|
101
108
|
},
|
|
102
109
|
];
|
|
103
110
|
let interpolationAnnotations = (0, getInterpolationDataCollection_1.default)(viewportData, filterData);
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
111
|
+
const { sliceIndex } = annotation.metadata;
|
|
112
|
+
const skipUIDs = new Set();
|
|
113
|
+
interpolationAnnotations.forEach((interpolationAnnotation) => {
|
|
114
|
+
if (interpolationAnnotation.interpolationCompleted ||
|
|
115
|
+
interpolationAnnotation.metadata.sliceIndex === sliceIndex) {
|
|
116
|
+
const { interpolationUID } = interpolationAnnotation;
|
|
117
|
+
skipUIDs.add(interpolationUID);
|
|
118
|
+
}
|
|
119
|
+
});
|
|
120
|
+
interpolationAnnotations = interpolationAnnotations.filter((interpolationAnnotation) => !skipUIDs.has(interpolationAnnotation.interpolationUID));
|
|
121
|
+
annotation.interpolationUID =
|
|
122
|
+
((_b = interpolationAnnotations[0]) === null || _b === void 0 ? void 0 : _b.interpolationUID) || uuidv4();
|
|
123
|
+
viewportData.interpolationUID = annotation.interpolationUID;
|
|
110
124
|
(0, interpolate_1.default)(viewportData);
|
|
111
125
|
};
|
|
112
126
|
InterpolationManager.handleAnnotationUpdate = (evt) => {
|
|
@@ -115,8 +129,9 @@ InterpolationManager.handleAnnotationUpdate = (evt) => {
|
|
|
115
129
|
if (!(annotation === null || annotation === void 0 ? void 0 : annotation.metadata)) {
|
|
116
130
|
return;
|
|
117
131
|
}
|
|
118
|
-
const { toolName } = annotation.metadata;
|
|
119
|
-
if (!_a.toolNames.includes(toolName)
|
|
132
|
+
const { toolName, originalToolName } = annotation.metadata;
|
|
133
|
+
if ((!_a.toolNames.includes(toolName) &&
|
|
134
|
+
!_a.toolNames.includes(originalToolName)) ||
|
|
120
135
|
!ChangeTypesForInterpolation.includes(changeType)) {
|
|
121
136
|
return;
|
|
122
137
|
}
|
|
@@ -125,7 +140,10 @@ InterpolationManager.handleAnnotationUpdate = (evt) => {
|
|
|
125
140
|
console.warn('Unable to find matching viewport for annotation interpolation', annotation);
|
|
126
141
|
return;
|
|
127
142
|
}
|
|
128
|
-
annotation.autoGenerated
|
|
143
|
+
if (annotation.autoGenerated) {
|
|
144
|
+
(0, addContourSegmentationAnnotation_1.addContourSegmentationAnnotation)(annotation);
|
|
145
|
+
annotation.autoGenerated = false;
|
|
146
|
+
}
|
|
129
147
|
const sliceData = getSliceData(viewport);
|
|
130
148
|
const viewportData = {
|
|
131
149
|
viewport,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterpolationManager.js","sourceRoot":"","sources":["../../../../../src/utilities/segmentation/InterpolationManager/InterpolationManager.ts"],"names":[],"mappings":";;;;;;AAAA,8CAA2D;AAO3D,oEAA+E;AAE/E,iIAAyG;AAKzG,2FAAmE;AACnE,0FAAkE;AAElE,6EAAqD;AACrD,8FAAsE;
|
|
1
|
+
{"version":3,"file":"InterpolationManager.js","sourceRoot":"","sources":["../../../../../src/utilities/segmentation/InterpolationManager/InterpolationManager.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js
CHANGED
|
@@ -8,6 +8,7 @@ import * as contourSegUtils from '../../../utilities/contourSegmentation';
|
|
|
8
8
|
import { ToolGroupManager, hasTool as cstHasTool } from '../../../store';
|
|
9
9
|
import { PlanarFreehandContourSegmentationTool } from '../../../tools';
|
|
10
10
|
import { ContourWindingDirection } from '../../../types/ContourAnnotation';
|
|
11
|
+
import { triggerAnnotationModified } from '../../../stateManagement/annotation/helpers/state';
|
|
11
12
|
const DEFAULT_CONTOUR_SEG_TOOLNAME = 'PlanarFreehandContourSegmentationTool';
|
|
12
13
|
export default async function contourSegmentationCompletedListener(evt) {
|
|
13
14
|
const sourceAnnotation = evt.detail
|
|
@@ -175,6 +176,7 @@ function combinePolylines(viewport, targetAnnotation, targetPolyline, sourceAnno
|
|
|
175
176
|
metadata: {
|
|
176
177
|
...metadata,
|
|
177
178
|
toolName: DEFAULT_CONTOUR_SEG_TOOLNAME,
|
|
179
|
+
originalToolName: targetAnnotation.metadata.toolName,
|
|
178
180
|
},
|
|
179
181
|
data: {
|
|
180
182
|
cachedStats: {},
|
|
@@ -186,6 +188,7 @@ function combinePolylines(viewport, targetAnnotation, targetPolyline, sourceAnno
|
|
|
186
188
|
polyline: [],
|
|
187
189
|
closed: true,
|
|
188
190
|
},
|
|
191
|
+
spline: targetAnnotation.data.spline,
|
|
189
192
|
segmentation: {
|
|
190
193
|
...segmentation,
|
|
191
194
|
},
|
|
@@ -195,6 +198,8 @@ function combinePolylines(viewport, targetAnnotation, targetPolyline, sourceAnno
|
|
|
195
198
|
invalidated: true,
|
|
196
199
|
isLocked: false,
|
|
197
200
|
isVisible: undefined,
|
|
201
|
+
interpolationUID: targetAnnotation.interpolationUID,
|
|
202
|
+
interpolationCompleted: targetAnnotation.interpolationCompleted,
|
|
198
203
|
};
|
|
199
204
|
contourUtils.updateContourPolyline(newAnnotation, {
|
|
200
205
|
points: polyline,
|
|
@@ -203,6 +208,7 @@ function combinePolylines(viewport, targetAnnotation, targetPolyline, sourceAnno
|
|
|
203
208
|
}, viewport);
|
|
204
209
|
addAnnotation(newAnnotation, element);
|
|
205
210
|
contourSegUtils.addContourSegmentationAnnotation(newAnnotation);
|
|
211
|
+
triggerAnnotationModified(newAnnotation, viewport.element);
|
|
206
212
|
reassignedContourHolesMap
|
|
207
213
|
.get(polyline)
|
|
208
214
|
?.forEach((holeData) => addChildAnnotation(newAnnotation, holeData.annotation));
|
package/dist/esm/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":"AAAA,OAAO,EACL,iBAAiB,EACjB,SAAS,IAAI,OAAO,GAErB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,yBAAyB,MAAM,8CAA8C,CAAC;AACrF,OAAO,EACL,IAAI,EACJ,qCAAqC,GACtC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,qDAAqD,CAAC;AAK7D,OAAO,KAAK,YAAY,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,eAAe,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,qCAAqC,EAAE,MAAM,gBAAgB,CAAC;AAGvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"contourSegmentationCompleted.js","sourceRoot":"","sources":["../../../../../src/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,22 @@
|
|
|
1
1
|
import { getAnnotations } from '../../../stateManagement/annotation/annotationState';
|
|
2
|
+
const DEFAULT_CONTOUR_SEG_TOOLNAME = 'PlanarFreehandContourSegmentationTool';
|
|
2
3
|
export default function getInterpolationData(viewportData, filterParams = []) {
|
|
3
4
|
const { viewport, sliceData, annotation } = viewportData;
|
|
4
5
|
const interpolationDatas = new Map();
|
|
5
|
-
const
|
|
6
|
-
|
|
6
|
+
const { toolName, originalToolName } = annotation.metadata;
|
|
7
|
+
const testToolName = originalToolName || toolName;
|
|
8
|
+
const annotations = getAnnotations(testToolName, viewport.element) || [];
|
|
9
|
+
const modifiedAnnotations = getAnnotations(DEFAULT_CONTOUR_SEG_TOOLNAME, viewport.element);
|
|
10
|
+
if (modifiedAnnotations?.length) {
|
|
11
|
+
modifiedAnnotations.forEach((annotation) => {
|
|
12
|
+
const { metadata } = annotation;
|
|
13
|
+
if (metadata.originalToolName === testToolName &&
|
|
14
|
+
!annotations.find((it) => it === annotation)) {
|
|
15
|
+
annotations.push(annotation);
|
|
16
|
+
}
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
if (!annotations?.length) {
|
|
7
20
|
return interpolationDatas;
|
|
8
21
|
}
|
|
9
22
|
for (let i = 0; i < sliceData.numberOfSlices; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInterpolationData.js","sourceRoot":"","sources":["../../../../../src/utilities/contours/interpolation/getInterpolationData.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getInterpolationData.js","sourceRoot":"","sources":["../../../../../src/utilities/contours/interpolation/getInterpolationData.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,qDAAqD,CAAC;AAErF,MAAM,4BAA4B,GAAG,uCAAuC,CAAC;AAgC7E,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,YAAuC,EACvC,YAAY,GAAG,EAAE;IAEjB,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC;IACzD,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAwB,CAAC;IAC3D,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC;IAC3D,MAAM,YAAY,GAAG,gBAAgB,IAAI,QAAQ,CAAC;IAClD,MAAM,WAAW,GAAG,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACzE,MAAM,mBAAmB,GAAG,cAAc,CACxC,4BAA4B,EAC5B,QAAQ,CAAC,OAAO,CACjB,CAAC;IACF,IAAI,mBAAmB,EAAE,MAAM,EAAE;QAC/B,mBAAmB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACzC,MAAM,EAAE,QAAQ,EAAE,GAAG,UAA2C,CAAC;YACjE,IACE,QAAQ,CAAC,gBAAgB,KAAK,YAAY;gBAC1C,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,UAAU,CAAC,EAC5C;gBACA,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC9B;QACH,CAAC,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE;QACxB,OAAO,kBAAkB,CAAC;KAC3B;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE;QACjD,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,KAAK,CAAC,CACnC,CAAC;QAEF,IAAI,CAAC,gBAAgB,EAAE,MAAM,EAAE;YAC7B,SAAS;SACV;QAED,MAAM,+BAA+B,GAAG,gBAAgB,CAAC,MAAM,CAC7D,CAAC,eAAe,EAAE,EAAE;YAClB,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC9B,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS;oBACxB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC;oBAC9B,CAAC,CAAC,eAAe,CAAC;gBACpB,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACxB,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;iBAC9D;gBACD,OAAO,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC;YAC3B,CAAC,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,IAAI,+BAA+B,CAAC,MAAM,EAAE;YAC1C,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,+BAA+B,CAAC,CAAC;SAC5D;KACF;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC"}
|
|
@@ -7,12 +7,10 @@ import * as annotationState from '../../../stateManagement/annotation';
|
|
|
7
7
|
import selectHandles from './selectHandles';
|
|
8
8
|
const { PointsManager } = utilities;
|
|
9
9
|
const dP = 0.2;
|
|
10
|
-
let interpolating = false;
|
|
11
10
|
function interpolate(viewportData) {
|
|
12
|
-
if (
|
|
11
|
+
if (!viewportData.annotation) {
|
|
13
12
|
return;
|
|
14
13
|
}
|
|
15
|
-
interpolating = true;
|
|
16
14
|
const { isInterpolationUpdate, annotation } = viewportData;
|
|
17
15
|
queueMicrotask(() => {
|
|
18
16
|
try {
|
|
@@ -23,7 +21,6 @@ function interpolate(viewportData) {
|
|
|
23
21
|
startInterpolation(viewportData);
|
|
24
22
|
}
|
|
25
23
|
finally {
|
|
26
|
-
interpolating = false;
|
|
27
24
|
if (isInterpolationUpdate) {
|
|
28
25
|
annotation.autoGenerated = true;
|
|
29
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interpolate.js","sourceRoot":"","sources":["../../../../../src/utilities/contours/interpolation/interpolate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"interpolate.js","sourceRoot":"","sources":["../../../../../src/utilities/contours/interpolation/interpolate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
import { vec3 } from 'gl-matrix';
|
|
2
2
|
import { utilities } from '@cornerstonejs/core';
|
|
3
3
|
const { PointsManager } = utilities;
|
|
4
|
-
export default function selectHandles(polyline, handleCount =
|
|
4
|
+
export default function selectHandles(polyline, handleCount = 12) {
|
|
5
5
|
const handles = PointsManager.create3(handleCount);
|
|
6
6
|
handles.sources = [];
|
|
7
7
|
const { sources: destPoints } = handles;
|
|
8
8
|
const { length, sources: sourcePoints = [] } = polyline;
|
|
9
9
|
const distance = 6;
|
|
10
10
|
if (length < distance * 3) {
|
|
11
|
-
console.log('Adding subselect handles', handleCount, length);
|
|
12
11
|
return polyline.subselect(handleCount);
|
|
13
12
|
}
|
|
14
|
-
const interval = Math.
|
|
13
|
+
const interval = Math.floor(Math.max((2 * length) / handleCount, distance * 5));
|
|
15
14
|
sourcePoints.forEach(() => destPoints.push(PointsManager.create3(handleCount)));
|
|
16
15
|
const dotValues = createDotValues(polyline, distance);
|
|
17
16
|
const minimumRegions = findMinimumRegions(dotValues, handleCount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selectHandles.js","sourceRoot":"","sources":["../../../../../src/utilities/contours/interpolation/selectHandles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"selectHandles.js","sourceRoot":"","sources":["../../../../../src/utilities/contours/interpolation/selectHandles.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,6 @@ import distanceToPoint from './distanceToPoint';
|
|
|
2
2
|
import distanceToPointSquared from './distanceToPointSquared';
|
|
3
3
|
import distanceToPointSquaredInfo from './distanceToPointSquaredInfo';
|
|
4
4
|
import intersectLine from './intersectLine';
|
|
5
|
-
|
|
5
|
+
import isPointOnLineSegment from './isPointOnLineSegment';
|
|
6
|
+
export { distanceToPoint, distanceToPointSquared, distanceToPointSquaredInfo, intersectLine, isPointOnLineSegment, };
|
|
6
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/utilities/math/line/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,0BAA0B,MAAM,8BAA8B,CAAC;AACtE,OAAO,aAAa,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/utilities/math/line/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,0BAA0B,MAAM,8BAA8B,CAAC;AACtE,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EACL,eAAe,EACf,sBAAsB,EACtB,0BAA0B,EAC1B,aAAa,EACb,oBAAoB,GACrB,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
const ORIENTATION_TOLERANCE = 1e-2;
|
|
2
|
+
export default function isPointOnLineSegment(lineStart, lineEnd, point) {
|
|
3
|
+
const minX = lineStart[0] <= lineEnd[0] ? lineStart[0] : lineEnd[0];
|
|
4
|
+
const maxX = lineStart[0] >= lineEnd[0] ? lineStart[0] : lineEnd[0];
|
|
5
|
+
const minY = lineStart[1] <= lineEnd[1] ? lineStart[1] : lineEnd[1];
|
|
6
|
+
const maxY = lineStart[1] >= lineEnd[1] ? lineStart[1] : lineEnd[1];
|
|
7
|
+
const aabbContainsPoint = point[0] >= minX - ORIENTATION_TOLERANCE &&
|
|
8
|
+
point[0] <= maxX + ORIENTATION_TOLERANCE &&
|
|
9
|
+
point[1] >= minY - ORIENTATION_TOLERANCE &&
|
|
10
|
+
point[1] <= maxY + ORIENTATION_TOLERANCE;
|
|
11
|
+
if (!aabbContainsPoint) {
|
|
12
|
+
return false;
|
|
13
|
+
}
|
|
14
|
+
const orientation = (lineEnd[1] - lineStart[1]) * (point[0] - lineEnd[0]) -
|
|
15
|
+
(lineEnd[0] - lineStart[0]) * (point[1] - lineEnd[1]);
|
|
16
|
+
const absOrientation = orientation >= 0 ? orientation : -orientation;
|
|
17
|
+
return absOrientation <= ORIENTATION_TOLERANCE;
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=isPointOnLineSegment.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isPointOnLineSegment.js","sourceRoot":"","sources":["../../../../../src/utilities/math/line/isPointOnLineSegment.ts"],"names":[],"mappings":"AAEA,MAAM,qBAAqB,GAAG,IAAI,CAAC;AASnC,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAuB,EACvB,OAAqB,EACrB,KAAmB;IAKnB,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAGpE,MAAM,iBAAiB,GACrB,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,qBAAqB;QACxC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,qBAAqB;QACxC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,qBAAqB;QACxC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,qBAAqB,CAAC;IAE3C,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,KAAK,CAAC;KACd;IAGD,MAAM,WAAW,GACf,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACrD,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,WAAW,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IAGrE,OAAO,cAAc,IAAI,qBAAqB,CAAC;AACjD,CAAC"}
|
|
@@ -3,7 +3,7 @@ import getLineSegmentIntersectionsIndexes from './getLineSegmentIntersectionsInd
|
|
|
3
3
|
import containsPoint from './containsPoint';
|
|
4
4
|
import getNormal2 from './getNormal2';
|
|
5
5
|
import { glMatrix, vec3 } from 'gl-matrix';
|
|
6
|
-
import
|
|
6
|
+
import getLinesIntersection from './getLinesIntersection';
|
|
7
7
|
var PolylinePointType;
|
|
8
8
|
(function (PolylinePointType) {
|
|
9
9
|
PolylinePointType[PolylinePointType["Vertex"] = 0] = "Vertex";
|
|
@@ -55,7 +55,7 @@ function getSourceAndTargetPointsList(targetPolyline, sourcePolyline) {
|
|
|
55
55
|
const sourceLineSegmentId = intersectedLineSegment[0];
|
|
56
56
|
const p2 = sourcePolyline[intersectedLineSegment[0]];
|
|
57
57
|
const q2 = sourcePolyline[intersectedLineSegment[1]];
|
|
58
|
-
const intersectionCoordinate =
|
|
58
|
+
const intersectionCoordinate = getLinesIntersection(p1, q1, p2, q2);
|
|
59
59
|
const targetStartPointDistSquared = mathPoint.distanceToPointSquared(p1, intersectionCoordinate);
|
|
60
60
|
return {
|
|
61
61
|
sourceLineSegmentId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"combinePolyline.js","sourceRoot":"","sources":["../../../../../src/utilities/math/polyline/combinePolyline.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,UAAU,CAAC;AACtC,OAAO,kCAAkC,MAAM,sCAAsC,CAAC;AACtF,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,
|
|
1
|
+
{"version":3,"file":"combinePolyline.js","sourceRoot":"","sources":["../../../../../src/utilities/math/polyline/combinePolyline.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import getLineSegmentIntersectionsIndexes from './getLineSegmentIntersectionsIndexes';
|
|
2
|
-
import
|
|
2
|
+
import getLinesIntersection from './getLinesIntersection';
|
|
3
3
|
export default function getLineSegmentIntersectionsCoordinates(points, p1, q1, closed = true) {
|
|
4
4
|
const result = [];
|
|
5
5
|
const polylineIndexes = getLineSegmentIntersectionsIndexes(points, p1, q1, closed);
|
|
6
6
|
for (let i = 0; i < polylineIndexes.length; i++) {
|
|
7
7
|
const p2 = points[polylineIndexes[i][0]];
|
|
8
8
|
const q2 = points[polylineIndexes[i][1]];
|
|
9
|
-
const intersection =
|
|
9
|
+
const intersection = getLinesIntersection(p1, q1, p2, q2);
|
|
10
10
|
result.push(intersection);
|
|
11
11
|
}
|
|
12
12
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLineSegmentIntersectionsCoordinates.js","sourceRoot":"","sources":["../../../../../src/utilities/math/polyline/getLineSegmentIntersectionsCoordinates.ts"],"names":[],"mappings":"AACA,OAAO,kCAAkC,MAAM,sCAAsC,CAAC;AACtF,OAAO,
|
|
1
|
+
{"version":3,"file":"getLineSegmentIntersectionsCoordinates.js","sourceRoot":"","sources":["../../../../../src/utilities/math/polyline/getLineSegmentIntersectionsCoordinates.ts"],"names":[],"mappings":"AACA,OAAO,kCAAkC,MAAM,sCAAsC,CAAC;AACtF,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAK1D,MAAM,CAAC,OAAO,UAAU,sCAAsC,CAC5D,MAAsB,EACtB,EAAgB,EAChB,EAAgB,EAChB,MAAM,GAAG,IAAI;IAEb,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,MAAM,eAAe,GAAG,kCAAkC,CACxD,MAAM,EACN,EAAE,EACF,EAAE,EACF,MAAM,CACP,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/C,MAAM,EAAE,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,EAAE,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,YAAY,GAAG,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;KAC3B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import * as mathLine from '../line';
|
|
2
|
+
const PARALLEL_LINES_TOLERANCE = 1e-2;
|
|
3
|
+
export default function getLinesIntersection(p1, q1, p2, q2) {
|
|
4
|
+
const diffQ1P1 = [q1[0] - p1[0], q1[1] - p1[1]];
|
|
5
|
+
const diffQ2P2 = [q2[0] - p2[0], q2[1] - p2[1]];
|
|
6
|
+
const denominator = diffQ2P2[1] * diffQ1P1[0] - diffQ2P2[0] * diffQ1P1[1];
|
|
7
|
+
const absDenominator = denominator >= 0 ? denominator : -denominator;
|
|
8
|
+
if (absDenominator < PARALLEL_LINES_TOLERANCE) {
|
|
9
|
+
const line1AABB = [
|
|
10
|
+
p1[0] < q1[0] ? p1[0] : q1[0],
|
|
11
|
+
p1[0] > q1[0] ? p1[0] : q1[0],
|
|
12
|
+
p1[1] < q1[1] ? p1[1] : q1[1],
|
|
13
|
+
p1[1] > q1[1] ? p1[1] : q1[1],
|
|
14
|
+
];
|
|
15
|
+
const line2AABB = [
|
|
16
|
+
p2[0] < q2[0] ? p2[0] : q2[0],
|
|
17
|
+
p2[0] > q2[0] ? p2[0] : q2[0],
|
|
18
|
+
p2[1] < q2[1] ? p2[1] : q2[1],
|
|
19
|
+
p2[1] > q2[1] ? p2[1] : q2[1],
|
|
20
|
+
];
|
|
21
|
+
const aabbIntersects = line1AABB[0] <= line2AABB[1] &&
|
|
22
|
+
line1AABB[1] >= line2AABB[0] &&
|
|
23
|
+
line1AABB[2] <= line2AABB[3] &&
|
|
24
|
+
line1AABB[3] >= line2AABB[2];
|
|
25
|
+
if (!aabbIntersects) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const overlap = mathLine.isPointOnLineSegment(p1, q1, p2) ||
|
|
29
|
+
mathLine.isPointOnLineSegment(p1, q1, q2) ||
|
|
30
|
+
mathLine.isPointOnLineSegment(p2, q2, p1);
|
|
31
|
+
if (!overlap) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
const minX = line1AABB[0] > line2AABB[0] ? line1AABB[0] : line2AABB[0];
|
|
35
|
+
const maxX = line1AABB[1] < line2AABB[1] ? line1AABB[1] : line2AABB[1];
|
|
36
|
+
const minY = line1AABB[2] > line2AABB[2] ? line1AABB[2] : line2AABB[2];
|
|
37
|
+
const maxY = line1AABB[3] < line2AABB[3] ? line1AABB[3] : line2AABB[3];
|
|
38
|
+
const midX = (minX + maxX) * 0.5;
|
|
39
|
+
const midY = (minY + maxY) * 0.5;
|
|
40
|
+
return [midX, midY];
|
|
41
|
+
}
|
|
42
|
+
let a = p1[1] - p2[1];
|
|
43
|
+
let b = p1[0] - p2[0];
|
|
44
|
+
const numerator1 = diffQ2P2[0] * a - diffQ2P2[1] * b;
|
|
45
|
+
const numerator2 = diffQ1P1[0] * a - diffQ1P1[1] * b;
|
|
46
|
+
a = numerator1 / denominator;
|
|
47
|
+
b = numerator2 / denominator;
|
|
48
|
+
const resultX = p1[0] + a * diffQ1P1[0];
|
|
49
|
+
const resultY = p1[1] + a * diffQ1P1[1];
|
|
50
|
+
return [resultX, resultY];
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=getLinesIntersection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getLinesIntersection.js","sourceRoot":"","sources":["../../../../../src/utilities/math/polyline/getLinesIntersection.ts"],"names":[],"mappings":"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"}
|