@cornerstonejs/tools 1.63.2 → 1.63.4
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/annotation/KeyImageTool.d.ts +1 -29
- package/dist/cjs/tools/annotation/KeyImageTool.js +3 -30
- package/dist/cjs/tools/annotation/KeyImageTool.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationTool.d.ts +3 -0
- package/dist/cjs/tools/base/AnnotationTool.js +41 -0
- package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
- package/dist/esm/tools/annotation/KeyImageTool.js +3 -30
- package/dist/esm/tools/annotation/KeyImageTool.js.map +1 -1
- package/dist/esm/tools/base/AnnotationTool.js +42 -1
- package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
- package/dist/types/tools/annotation/KeyImageTool.d.ts +1 -29
- package/dist/types/tools/annotation/KeyImageTool.d.ts.map +1 -1
- package/dist/types/tools/base/AnnotationTool.d.ts +3 -0
- package/dist/types/tools/base/AnnotationTool.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/tools/annotation/KeyImageTool.ts +3 -31
- package/src/tools/base/AnnotationTool.ts +68 -2
|
@@ -18,35 +18,7 @@ declare class KeyImageTool extends AnnotationTool {
|
|
|
18
18
|
isDrawing: boolean;
|
|
19
19
|
isHandleOutsideImage: boolean;
|
|
20
20
|
constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
|
|
21
|
-
addNewAnnotation: (evt: EventTypes.InteractionEventType) =>
|
|
22
|
-
annotationUID: string;
|
|
23
|
-
highlighted: boolean;
|
|
24
|
-
invalidated: boolean;
|
|
25
|
-
metadata: {
|
|
26
|
-
toolName: string;
|
|
27
|
-
viewPlaneNormal: Types.Point3;
|
|
28
|
-
viewUp: Types.Point3;
|
|
29
|
-
FrameOfReferenceUID: string;
|
|
30
|
-
referencedImageId: string;
|
|
31
|
-
};
|
|
32
|
-
data: {
|
|
33
|
-
text: string;
|
|
34
|
-
handles: {
|
|
35
|
-
points: Types.Point3[];
|
|
36
|
-
textBox: {
|
|
37
|
-
hasMoved: boolean;
|
|
38
|
-
worldPosition: Types.Point3;
|
|
39
|
-
worldBoundingBox: {
|
|
40
|
-
topLeft: Types.Point3;
|
|
41
|
-
topRight: Types.Point3;
|
|
42
|
-
bottomLeft: Types.Point3;
|
|
43
|
-
bottomRight: Types.Point3;
|
|
44
|
-
};
|
|
45
|
-
};
|
|
46
|
-
};
|
|
47
|
-
label: string;
|
|
48
|
-
};
|
|
49
|
-
};
|
|
21
|
+
addNewAnnotation: (evt: EventTypes.InteractionEventType) => Annotation;
|
|
50
22
|
cancel(): void;
|
|
51
23
|
isPointNearTool: (element: HTMLDivElement, annotation: Annotation, canvasCoords: Types.Point2, proximity: number) => boolean;
|
|
52
24
|
toolSelectedCallback: (evt: EventTypes.InteractionEventType, annotation: Annotation) => void;
|
|
@@ -33,36 +33,9 @@ class KeyImageTool extends base_1.AnnotationTool {
|
|
|
33
33
|
const camera = viewport.getCamera();
|
|
34
34
|
const { viewPlaneNormal, viewUp } = camera;
|
|
35
35
|
const referencedImageId = this.getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp);
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
highlighted: true,
|
|
40
|
-
invalidated: true,
|
|
41
|
-
metadata: {
|
|
42
|
-
toolName: this.getToolName(),
|
|
43
|
-
viewPlaneNormal: [...viewPlaneNormal],
|
|
44
|
-
viewUp: [...viewUp],
|
|
45
|
-
FrameOfReferenceUID,
|
|
46
|
-
referencedImageId,
|
|
47
|
-
},
|
|
48
|
-
data: {
|
|
49
|
-
text: '',
|
|
50
|
-
handles: {
|
|
51
|
-
points: new Array(),
|
|
52
|
-
textBox: {
|
|
53
|
-
hasMoved: false,
|
|
54
|
-
worldPosition: [0, 0, 0],
|
|
55
|
-
worldBoundingBox: {
|
|
56
|
-
topLeft: [0, 0, 0],
|
|
57
|
-
topRight: [0, 0, 0],
|
|
58
|
-
bottomLeft: [0, 0, 0],
|
|
59
|
-
bottomRight: [0, 0, 0],
|
|
60
|
-
},
|
|
61
|
-
},
|
|
62
|
-
},
|
|
63
|
-
label: '',
|
|
64
|
-
},
|
|
65
|
-
};
|
|
36
|
+
const annotation = KeyImageTool.createAnnotation({
|
|
37
|
+
metadata: Object.assign(Object.assign({}, viewport.getViewReference()), { referencedImageId }),
|
|
38
|
+
});
|
|
66
39
|
(0, annotationState_1.addAnnotation)(annotation, element);
|
|
67
40
|
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, this.getToolName());
|
|
68
41
|
evt.preventDefault();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeyImageTool.js","sourceRoot":"","sources":["../../../../src/tools/annotation/KeyImageTool.ts"],"names":[],"mappings":";;;;;AAAA,uCAAqC;AACrC,8CAA8E;AAG9E,kCAAyC;AACzC,sFAI0D;AAE1D,0EAGwD;AACxD,iDAA6D;AAC7D,uCAAoC;AACpC,qEAAiF;AACjF,kIAA0G;AAE1G,+DAAiE;AAcjE,MAAM,YAAa,SAAQ,qBAAc;IAiBvC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,eAAe;YACf,kBAAkB;YAClB,cAAc,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YACxB,UAAU,EAAE,EAAE;SACf;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAWrC,qBAAgB,GAAG,CAAC,GAAoC,EAAE,EAAE;YAC1D,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;YAC/B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;YAC/C,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC;YACrC,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;YAClD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;YAErD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;YACpC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;YAE3C,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CACjD,QAAQ,EACR,QAAQ,EACR,eAAe,EACf,MAAM,CACP,CAAC;YAEF,MAAM,
|
|
1
|
+
{"version":3,"file":"KeyImageTool.js","sourceRoot":"","sources":["../../../../src/tools/annotation/KeyImageTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,9 @@ import AnnotationDisplayTool from './AnnotationDisplayTool';
|
|
|
3
3
|
import { Annotation, Annotations, EventTypes, ToolHandle, InteractionTypes, ToolProps, PublicToolProps } from '../../types';
|
|
4
4
|
import { StyleSpecifier } from '../../types/AnnotationStyle';
|
|
5
5
|
declare abstract class AnnotationTool extends AnnotationDisplayTool {
|
|
6
|
+
static createAnnotation(...annotationBaseData: any[]): Annotation;
|
|
7
|
+
static createAnnotationForViewport(viewport: any, ...annotationBaseData: any[]): Annotation;
|
|
8
|
+
static createAndAddAnnotation(viewport: any, ...annotationBaseData: any[]): void;
|
|
6
9
|
static toolName: any;
|
|
7
10
|
constructor(toolProps: PublicToolProps, defaultToolProps: ToolProps);
|
|
8
11
|
abstract addNewAnnotation(evt: EventTypes.InteractionEventType, interactionType: InteractionTypes): Annotation;
|
|
@@ -8,6 +8,8 @@ const gl_matrix_1 = require("gl-matrix");
|
|
|
8
8
|
const AnnotationDisplayTool_1 = __importDefault(require("./AnnotationDisplayTool"));
|
|
9
9
|
const annotationLocking_1 = require("../../stateManagement/annotation/annotationLocking");
|
|
10
10
|
const annotationVisibility_1 = require("../../stateManagement/annotation/annotationVisibility");
|
|
11
|
+
const annotationState_1 = require("../../stateManagement/annotation/annotationState");
|
|
12
|
+
const state_1 = require("../../stateManagement/annotation/helpers/state");
|
|
11
13
|
class AnnotationTool extends AnnotationDisplayTool_1.default {
|
|
12
14
|
constructor(toolProps, defaultToolProps) {
|
|
13
15
|
var _a, _b;
|
|
@@ -50,6 +52,45 @@ class AnnotationTool extends AnnotationDisplayTool_1.default {
|
|
|
50
52
|
toolProps.configuration.statsCalculator;
|
|
51
53
|
}
|
|
52
54
|
}
|
|
55
|
+
static createAnnotation(...annotationBaseData) {
|
|
56
|
+
let annotation = {
|
|
57
|
+
annotationUID: null,
|
|
58
|
+
highlighted: true,
|
|
59
|
+
invalidated: true,
|
|
60
|
+
metadata: {
|
|
61
|
+
toolName: this.toolName,
|
|
62
|
+
},
|
|
63
|
+
data: {
|
|
64
|
+
text: '',
|
|
65
|
+
handles: {
|
|
66
|
+
points: new Array(),
|
|
67
|
+
textBox: {
|
|
68
|
+
hasMoved: false,
|
|
69
|
+
worldPosition: [0, 0, 0],
|
|
70
|
+
worldBoundingBox: {
|
|
71
|
+
topLeft: [0, 0, 0],
|
|
72
|
+
topRight: [0, 0, 0],
|
|
73
|
+
bottomLeft: [0, 0, 0],
|
|
74
|
+
bottomRight: [0, 0, 0],
|
|
75
|
+
},
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
label: '',
|
|
79
|
+
},
|
|
80
|
+
};
|
|
81
|
+
for (const baseData of annotationBaseData) {
|
|
82
|
+
annotation = core_1.utilities.deepMerge(annotation, baseData);
|
|
83
|
+
}
|
|
84
|
+
return annotation;
|
|
85
|
+
}
|
|
86
|
+
static createAnnotationForViewport(viewport, ...annotationBaseData) {
|
|
87
|
+
return this.createAnnotation({ metadata: viewport.getViewReference() }, ...annotationBaseData);
|
|
88
|
+
}
|
|
89
|
+
static createAndAddAnnotation(viewport, ...annotationBaseData) {
|
|
90
|
+
const annotation = this.createAnnotationForViewport(viewport, ...annotationBaseData);
|
|
91
|
+
(0, annotationState_1.addAnnotation)(annotation, viewport.element);
|
|
92
|
+
(0, state_1.triggerAnnotationModified)(annotation, viewport.element);
|
|
93
|
+
}
|
|
53
94
|
getHandleNearImagePoint(element, annotation, canvasCoords, proximity) {
|
|
54
95
|
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
55
96
|
const { viewport } = enabledElement;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,36 +28,9 @@ class KeyImageTool extends AnnotationTool {
|
|
|
28
28
|
const camera = viewport.getCamera();
|
|
29
29
|
const { viewPlaneNormal, viewUp } = camera;
|
|
30
30
|
const referencedImageId = this.getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp);
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
highlighted: true,
|
|
35
|
-
invalidated: true,
|
|
36
|
-
metadata: {
|
|
37
|
-
toolName: this.getToolName(),
|
|
38
|
-
viewPlaneNormal: [...viewPlaneNormal],
|
|
39
|
-
viewUp: [...viewUp],
|
|
40
|
-
FrameOfReferenceUID,
|
|
41
|
-
referencedImageId,
|
|
42
|
-
},
|
|
43
|
-
data: {
|
|
44
|
-
text: '',
|
|
45
|
-
handles: {
|
|
46
|
-
points: new Array(),
|
|
47
|
-
textBox: {
|
|
48
|
-
hasMoved: false,
|
|
49
|
-
worldPosition: [0, 0, 0],
|
|
50
|
-
worldBoundingBox: {
|
|
51
|
-
topLeft: [0, 0, 0],
|
|
52
|
-
topRight: [0, 0, 0],
|
|
53
|
-
bottomLeft: [0, 0, 0],
|
|
54
|
-
bottomRight: [0, 0, 0],
|
|
55
|
-
},
|
|
56
|
-
},
|
|
57
|
-
},
|
|
58
|
-
label: '',
|
|
59
|
-
},
|
|
60
|
-
};
|
|
31
|
+
const annotation = KeyImageTool.createAnnotation({
|
|
32
|
+
metadata: { ...viewport.getViewReference(), referencedImageId },
|
|
33
|
+
});
|
|
61
34
|
addAnnotation(annotation, element);
|
|
62
35
|
const viewportIdsToRender = getViewportIdsWithToolToRender(element, this.getToolName());
|
|
63
36
|
evt.preventDefault();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeyImageTool.js","sourceRoot":"","sources":["../../../../src/tools/annotation/KeyImageTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9E,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EACL,aAAa,EACb,cAAc,EACd,gBAAgB,GACjB,MAAM,kDAAkD,CAAC;AAE1D,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,qCAAqC,MAAM,uDAAuD,CAAC;AAE1G,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAcjE,MAAM,YAAa,SAAQ,cAAc;IAiBvC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,eAAe;YACf,kBAAkB;YAClB,cAAc,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YACxB,UAAU,EAAE,EAAE;SACf;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAWrC,qBAAgB,GAAG,CAAC,GAAoC,EAAE,EAAE;YAC1D,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;YAC/B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;YAC/C,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC;YACrC,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAClD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;YAErD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;YACpC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;YAE3C,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CACjD,QAAQ,EACR,QAAQ,EACR,eAAe,EACf,MAAM,CACP,CAAC;YAEF,MAAM,
|
|
1
|
+
{"version":3,"file":"KeyImageTool.js","sourceRoot":"","sources":["../../../../src/tools/annotation/KeyImageTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import { BaseVolumeViewport, cache, getEnabledElement, metaData, } from '@cornerstonejs/core';
|
|
1
|
+
import { BaseVolumeViewport, cache, getEnabledElement, metaData, utilities as csUtils, } from '@cornerstonejs/core';
|
|
2
2
|
import { vec2 } from 'gl-matrix';
|
|
3
3
|
import AnnotationDisplayTool from './AnnotationDisplayTool';
|
|
4
4
|
import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
|
|
5
5
|
import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
|
|
6
|
+
import { addAnnotation } from '../../stateManagement/annotation/annotationState';
|
|
7
|
+
import { triggerAnnotationModified } from '../../stateManagement/annotation/helpers/state';
|
|
6
8
|
class AnnotationTool extends AnnotationDisplayTool {
|
|
7
9
|
constructor(toolProps, defaultToolProps) {
|
|
8
10
|
super(toolProps, defaultToolProps);
|
|
@@ -44,6 +46,45 @@ class AnnotationTool extends AnnotationDisplayTool {
|
|
|
44
46
|
toolProps.configuration.statsCalculator;
|
|
45
47
|
}
|
|
46
48
|
}
|
|
49
|
+
static createAnnotation(...annotationBaseData) {
|
|
50
|
+
let annotation = {
|
|
51
|
+
annotationUID: null,
|
|
52
|
+
highlighted: true,
|
|
53
|
+
invalidated: true,
|
|
54
|
+
metadata: {
|
|
55
|
+
toolName: this.toolName,
|
|
56
|
+
},
|
|
57
|
+
data: {
|
|
58
|
+
text: '',
|
|
59
|
+
handles: {
|
|
60
|
+
points: new Array(),
|
|
61
|
+
textBox: {
|
|
62
|
+
hasMoved: false,
|
|
63
|
+
worldPosition: [0, 0, 0],
|
|
64
|
+
worldBoundingBox: {
|
|
65
|
+
topLeft: [0, 0, 0],
|
|
66
|
+
topRight: [0, 0, 0],
|
|
67
|
+
bottomLeft: [0, 0, 0],
|
|
68
|
+
bottomRight: [0, 0, 0],
|
|
69
|
+
},
|
|
70
|
+
},
|
|
71
|
+
},
|
|
72
|
+
label: '',
|
|
73
|
+
},
|
|
74
|
+
};
|
|
75
|
+
for (const baseData of annotationBaseData) {
|
|
76
|
+
annotation = csUtils.deepMerge(annotation, baseData);
|
|
77
|
+
}
|
|
78
|
+
return annotation;
|
|
79
|
+
}
|
|
80
|
+
static createAnnotationForViewport(viewport, ...annotationBaseData) {
|
|
81
|
+
return this.createAnnotation({ metadata: viewport.getViewReference() }, ...annotationBaseData);
|
|
82
|
+
}
|
|
83
|
+
static createAndAddAnnotation(viewport, ...annotationBaseData) {
|
|
84
|
+
const annotation = this.createAnnotationForViewport(viewport, ...annotationBaseData);
|
|
85
|
+
addAnnotation(annotation, viewport.element);
|
|
86
|
+
triggerAnnotationModified(annotation, viewport.element);
|
|
87
|
+
}
|
|
47
88
|
getHandleNearImagePoint(element, annotation, canvasCoords, proximity) {
|
|
48
89
|
const enabledElement = getEnabledElement(element);
|
|
49
90
|
const { viewport } = enabledElement;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,KAAK,EACL,iBAAiB,EACjB,QAAQ,
|
|
1
|
+
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,35 +18,7 @@ declare class KeyImageTool extends AnnotationTool {
|
|
|
18
18
|
isDrawing: boolean;
|
|
19
19
|
isHandleOutsideImage: boolean;
|
|
20
20
|
constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
|
|
21
|
-
addNewAnnotation: (evt: EventTypes.InteractionEventType) =>
|
|
22
|
-
annotationUID: string;
|
|
23
|
-
highlighted: boolean;
|
|
24
|
-
invalidated: boolean;
|
|
25
|
-
metadata: {
|
|
26
|
-
toolName: string;
|
|
27
|
-
viewPlaneNormal: Types.Point3;
|
|
28
|
-
viewUp: Types.Point3;
|
|
29
|
-
FrameOfReferenceUID: string;
|
|
30
|
-
referencedImageId: string;
|
|
31
|
-
};
|
|
32
|
-
data: {
|
|
33
|
-
text: string;
|
|
34
|
-
handles: {
|
|
35
|
-
points: Types.Point3[];
|
|
36
|
-
textBox: {
|
|
37
|
-
hasMoved: boolean;
|
|
38
|
-
worldPosition: Types.Point3;
|
|
39
|
-
worldBoundingBox: {
|
|
40
|
-
topLeft: Types.Point3;
|
|
41
|
-
topRight: Types.Point3;
|
|
42
|
-
bottomLeft: Types.Point3;
|
|
43
|
-
bottomRight: Types.Point3;
|
|
44
|
-
};
|
|
45
|
-
};
|
|
46
|
-
};
|
|
47
|
-
label: string;
|
|
48
|
-
};
|
|
49
|
-
};
|
|
21
|
+
addNewAnnotation: (evt: EventTypes.InteractionEventType) => Annotation;
|
|
50
22
|
cancel(): void;
|
|
51
23
|
isPointNearTool: (element: HTMLDivElement, annotation: Annotation, canvasCoords: Types.Point2, proximity: number) => boolean;
|
|
52
24
|
toolSelectedCallback: (evt: EventTypes.InteractionEventType, annotation: Annotation) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeyImageTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/annotation/KeyImageTool.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAkBzC,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,SAAS,EACT,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,cAAM,YAAa,SAAQ,cAAc;IACvC,MAAM,CAAC,QAAQ,MAAC;IAET,iBAAiB,EAAE,GAAG,CAAC;IACvB,iBAAiB,EAAE,GAAG,CAAC;IAC9B,8BAA8B,EAAE,GAAG,CAAC;IACpC,QAAQ,EAAE;QACR,UAAU,EAAE,GAAG,CAAC;QAChB,mBAAmB,EAAE,MAAM,EAAE,CAAC;QAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,IAAI,CAAC;IACT,SAAS,EAAE,OAAO,CAAC;IACnB,oBAAoB,EAAE,OAAO,CAAC;gBAG5B,SAAS,GAAE,eAAoB,EAC/B,gBAAgB,GAAE,SAQjB;IAaH,gBAAgB,QAAS,WAAW,oBAAoB
|
|
1
|
+
{"version":3,"file":"KeyImageTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/annotation/KeyImageTool.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAkBzC,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,SAAS,EACT,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,cAAM,YAAa,SAAQ,cAAc;IACvC,MAAM,CAAC,QAAQ,MAAC;IAET,iBAAiB,EAAE,GAAG,CAAC;IACvB,iBAAiB,EAAE,GAAG,CAAC;IAC9B,8BAA8B,EAAE,GAAG,CAAC;IACpC,QAAQ,EAAE;QACR,UAAU,EAAE,GAAG,CAAC;QAChB,mBAAmB,EAAE,MAAM,EAAE,CAAC;QAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,IAAI,CAAC;IACT,SAAS,EAAE,OAAO,CAAC;IACnB,oBAAoB,EAAE,OAAO,CAAC;gBAG5B,SAAS,GAAE,eAAoB,EAC/B,gBAAgB,GAAE,SAQjB;IAaH,gBAAgB,QAAS,WAAW,oBAAoB,gBAqDtD;IAEK,MAAM;IAeb,eAAe,YACJ,cAAc,cACX,UAAU,yCAEX,MAAM,KAChB,OAAO,CAkBR;IAEF,oBAAoB,QACb,WAAW,oBAAoB,cACxB,UAAU,KACrB,IAAI,CAIL;IAEF,sBAAsB,CACpB,GAAG,EAAE,UAAU,CAAC,oBAAoB,EACpC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,UAAU,GACjB,IAAI;IAIP,YAAY,QAAS,WAAW,oBAAoB,KAAG,IAAI,CAMzD;IAEF,mBAAmB,QAAS,WAAW,iBAAiB,KAAG,IAAI,CA2C7D;IAEF,yBAAyB,CAAC,OAAO,KAAA,EAAE,UAAU,KAAA,EAAE,WAAW,KAAA,GAAG,IAAI;IAgBjE,eAAe,YAAa,cAAc,UAoBxC;IAEF,iBAAiB,YAAa,cAAc,UAoB1C;IAUF,gBAAgB,mBACE,MAAM,eAAe,oBACnB,gBAAgB,KACjC,OAAO,CAiER;IAEF,eAAe,CAAC,MAAM,KAAA,EAAE,MAAM,KAAA,EAAE,UAAU,KAAA;CAM3C;AAYD,eAAe,YAAY,CAAC"}
|
|
@@ -3,6 +3,9 @@ import AnnotationDisplayTool from './AnnotationDisplayTool';
|
|
|
3
3
|
import { Annotation, Annotations, EventTypes, ToolHandle, InteractionTypes, ToolProps, PublicToolProps } from '../../types';
|
|
4
4
|
import { StyleSpecifier } from '../../types/AnnotationStyle';
|
|
5
5
|
declare abstract class AnnotationTool extends AnnotationDisplayTool {
|
|
6
|
+
static createAnnotation(...annotationBaseData: any[]): Annotation;
|
|
7
|
+
static createAnnotationForViewport(viewport: any, ...annotationBaseData: any[]): Annotation;
|
|
8
|
+
static createAndAddAnnotation(viewport: any, ...annotationBaseData: any[]): void;
|
|
6
9
|
static toolName: any;
|
|
7
10
|
constructor(toolProps: PublicToolProps, defaultToolProps: ToolProps);
|
|
8
11
|
abstract addNewAnnotation(evt: EventTypes.InteractionEventType, interactionType: InteractionTypes): Annotation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AnnotationTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAIjD,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACL,UAAU,EACV,WAAW,EACX,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,eAAe,EAChB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAa7D,uBAAe,cAAe,SAAQ,qBAAqB;WAI3C,gBAAgB,CAAC,GAAG,kBAAkB,OAAA,GAAG,UAAU;WAqCnD,2BAA2B,CAAC,QAAQ,KAAA,EAAE,GAAG,kBAAkB,OAAA;WAe3D,sBAAsB,CAAC,QAAQ,KAAA,EAAE,GAAG,kBAAkB,OAAA;IASpE,MAAM,CAAC,QAAQ,MAAC;gBAKJ,SAAS,EAAE,eAAe,EAAE,gBAAgB,EAAE,SAAS;IAmBnE,QAAQ,CAAC,gBAAgB,CACvB,GAAG,EAAE,UAAU,CAAC,oBAAoB,EACpC,eAAe,EAAE,gBAAgB,GAChC,UAAU;IAMb,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,cAAc;IAUvC,QAAQ,CAAC,sBAAsB,CAC7B,GAAG,EAAE,UAAU,CAAC,oBAAoB,EACpC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,UAAU,EAClB,eAAe,EAAE,gBAAgB,GAChC,IAAI;IASP,QAAQ,CAAC,oBAAoB,CAC3B,GAAG,EAAE,UAAU,CAAC,oBAAoB,EACpC,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,gBAAgB,EACjC,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,GAC1B,IAAI;IAaP,QAAQ,CAAC,eAAe,CACtB,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO;IAUH,iBAAiB,QACjB,WAAW,kBAAkB,wCAEjC,OAAO,CA+CR;IAeF,uBAAuB,CACrB,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,SAAS,EAAE,MAAM,GAChB,UAAU,GAAG,SAAS;IAuDlB,qBAAqB,CAC1B,cAAc,EAAE,cAAc,EAC9B,UAAU,CAAC,EAAE,UAAU,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2C1B,WAAW,CACT,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC,eAAe,EACtD,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO;IAeV,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE;QACpC,UAAU,EAAE,UAAU,CAAC;QACvB,cAAc,EAAE,cAAc,CAAC;KAChC;;;;;;;;;;;;IAsCD,OAAO,CAAC,2BAA2B;CA+BpC;AAGD,eAAe,cAAc,CAAC"}
|