@cornerstonejs/tools 1.18.0 → 1.19.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/tools/ReferenceLinesTool.d.ts +3 -0
- package/dist/cjs/tools/ReferenceLinesTool.js +71 -2
- package/dist/cjs/tools/ReferenceLinesTool.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationDisplayTool.js +4 -0
- package/dist/cjs/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/esm/tools/ReferenceLinesTool.d.ts +3 -0
- package/dist/esm/tools/ReferenceLinesTool.js +71 -2
- package/dist/esm/tools/ReferenceLinesTool.js.map +1 -1
- package/dist/esm/tools/base/AnnotationDisplayTool.js +3 -0
- package/dist/esm/tools/base/AnnotationDisplayTool.js.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/tools/ReferenceLinesTool.ts +131 -3
- package/src/tools/base/AnnotationDisplayTool.ts +4 -0
|
@@ -20,6 +20,9 @@ declare class ReferenceLines extends AnnotationDisplayTool {
|
|
|
20
20
|
onCameraModified: (evt: Types.EventTypes.CameraModifiedEvent) => void;
|
|
21
21
|
renderAnnotation: (enabledElement: Types.IEnabledElement, svgDrawingHelper: SVGDrawingHelper) => boolean;
|
|
22
22
|
isPerpendicular: (vec1: Types.Point3, vec2: Types.Point3) => boolean;
|
|
23
|
+
private handleFullDimension;
|
|
24
|
+
intersectInfiniteLines(line1Start: Types.Point2, line1End: Types.Point2, line2Start: Types.Point2, line2End: Types.Point2): number[];
|
|
23
25
|
isParallel(vec1: Types.Point3, vec2: Types.Point3): boolean;
|
|
26
|
+
isInBound(point: number[], dimensions: Types.Point3): boolean;
|
|
24
27
|
}
|
|
25
28
|
export default ReferenceLines;
|
|
@@ -16,6 +16,7 @@ class ReferenceLines extends AnnotationDisplayTool_1.default {
|
|
|
16
16
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
17
17
|
configuration: {
|
|
18
18
|
sourceViewportId: '',
|
|
19
|
+
showFullDimension: false,
|
|
19
20
|
},
|
|
20
21
|
}) {
|
|
21
22
|
super(toolProps, defaultToolProps);
|
|
@@ -99,7 +100,7 @@ class ReferenceLines extends AnnotationDisplayTool_1.default {
|
|
|
99
100
|
const topRight = annotation.data.handles.points[1];
|
|
100
101
|
const bottomLeft = annotation.data.handles.points[2];
|
|
101
102
|
const bottomRight = annotation.data.handles.points[3];
|
|
102
|
-
const { focalPoint, viewPlaneNormal } = targetViewport.getCamera();
|
|
103
|
+
const { focalPoint, viewPlaneNormal, viewUp } = targetViewport.getCamera();
|
|
103
104
|
const { viewPlaneNormal: sourceViewPlaneNormal } = sourceViewport.getCamera();
|
|
104
105
|
if (this.isParallel(viewPlaneNormal, sourceViewPlaneNormal)) {
|
|
105
106
|
return renderStatus;
|
|
@@ -127,7 +128,10 @@ class ReferenceLines extends AnnotationDisplayTool_1.default {
|
|
|
127
128
|
const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
|
|
128
129
|
const color = this.getStyle('color', styleSpecifier, annotation);
|
|
129
130
|
const shadow = this.getStyle('shadow', styleSpecifier, annotation);
|
|
130
|
-
|
|
131
|
+
let canvasCoordinates = [lineStartWorld, lineEndWorld].map((world) => targetViewport.worldToCanvas(world));
|
|
132
|
+
if (this.configuration.showFullDimension) {
|
|
133
|
+
canvasCoordinates = this.handleFullDimension(targetViewport, lineStartWorld, viewPlaneNormal, viewUp, lineEndWorld, canvasCoordinates);
|
|
134
|
+
}
|
|
131
135
|
const dataId = `${annotationUID}-line`;
|
|
132
136
|
const lineUID = '1';
|
|
133
137
|
(0, drawingSvg_1.drawLine)(svgDrawingHelper, annotationUID, lineUID, canvasCoordinates[0], canvasCoordinates[1], {
|
|
@@ -144,9 +148,74 @@ class ReferenceLines extends AnnotationDisplayTool_1.default {
|
|
|
144
148
|
return Math.abs(dot) < EPSILON;
|
|
145
149
|
};
|
|
146
150
|
}
|
|
151
|
+
handleFullDimension(targetViewport, lineStartWorld, viewPlaneNormal, viewUp, lineEndWorld, canvasCoordinates) {
|
|
152
|
+
const renderingEngine = targetViewport.getRenderingEngine();
|
|
153
|
+
const targetId = this.getTargetId(targetViewport);
|
|
154
|
+
const targetImage = this.getTargetIdImage(targetId, renderingEngine);
|
|
155
|
+
const referencedImageId = this.getReferencedImageId(targetViewport, lineStartWorld, viewPlaneNormal, viewUp);
|
|
156
|
+
if (referencedImageId && targetImage) {
|
|
157
|
+
try {
|
|
158
|
+
const { imageData, dimensions } = targetImage;
|
|
159
|
+
const [topLeftImageCoord, topRightImageCoord, bottomRightImageCoord, bottomLeftImageCoord,] = [
|
|
160
|
+
imageData.indexToWorld([0, 0, 0]),
|
|
161
|
+
imageData.indexToWorld([dimensions[0] - 1, 0, 0]),
|
|
162
|
+
imageData.indexToWorld([
|
|
163
|
+
dimensions[0] - 1,
|
|
164
|
+
dimensions[1] - 1,
|
|
165
|
+
0,
|
|
166
|
+
]),
|
|
167
|
+
imageData.indexToWorld([0, dimensions[1] - 1, 0]),
|
|
168
|
+
].map((world) => core_1.utilities.worldToImageCoords(referencedImageId, world));
|
|
169
|
+
const [lineStartImageCoord, lineEndImageCoord] = [
|
|
170
|
+
lineStartWorld,
|
|
171
|
+
lineEndWorld,
|
|
172
|
+
].map((world) => core_1.utilities.worldToImageCoords(referencedImageId, world));
|
|
173
|
+
canvasCoordinates = [
|
|
174
|
+
[topLeftImageCoord, topRightImageCoord],
|
|
175
|
+
[topRightImageCoord, bottomRightImageCoord],
|
|
176
|
+
[bottomLeftImageCoord, bottomRightImageCoord],
|
|
177
|
+
[topLeftImageCoord, bottomLeftImageCoord],
|
|
178
|
+
]
|
|
179
|
+
.map(([start, end]) => this.intersectInfiniteLines(start, end, lineStartImageCoord, lineEndImageCoord))
|
|
180
|
+
.filter((point) => point && this.isInBound(point, dimensions))
|
|
181
|
+
.map((point) => {
|
|
182
|
+
const world = core_1.utilities.imageToWorldCoords(referencedImageId, point);
|
|
183
|
+
return targetViewport.worldToCanvas(world);
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
catch (err) {
|
|
187
|
+
console.log(err);
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
return canvasCoordinates;
|
|
191
|
+
}
|
|
192
|
+
intersectInfiniteLines(line1Start, line1End, line2Start, line2End) {
|
|
193
|
+
const [x1, y1] = line1Start;
|
|
194
|
+
const [x2, y2] = line1End;
|
|
195
|
+
const [x3, y3] = line2Start;
|
|
196
|
+
const [x4, y4] = line2End;
|
|
197
|
+
const a1 = y2 - y1;
|
|
198
|
+
const b1 = x1 - x2;
|
|
199
|
+
const c1 = x2 * y1 - x1 * y2;
|
|
200
|
+
const a2 = y4 - y3;
|
|
201
|
+
const b2 = x3 - x4;
|
|
202
|
+
const c2 = x4 * y3 - x3 * y4;
|
|
203
|
+
if (Math.abs(a1 * b2 - a2 * b1) < EPSILON) {
|
|
204
|
+
return;
|
|
205
|
+
}
|
|
206
|
+
const x = (b1 * c2 - b2 * c1) / (a1 * b2 - a2 * b1);
|
|
207
|
+
const y = (a2 * c1 - a1 * c2) / (a1 * b2 - a2 * b1);
|
|
208
|
+
return [x, y];
|
|
209
|
+
}
|
|
147
210
|
isParallel(vec1, vec2) {
|
|
148
211
|
return Math.abs(gl_matrix_1.vec3.dot(vec1, vec2)) > 1 - EPSILON;
|
|
149
212
|
}
|
|
213
|
+
isInBound(point, dimensions) {
|
|
214
|
+
return (point[0] >= 0 &&
|
|
215
|
+
point[0] <= dimensions[0] &&
|
|
216
|
+
point[1] >= 0 &&
|
|
217
|
+
point[1] <= dimensions[1]);
|
|
218
|
+
}
|
|
150
219
|
}
|
|
151
220
|
ReferenceLines.toolName = 'ReferenceLines';
|
|
152
221
|
exports.default = ReferenceLines;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceLinesTool.js","sourceRoot":"","sources":["../../../src/tools/ReferenceLinesTool.ts"],"names":[],"mappings":";;;;;AAAA,yCAAiC;AACjC,8CAI6B;AAG7B,mFAA8E;AAE9E,8CAAwD;AACxD,kEAA8E;AAC9E,+HAAuG;
|
|
1
|
+
{"version":3,"file":"ReferenceLinesTool.js","sourceRoot":"","sources":["../../../src/tools/ReferenceLinesTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,10 @@ class AnnotationDisplayTool extends BaseTool_1.default {
|
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
27
|
toolSpecificAnnotations.forEach((annotation) => {
|
|
28
|
+
var _a;
|
|
29
|
+
if (!((_a = annotation.metadata) === null || _a === void 0 ? void 0 : _a.referencedImageId)) {
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
28
32
|
const referencedImageURI = core_1.utilities.imageIdToURI(annotation.metadata.referencedImageId);
|
|
29
33
|
if (referencedImageURI === imageURI) {
|
|
30
34
|
annotation.invalidated = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAM6B;AAG7B,0DAAkC;AAClC,sFAAwF;AAExF,sGAA8E;AAC9E,qHAA6F;AAC7F,6EAAmF;AACnF,oEAAmE;AAanE,MAAe,qBAAsB,SAAQ,kBAAQ;IAArD;;QAqDS,6BAAwB,GAAG,CAChC,GAAiD,EACjD,EAAE;YACF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YAExC,MAAM,QAAQ,GAAG,gBAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACjD,MAAM,iBAAiB,GAAG,IAAA,sCAAoB,GAAE,CAAC;YACjD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;YAGnE,iBAAiB,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;gBAC7C,MAAM,mCAAmC,GACvC,iBAAiB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;gBAErD,MAAM,uBAAuB,GAC3B,mCAAmC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAE1D,IAAI,CAAC,uBAAuB,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE;oBAC/D,OAAO;iBACR;gBAGD,uBAAuB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAM6B;AAG7B,0DAAkC;AAClC,sFAAwF;AAExF,sGAA8E;AAC9E,qHAA6F;AAC7F,6EAAmF;AACnF,oEAAmE;AAanE,MAAe,qBAAsB,SAAQ,kBAAQ;IAArD;;QAqDS,6BAAwB,GAAG,CAChC,GAAiD,EACjD,EAAE;YACF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YAExC,MAAM,QAAQ,GAAG,gBAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACjD,MAAM,iBAAiB,GAAG,IAAA,sCAAoB,GAAE,CAAC;YACjD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;YAGnE,iBAAiB,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;gBAC7C,MAAM,mCAAmC,GACvC,iBAAiB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;gBAErD,MAAM,uBAAuB,GAC3B,mCAAmC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAE1D,IAAI,CAAC,uBAAuB,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE;oBAC/D,OAAO;iBACR;gBAGD,uBAAuB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;;oBAC7C,IAAI,CAAC,CAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,iBAAiB,CAAA,EAAE;wBAC3C,OAAO;qBACR;oBAGD,MAAM,kBAAkB,GAAG,gBAAS,CAAC,YAAY,CAC/C,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CACtC,CAAC;oBAEF,IAAI,kBAAkB,KAAK,QAAQ,EAAE;wBAGnC,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC;wBAC9B,UAAU,CAAC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;qBAClC;gBACH,CAAC,CAAC,CAAC;gBACH,IAAA,iCAAuB,EAAC,OAAO,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IAqDJ,CAAC;IArHC,uCAAuC,CACrC,OAAuB,EACvB,WAAwB;QAExB,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YACvC,OAAO;SACR;QAED,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAEpC,OAAO,IAAA,qCAA2B,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;IAsDS,oBAAoB,CAC5B,QAAsD,EACtD,QAAsB,EACtB,eAA6B,EAC7B,MAAoB;QAEpB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE5C,IAAI,iBAAiB,CAAC;QAEtB,IAAI,QAAQ,YAAY,oBAAa,EAAE;YACrC,iBAAiB,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;SACnD;aAAM;YACL,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,MAAM,WAAW,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAE9C,iBAAiB,GAAG,gBAAS,CAAC,iBAAiB,CAC7C,WAAW,EACX,QAAQ,EACR,eAAe,CAChB,CAAC;SACH;QAED,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAeM,QAAQ,CACb,QAAgB,EAChB,cAA8B,EAC9B,UAAuB;QAEvB,OAAO,IAAA,0BAAgB,EACrB,QAAQ,EACR,cAAc,EACd,IAAA,iBAAQ,EAAC,UAAU,CAAC,EACpB,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;CACF;AAED,qBAAqB,CAAC,QAAQ,GAAG,uBAAuB,CAAC;AACzD,kBAAe,qBAAqB,CAAC"}
|
|
@@ -20,6 +20,9 @@ declare class ReferenceLines extends AnnotationDisplayTool {
|
|
|
20
20
|
onCameraModified: (evt: Types.EventTypes.CameraModifiedEvent) => void;
|
|
21
21
|
renderAnnotation: (enabledElement: Types.IEnabledElement, svgDrawingHelper: SVGDrawingHelper) => boolean;
|
|
22
22
|
isPerpendicular: (vec1: Types.Point3, vec2: Types.Point3) => boolean;
|
|
23
|
+
private handleFullDimension;
|
|
24
|
+
intersectInfiniteLines(line1Start: Types.Point2, line1End: Types.Point2, line2Start: Types.Point2, line2End: Types.Point2): number[];
|
|
23
25
|
isParallel(vec1: Types.Point3, vec2: Types.Point3): boolean;
|
|
26
|
+
isInBound(point: number[], dimensions: Types.Point3): boolean;
|
|
24
27
|
}
|
|
25
28
|
export default ReferenceLines;
|
|
@@ -11,6 +11,7 @@ class ReferenceLines extends AnnotationDisplayTool {
|
|
|
11
11
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
12
12
|
configuration: {
|
|
13
13
|
sourceViewportId: '',
|
|
14
|
+
showFullDimension: false,
|
|
14
15
|
},
|
|
15
16
|
}) {
|
|
16
17
|
super(toolProps, defaultToolProps);
|
|
@@ -93,7 +94,7 @@ class ReferenceLines extends AnnotationDisplayTool {
|
|
|
93
94
|
const topRight = annotation.data.handles.points[1];
|
|
94
95
|
const bottomLeft = annotation.data.handles.points[2];
|
|
95
96
|
const bottomRight = annotation.data.handles.points[3];
|
|
96
|
-
const { focalPoint, viewPlaneNormal } = targetViewport.getCamera();
|
|
97
|
+
const { focalPoint, viewPlaneNormal, viewUp } = targetViewport.getCamera();
|
|
97
98
|
const { viewPlaneNormal: sourceViewPlaneNormal } = sourceViewport.getCamera();
|
|
98
99
|
if (this.isParallel(viewPlaneNormal, sourceViewPlaneNormal)) {
|
|
99
100
|
return renderStatus;
|
|
@@ -121,7 +122,10 @@ class ReferenceLines extends AnnotationDisplayTool {
|
|
|
121
122
|
const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
|
|
122
123
|
const color = this.getStyle('color', styleSpecifier, annotation);
|
|
123
124
|
const shadow = this.getStyle('shadow', styleSpecifier, annotation);
|
|
124
|
-
|
|
125
|
+
let canvasCoordinates = [lineStartWorld, lineEndWorld].map((world) => targetViewport.worldToCanvas(world));
|
|
126
|
+
if (this.configuration.showFullDimension) {
|
|
127
|
+
canvasCoordinates = this.handleFullDimension(targetViewport, lineStartWorld, viewPlaneNormal, viewUp, lineEndWorld, canvasCoordinates);
|
|
128
|
+
}
|
|
125
129
|
const dataId = `${annotationUID}-line`;
|
|
126
130
|
const lineUID = '1';
|
|
127
131
|
drawLineSvg(svgDrawingHelper, annotationUID, lineUID, canvasCoordinates[0], canvasCoordinates[1], {
|
|
@@ -138,9 +142,74 @@ class ReferenceLines extends AnnotationDisplayTool {
|
|
|
138
142
|
return Math.abs(dot) < EPSILON;
|
|
139
143
|
};
|
|
140
144
|
}
|
|
145
|
+
handleFullDimension(targetViewport, lineStartWorld, viewPlaneNormal, viewUp, lineEndWorld, canvasCoordinates) {
|
|
146
|
+
const renderingEngine = targetViewport.getRenderingEngine();
|
|
147
|
+
const targetId = this.getTargetId(targetViewport);
|
|
148
|
+
const targetImage = this.getTargetIdImage(targetId, renderingEngine);
|
|
149
|
+
const referencedImageId = this.getReferencedImageId(targetViewport, lineStartWorld, viewPlaneNormal, viewUp);
|
|
150
|
+
if (referencedImageId && targetImage) {
|
|
151
|
+
try {
|
|
152
|
+
const { imageData, dimensions } = targetImage;
|
|
153
|
+
const [topLeftImageCoord, topRightImageCoord, bottomRightImageCoord, bottomLeftImageCoord,] = [
|
|
154
|
+
imageData.indexToWorld([0, 0, 0]),
|
|
155
|
+
imageData.indexToWorld([dimensions[0] - 1, 0, 0]),
|
|
156
|
+
imageData.indexToWorld([
|
|
157
|
+
dimensions[0] - 1,
|
|
158
|
+
dimensions[1] - 1,
|
|
159
|
+
0,
|
|
160
|
+
]),
|
|
161
|
+
imageData.indexToWorld([0, dimensions[1] - 1, 0]),
|
|
162
|
+
].map((world) => csUtils.worldToImageCoords(referencedImageId, world));
|
|
163
|
+
const [lineStartImageCoord, lineEndImageCoord] = [
|
|
164
|
+
lineStartWorld,
|
|
165
|
+
lineEndWorld,
|
|
166
|
+
].map((world) => csUtils.worldToImageCoords(referencedImageId, world));
|
|
167
|
+
canvasCoordinates = [
|
|
168
|
+
[topLeftImageCoord, topRightImageCoord],
|
|
169
|
+
[topRightImageCoord, bottomRightImageCoord],
|
|
170
|
+
[bottomLeftImageCoord, bottomRightImageCoord],
|
|
171
|
+
[topLeftImageCoord, bottomLeftImageCoord],
|
|
172
|
+
]
|
|
173
|
+
.map(([start, end]) => this.intersectInfiniteLines(start, end, lineStartImageCoord, lineEndImageCoord))
|
|
174
|
+
.filter((point) => point && this.isInBound(point, dimensions))
|
|
175
|
+
.map((point) => {
|
|
176
|
+
const world = csUtils.imageToWorldCoords(referencedImageId, point);
|
|
177
|
+
return targetViewport.worldToCanvas(world);
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
catch (err) {
|
|
181
|
+
console.log(err);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
return canvasCoordinates;
|
|
185
|
+
}
|
|
186
|
+
intersectInfiniteLines(line1Start, line1End, line2Start, line2End) {
|
|
187
|
+
const [x1, y1] = line1Start;
|
|
188
|
+
const [x2, y2] = line1End;
|
|
189
|
+
const [x3, y3] = line2Start;
|
|
190
|
+
const [x4, y4] = line2End;
|
|
191
|
+
const a1 = y2 - y1;
|
|
192
|
+
const b1 = x1 - x2;
|
|
193
|
+
const c1 = x2 * y1 - x1 * y2;
|
|
194
|
+
const a2 = y4 - y3;
|
|
195
|
+
const b2 = x3 - x4;
|
|
196
|
+
const c2 = x4 * y3 - x3 * y4;
|
|
197
|
+
if (Math.abs(a1 * b2 - a2 * b1) < EPSILON) {
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
200
|
+
const x = (b1 * c2 - b2 * c1) / (a1 * b2 - a2 * b1);
|
|
201
|
+
const y = (a2 * c1 - a1 * c2) / (a1 * b2 - a2 * b1);
|
|
202
|
+
return [x, y];
|
|
203
|
+
}
|
|
141
204
|
isParallel(vec1, vec2) {
|
|
142
205
|
return Math.abs(vec3.dot(vec1, vec2)) > 1 - EPSILON;
|
|
143
206
|
}
|
|
207
|
+
isInBound(point, dimensions) {
|
|
208
|
+
return (point[0] >= 0 &&
|
|
209
|
+
point[0] <= dimensions[0] &&
|
|
210
|
+
point[1] >= 0 &&
|
|
211
|
+
point[1] <= dimensions[1]);
|
|
212
|
+
}
|
|
144
213
|
}
|
|
145
214
|
ReferenceLines.toolName = 'ReferenceLines';
|
|
146
215
|
export default ReferenceLines;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceLinesTool.js","sourceRoot":"","sources":["../../../src/tools/ReferenceLinesTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,mBAAmB,EACnB,SAAS,EACT,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAE9E,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,qCAAqC,MAAM,oDAAoD,CAAC;
|
|
1
|
+
{"version":3,"file":"ReferenceLinesTool.js","sourceRoot":"","sources":["../../../src/tools/ReferenceLinesTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,mBAAmB,EACnB,SAAS,EACT,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAE9E,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,qCAAqC,MAAM,oDAAoD,CAAC;AAIvG,OAAO,qBAAqB,MAAM,8BAA8B,CAAC;AAEjE,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;AAM9B,MAAM,cAAe,SAAQ,qBAAqB;IAchD,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,gBAAgB,EAAE,EAAE;YACpB,iBAAiB,EAAE,KAAK;SACzB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAlBrC,aAAQ,GAIG,EAAS,CAAC;QAuBrB,UAAK,GAAG,GAAS,EAAE;YACjB,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;YAC/C,MAAM,eAAe,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;YAG5C,IAAI,CAAC,eAAe,EAAE;gBACpB,OAAO;aACR;YAED,IAAI,SAAS,GAAG,eAAe,CAAC,YAAY,EAAE,CAAC;YAC/C,SAAS,GAAG,8BAA8B,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAE1E,MAAM,cAAc,GAAG,eAAe,CAAC,WAAW,CAChD,IAAI,CAAC,aAAa,CAAC,gBAAgB,CACX,CAAC;YAE3B,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,EAAE;gBACrD,OAAO;aACR;YAED,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;YACnC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC;YAE/D,MAAM,kCAAkC,GACtC,OAAO,CAAC,8BAA8B,CAAC,cAAc,CAAC,CAAC;YAEzD,IAAI,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;YAC1C,MAAM,mBAAmB,GAAG,cAAc,CAAC,sBAAsB,EAAE,CAAC;YAEpE,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,aAAa,GAA4B;oBAC7C,WAAW,EAAE,IAAI;oBACjB,WAAW,EAAE,IAAI;oBACjB,QAAQ,EAAE;wBACR,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE;wBAC5B,eAAe,EAAgB,CAAC,GAAG,eAAe,CAAC;wBACnD,MAAM,EAAgB,CAAC,GAAG,MAAM,CAAC;wBACjC,mBAAmB;wBACnB,iBAAiB,EAAE,IAAI;qBACxB;oBACD,IAAI,EAAE;wBACJ,OAAO,EAAE;4BACP,MAAM,EAAE,kCAAkC;yBAC3C;qBACF;iBACF,CAAC;gBAEF,aAAa,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;gBACtC,UAAU,GAAG,aAAa,CAAC;aAC5B;iBAAM;gBACL,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC1C,kCAAkC,CAAC;aACtC;YAED,IAAI,CAAC,QAAQ,GAAG;gBACd,cAAc;gBACd,eAAe;gBACf,UAAU;aACX,CAAC;YAEF,qCAAqC,CACnC,eAAe,EACf,SAAS;iBACN,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,cAAc,CAAC,EAAE,CAAC;iBACvD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAClC,CAAC;QACJ,CAAC,CAAC;QAEF,qBAAgB,GAAG,GAAS,EAAE;YAC5B,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC,CAAC;QAEF,qBAAgB,GAAG,CAAC,GAAyC,EAAQ,EAAE;YAKrE,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC,CAAC;QAUF,qBAAgB,GAAG,CACjB,cAAqC,EACrC,gBAAkC,EACzB,EAAE;YACX,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;YACpD,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YAErD,IAAI,YAAY,GAAG,KAAK,CAAC;YAEzB,IAAI,CAAC,cAAc,EAAE;gBACnB,OAAO,YAAY,CAAC;aACrB;YAED,IAAI,cAAc,CAAC,EAAE,KAAK,cAAc,CAAC,EAAE,EAAE;gBAE3C,OAAO,YAAY,CAAC;aACrB;YAED,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE;gBACrD,OAAO,YAAY,CAAC;aACrB;YAED,MAAM,cAAc,GAAmB;gBACrC,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE;gBAC5B,UAAU,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE;aACvC,CAAC;YAGF,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAClD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAEtD,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC;YAC3E,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAC9C,cAAc,CAAC,SAAS,EAAE,CAAC;YAE7B,IAAI,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,qBAAqB,CAAC,EAAE;gBAE3D,OAAO,YAAY,CAAC;aACrB;YAED,MAAM,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CACtD,eAAe,EACf,UAAU,CACX,CAAC;YAGF,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;YAC/D,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YAE/D,IAAI,aAAa,GAAG,SAAS,CAAC;YAE9B,IAAI,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5E,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,YAAY,CAAiB,CAAC;YAE3E,IAAI,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3E,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC,CAAC;YAEzD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAC1B,IAAI,CAAC,MAAM,EAAE,EACb,YAAY,EACZ,WAAW,CACI,CAAC;YAElB,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE;gBAC/C,OAAO,YAAY,CAAC;aACrB;YAID,IAAI,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,eAAe,CAAC,EAAE;gBAEvD,aAAa,GAAG,SAAS,CAAC;aAC3B;YAED,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,qBAAqB,CACzD,aAAa,CAAC,CAAC,CAAC,EAChB,aAAa,CAAC,CAAC,CAAC,EAChB,mBAAmB,CACpB,CAAC;YAEF,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,qBAAqB,CACvD,aAAa,CAAC,CAAC,CAAC,EAChB,aAAa,CAAC,CAAC,CAAC,EAChB,mBAAmB,CACpB,CAAC;YACF,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC;YAErC,cAAc,CAAC,aAAa,GAAG,aAAa,CAAC;YAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;YACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;YACvE,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;YACjE,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;YAEnE,IAAI,iBAAiB,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACnE,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,CACpC,CAAC;YAEF,IAAI,IAAI,CAAC,aAAa,CAAC,iBAAiB,EAAE;gBACxC,iBAAiB,GAAG,IAAI,CAAC,mBAAmB,CAC1C,cAAc,EACd,cAAc,EACd,eAAe,EACf,MAAM,EACN,YAAY,EACZ,iBAAiB,CAClB,CAAC;aACH;YAED,MAAM,MAAM,GAAG,GAAG,aAAa,OAAO,CAAC;YACvC,MAAM,OAAO,GAAG,GAAG,CAAC;YACpB,WAAW,CACT,gBAAgB,EAChB,aAAa,EACb,OAAO,EACP,iBAAiB,CAAC,CAAC,CAAC,EACpB,iBAAiB,CAAC,CAAC,CAAC,EACpB;gBACE,KAAK;gBACL,KAAK,EAAE,SAAS;gBAChB,QAAQ;gBACR,MAAM;aACP,EACD,MAAM,CACP,CAAC;YAEF,YAAY,GAAG,IAAI,CAAC;YAEpB,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC;QAEF,oBAAe,GAAG,CAAC,IAAkB,EAAE,IAAkB,EAAW,EAAE;YACpE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;QACjC,CAAC,CAAC;IAlOF,CAAC;IAoOO,mBAAmB,CACzB,cAA4D,EAC5D,cAA4B,EAC5B,eAA6B,EAC7B,MAAoB,EACpB,YAA0B,EAC1B,iBAAiC;QAEjC,MAAM,eAAe,GAAG,cAAc,CAAC,kBAAkB,EAAE,CAAC;QAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QAErE,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CACjD,cAAc,EACd,cAAc,EACd,eAAe,EACf,MAAM,CACP,CAAC;QAEF,IAAI,iBAAiB,IAAI,WAAW,EAAE;YACpC,IAAI;gBACF,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;gBAG9C,MAAM,CACJ,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACrB,GAAG;oBACF,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAiB;oBACjD,SAAS,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAiB;oBACjE,SAAS,CAAC,YAAY,CAAC;wBACrB,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC;wBACjB,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC;wBACjB,CAAC;qBACF,CAAiB;oBAClB,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAiB;iBAClE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAC;gBAGvE,MAAM,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,GAAG;oBAC/C,cAAc;oBACd,YAAY;iBACb,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAC;gBAGvE,iBAAiB,GAAG;oBAClB,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;oBACvC,CAAC,kBAAkB,EAAE,qBAAqB,CAAC;oBAC3C,CAAC,oBAAoB,EAAE,qBAAqB,CAAC;oBAC7C,CAAC,iBAAiB,EAAE,oBAAoB,CAAC;iBAC1C;qBACE,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CACpB,IAAI,CAAC,sBAAsB,CACzB,KAAK,EACL,GAAG,EACH,mBAAmB,EACnB,iBAAiB,CAClB,CACF;qBACA,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;qBAC7D,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;oBACb,MAAM,KAAK,GAAG,OAAO,CAAC,kBAAkB,CACtC,iBAAiB,EACjB,KAAqB,CACtB,CAAC;oBACF,OAAO,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAC7C,CAAC,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aAClB;SACF;QACD,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAGD,sBAAsB,CACpB,UAAwB,EACxB,QAAsB,EACtB,UAAwB,EACxB,QAAsB;QAEtB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC;QAC5B,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC;QAC1B,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC;QAC5B,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC;QAG1B,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QACnB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QACnB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QAG7B,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QACnB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QACnB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QAE7B,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,EAAE;YACzC,OAAO;SACR;QAED,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAEpD,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,IAAkB,EAAE,IAAkB;QAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;IACtD,CAAC;IAED,SAAS,CAAC,KAAe,EAAE,UAAwB;QACjD,OAAO,CACL,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;YACb,KAAK,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC;YACzB,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;YACb,KAAK,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAC1B,CAAC;IACJ,CAAC;CACF;AAED,cAAc,CAAC,QAAQ,GAAG,gBAAgB,CAAC;AAC3C,eAAe,cAAc,CAAC"}
|
|
@@ -20,6 +20,9 @@ class AnnotationDisplayTool extends BaseTool {
|
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
22
|
toolSpecificAnnotations.forEach((annotation) => {
|
|
23
|
+
if (!annotation.metadata?.referencedImageId) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
23
26
|
const referencedImageURI = utilities.imageIdToURI(annotation.metadata.referencedImageId);
|
|
24
27
|
if (referencedImageURI === imageURI) {
|
|
25
28
|
annotation.invalidated = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,iBAAiB,EAEjB,aAAa,EACb,KAAK,GACN,MAAM,qBAAqB,CAAC;AAG7B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AAExF,OAAO,uBAAuB,MAAM,yCAAyC,CAAC;AAC9E,OAAO,2BAA2B,MAAM,oDAAoD,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,yCAAyC,CAAC;AAanE,MAAe,qBAAsB,SAAQ,QAAQ;IAArD;;QAqDS,6BAAwB,GAAG,CAChC,GAAiD,EACjD,EAAE;YACF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YAExC,MAAM,QAAQ,GAAG,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACjD,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC;YACjD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;YAGnE,iBAAiB,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;gBAC7C,MAAM,mCAAmC,GACvC,iBAAiB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;gBAErD,MAAM,uBAAuB,GAC3B,mCAAmC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAE1D,IAAI,CAAC,uBAAuB,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE;oBAC/D,OAAO;iBACR;gBAGD,uBAAuB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":"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"}
|