@cornerstonejs/tools 0.12.1 → 0.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/cursors/SVGMouseCursor.js +2 -2
- package/dist/cjs/cursors/SVGMouseCursor.js.map +1 -1
- package/dist/cjs/drawingSvg/drawArrow.js +0 -2
- package/dist/cjs/drawingSvg/drawArrow.js.map +1 -1
- package/dist/cjs/drawingSvg/drawTextBox.js +9 -0
- package/dist/cjs/drawingSvg/drawTextBox.js.map +1 -1
- package/dist/cjs/index.d.ts +2 -2
- package/dist/cjs/index.js +2 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/config/ToolStyle.d.ts +18 -0
- package/dist/cjs/stateManagement/annotation/config/ToolStyle.js +129 -0
- package/dist/cjs/stateManagement/annotation/config/ToolStyle.js.map +1 -0
- package/dist/cjs/stateManagement/annotation/config/getFont.d.ts +2 -2
- package/dist/cjs/stateManagement/annotation/config/getFont.js +4 -6
- package/dist/cjs/stateManagement/annotation/config/getFont.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/config/helpers.d.ts +4 -0
- package/dist/cjs/stateManagement/annotation/config/helpers.js +26 -0
- package/dist/cjs/stateManagement/annotation/config/helpers.js.map +1 -0
- package/dist/cjs/stateManagement/annotation/config/index.d.ts +2 -5
- package/dist/cjs/stateManagement/annotation/config/index.js +3 -9
- package/dist/cjs/stateManagement/annotation/config/index.js.map +1 -1
- package/dist/cjs/stateManagement/index.d.ts +1 -4
- package/dist/cjs/stateManagement/index.js +1 -10
- package/dist/cjs/stateManagement/index.js.map +1 -1
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.js +12 -7
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.js.map +1 -1
- package/dist/cjs/tools/annotation/BidirectionalTool.js +11 -8
- package/dist/cjs/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/cjs/tools/annotation/DragProbeTool.d.ts +23 -0
- package/dist/cjs/tools/annotation/DragProbeTool.js +109 -0
- package/dist/cjs/tools/annotation/DragProbeTool.js.map +1 -0
- package/dist/cjs/tools/annotation/EllipticalROITool.js +42 -30
- package/dist/cjs/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/LengthTool.js +11 -8
- package/dist/cjs/tools/annotation/LengthTool.js.map +1 -1
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js +0 -1
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/ProbeTool.js +8 -4
- package/dist/cjs/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/cjs/tools/annotation/RectangleROITool.js +11 -8
- package/dist/cjs/tools/annotation/RectangleROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.js +16 -10
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationTool.d.ts +3 -3
- package/dist/cjs/tools/base/AnnotationTool.js +10 -10
- package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
- package/dist/cjs/tools/index.d.ts +2 -1
- package/dist/cjs/tools/index.js +3 -1
- package/dist/cjs/tools/index.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js +10 -7
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js +10 -7
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js +0 -3
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/cjs/types/AnnotationStyle.d.ts +29 -0
- package/dist/cjs/types/AnnotationStyle.js +3 -0
- package/dist/cjs/types/AnnotationStyle.js.map +1 -0
- package/dist/cjs/types/index.d.ts +2 -1
- package/dist/esm/cursors/SVGMouseCursor.js +2 -2
- package/dist/esm/cursors/SVGMouseCursor.js.map +1 -1
- package/dist/esm/drawingSvg/drawArrow.js +0 -2
- package/dist/esm/drawingSvg/drawArrow.js.map +1 -1
- package/dist/esm/drawingSvg/drawTextBox.js +9 -0
- package/dist/esm/drawingSvg/drawTextBox.js.map +1 -1
- package/dist/esm/index.d.ts +2 -2
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/stateManagement/annotation/config/ToolStyle.d.ts +18 -0
- package/dist/esm/stateManagement/annotation/config/ToolStyle.js +136 -0
- package/dist/esm/stateManagement/annotation/config/ToolStyle.js.map +1 -0
- package/dist/esm/stateManagement/annotation/config/getFont.d.ts +2 -2
- package/dist/esm/stateManagement/annotation/config/getFont.js +4 -6
- package/dist/esm/stateManagement/annotation/config/getFont.js.map +1 -1
- package/dist/esm/stateManagement/annotation/config/helpers.d.ts +4 -0
- package/dist/esm/stateManagement/annotation/config/helpers.js +20 -0
- package/dist/esm/stateManagement/annotation/config/helpers.js.map +1 -0
- package/dist/esm/stateManagement/annotation/config/index.d.ts +2 -5
- package/dist/esm/stateManagement/annotation/config/index.js +2 -5
- package/dist/esm/stateManagement/annotation/config/index.js.map +1 -1
- package/dist/esm/stateManagement/index.d.ts +1 -4
- package/dist/esm/stateManagement/index.js +1 -4
- package/dist/esm/stateManagement/index.js.map +1 -1
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js +13 -8
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js.map +1 -1
- package/dist/esm/tools/annotation/BidirectionalTool.js +12 -9
- package/dist/esm/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/esm/tools/annotation/DragProbeTool.d.ts +23 -0
- package/dist/esm/tools/annotation/DragProbeTool.js +103 -0
- package/dist/esm/tools/annotation/DragProbeTool.js.map +1 -0
- package/dist/esm/tools/annotation/EllipticalROITool.js +43 -31
- package/dist/esm/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/esm/tools/annotation/LengthTool.js +12 -9
- package/dist/esm/tools/annotation/LengthTool.js.map +1 -1
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js +1 -2
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js.map +1 -1
- package/dist/esm/tools/annotation/ProbeTool.js +9 -5
- package/dist/esm/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/esm/tools/annotation/RectangleROITool.js +12 -9
- package/dist/esm/tools/annotation/RectangleROITool.js.map +1 -1
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js +16 -10
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -1
- package/dist/esm/tools/base/AnnotationTool.d.ts +3 -3
- package/dist/esm/tools/base/AnnotationTool.js +10 -10
- package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
- package/dist/esm/tools/index.d.ts +2 -1
- package/dist/esm/tools/index.js +2 -1
- package/dist/esm/tools/index.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js +11 -8
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js +11 -8
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js +1 -4
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/esm/types/AnnotationStyle.d.ts +29 -0
- package/dist/esm/types/AnnotationStyle.js +2 -0
- package/dist/esm/types/AnnotationStyle.js.map +1 -0
- package/dist/esm/types/index.d.ts +2 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +2 -2
- package/dist/cjs/stateManagement/annotation/config/annotationStyle.d.ts +0 -5
- package/dist/cjs/stateManagement/annotation/config/annotationStyle.js +0 -74
- package/dist/cjs/stateManagement/annotation/config/annotationStyle.js.map +0 -1
- package/dist/cjs/stateManagement/annotation/config/getStyle.d.ts +0 -2
- package/dist/cjs/stateManagement/annotation/config/getStyle.js +0 -22
- package/dist/cjs/stateManagement/annotation/config/getStyle.js.map +0 -1
- package/dist/cjs/stateManagement/annotation/config/setAnnotationStyle.d.ts +0 -2
- package/dist/cjs/stateManagement/annotation/config/setAnnotationStyle.js +0 -17
- package/dist/cjs/stateManagement/annotation/config/setAnnotationStyle.js.map +0 -1
- package/dist/cjs/stateManagement/annotation/config/setGlobalStyle.d.ts +0 -1
- package/dist/cjs/stateManagement/annotation/config/setGlobalStyle.js +0 -8
- package/dist/cjs/stateManagement/annotation/config/setGlobalStyle.js.map +0 -1
- package/dist/cjs/stateManagement/annotation/config/setToolStyle.d.ts +0 -1
- package/dist/cjs/stateManagement/annotation/config/setToolStyle.js +0 -17
- package/dist/cjs/stateManagement/annotation/config/setToolStyle.js.map +0 -1
- package/dist/esm/stateManagement/annotation/config/annotationStyle.d.ts +0 -5
- package/dist/esm/stateManagement/annotation/config/annotationStyle.js +0 -70
- package/dist/esm/stateManagement/annotation/config/annotationStyle.js.map +0 -1
- package/dist/esm/stateManagement/annotation/config/getStyle.d.ts +0 -2
- package/dist/esm/stateManagement/annotation/config/getStyle.js +0 -16
- package/dist/esm/stateManagement/annotation/config/getStyle.js.map +0 -1
- package/dist/esm/stateManagement/annotation/config/setAnnotationStyle.d.ts +0 -2
- package/dist/esm/stateManagement/annotation/config/setAnnotationStyle.js +0 -12
- package/dist/esm/stateManagement/annotation/config/setAnnotationStyle.js.map +0 -1
- package/dist/esm/stateManagement/annotation/config/setGlobalStyle.d.ts +0 -1
- package/dist/esm/stateManagement/annotation/config/setGlobalStyle.js +0 -5
- package/dist/esm/stateManagement/annotation/config/setGlobalStyle.js.map +0 -1
- package/dist/esm/stateManagement/annotation/config/setToolStyle.d.ts +0 -1
- package/dist/esm/stateManagement/annotation/config/setToolStyle.js +0 -11
- package/dist/esm/stateManagement/annotation/config/setToolStyle.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/index.ts"],"names":[],"mappings":";;;;;;AAAA,iCAAkD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/index.ts"],"names":[],"mappings":";;;;;;AAAA,iCAAkD;AAgChD,yFAhCO,eAAQ,OAgCP;AACR,+FAjCiB,qBAAc,OAiCjB;AAhChB,wDAAgC;AAkC9B,kBAlCK,iBAAO,CAkCL;AAjCT,wEAAgD;AAmC9C,0BAnCK,yBAAe,CAmCL;AAlCjB,wEAAgD;AAmC9C,0BAnCK,yBAAe,CAmCL;AAlCjB,oGAAwE;AAmCtE,oCAnCK,uCAAyB,CAmCL;AAlC3B,0DAAkC;AAmChC,mBAnCK,kBAAQ,CAmCL;AAlCV,8FAAsE;AAmCpE,qCAnCK,oCAA0B,CAmCL;AAlC5B,8EAAsD;AAmCpD,6BAnCK,4BAAkB,CAmCL;AAlCpB,sEAA8C;AAoC5C,yBApCK,wBAAc,CAoCL;AAlChB,uFAA+D;AAmC7D,4BAnCK,2BAAiB,CAmCL;AAlCnB,yEAAiD;AAmC/C,qBAnCK,oBAAU,CAmCL;AAlCZ,uEAA+C;AAmC7C,oBAnCK,mBAAS,CAmCL;AAlCX,+EAAuD;AAuBrD,wBAvBK,uBAAa,CAuBL;AAtBf,qFAA6D;AAkC3D,2BAlCK,0BAAgB,CAkCL;AAjClB,uFAA+D;AAkC7D,4BAlCK,2BAAiB,CAkCL;AAjCnB,+FAAuE;AAkCrE,gCAlCK,+BAAqB,CAkCL;AAjCvB,uFAA+D;AAkC7D,4BAlCK,2BAAiB,CAkCL;AA/BnB,qGAA6E;AAiC3E,kCAjCK,iCAAuB,CAiCL;AA9BzB,iGAAyE;AAgCvE,gCAhCK,+BAAqB,CAgCL;AA/BvB,2FAAmE;AAgCjE,6BAhCK,4BAAkB,CAgCL;AA/BpB,2FAAmE;AAgCjE,6BAhCK,4BAAkB,CAgCL;AA/BpB,yGAAiF;AAgC/E,oCAhCK,mCAAyB,CAgCL;AA/B3B,yHAAiG;AAgC/F,4CAhCK,2CAAiC,CAgCL;AA/BnC,yEAAiD;AAgC/C,oBAhCK,mBAAS,CAgCL"}
|
|
@@ -85,7 +85,6 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool_1.default {
|
|
|
85
85
|
},
|
|
86
86
|
};
|
|
87
87
|
this._computeProjectionPoints(annotation, imageVolume);
|
|
88
|
-
core_1.Settings.getObjectSettings(annotation, RectangleROIStartEndThresholdTool);
|
|
89
88
|
(0, stateManagement_1.addAnnotation)(element, annotation);
|
|
90
89
|
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, this.getToolName());
|
|
91
90
|
this.editData = {
|
|
@@ -108,17 +107,21 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool_1.default {
|
|
|
108
107
|
}
|
|
109
108
|
const { viewport } = enabledElement;
|
|
110
109
|
const sliceIndex = viewport.getCurrentImageIdIndex();
|
|
110
|
+
const styleSpecifier = {
|
|
111
|
+
toolGroupId: this.toolGroupId,
|
|
112
|
+
toolName: this.getToolName(),
|
|
113
|
+
viewportId: enabledElement.viewport.id,
|
|
114
|
+
};
|
|
111
115
|
for (let i = 0; i < annotations.length; i++) {
|
|
112
116
|
const annotation = annotations[i];
|
|
113
|
-
const
|
|
114
|
-
const annotationUID = annotation.annotationUID;
|
|
115
|
-
const data = annotation.data;
|
|
117
|
+
const { annotationUID, data } = annotation;
|
|
116
118
|
const { startSlice, endSlice } = data;
|
|
117
119
|
const { points, activeHandleIndex } = data.handles;
|
|
118
120
|
const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
|
|
119
|
-
|
|
120
|
-
const
|
|
121
|
-
const
|
|
121
|
+
styleSpecifier.annotationUID = annotationUID;
|
|
122
|
+
const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
|
|
123
|
+
const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
|
|
124
|
+
const color = this.getStyle('color', styleSpecifier, annotation);
|
|
122
125
|
if (sliceIndex < Math.min(startSlice, endSlice) ||
|
|
123
126
|
sliceIndex > Math.max(startSlice, endSlice)) {
|
|
124
127
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RectangleROIStartEndThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIStartEndThresholdTool.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"RectangleROIStartEndThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIStartEndThresholdTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,6 @@ class RectangleROIThresholdTool extends RectangleROITool_1.default {
|
|
|
71
71
|
segmentationId: null,
|
|
72
72
|
},
|
|
73
73
|
};
|
|
74
|
-
core_1.Settings.getObjectSettings(annotation, RectangleROIThresholdTool);
|
|
75
74
|
(0, stateManagement_1.addAnnotation)(element, annotation);
|
|
76
75
|
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, this.getToolName());
|
|
77
76
|
this.editData = {
|
|
@@ -98,16 +97,20 @@ class RectangleROIThresholdTool extends RectangleROITool_1.default {
|
|
|
98
97
|
if (!(annotations === null || annotations === void 0 ? void 0 : annotations.length)) {
|
|
99
98
|
return;
|
|
100
99
|
}
|
|
100
|
+
const styleSpecifier = {
|
|
101
|
+
toolGroupId: this.toolGroupId,
|
|
102
|
+
toolName: this.getToolName(),
|
|
103
|
+
viewportId: enabledElement.viewport.id,
|
|
104
|
+
};
|
|
101
105
|
for (let i = 0; i < annotations.length; i++) {
|
|
102
106
|
const annotation = annotations[i];
|
|
103
|
-
const
|
|
104
|
-
const annotationUID = annotation.annotationUID;
|
|
105
|
-
const data = annotation.data;
|
|
107
|
+
const { annotationUID, data } = annotation;
|
|
106
108
|
const { points, activeHandleIndex } = data.handles;
|
|
107
109
|
const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
|
|
108
|
-
|
|
109
|
-
const
|
|
110
|
-
const
|
|
110
|
+
styleSpecifier.annotationUID = annotationUID;
|
|
111
|
+
const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
|
|
112
|
+
const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
|
|
113
|
+
const color = this.getStyle('color', styleSpecifier, annotation);
|
|
111
114
|
if (!viewport.getRenderingEngine()) {
|
|
112
115
|
console.warn('Rendering Engine has been destroyed');
|
|
113
116
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RectangleROIThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIThresholdTool.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"RectangleROIThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIThresholdTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ const fillRectangle_1 = require("./strategies/fillRectangle");
|
|
|
9
9
|
const eraseRectangle_1 = require("./strategies/eraseRectangle");
|
|
10
10
|
const viewportFilters_1 = require("../../utilities/viewportFilters");
|
|
11
11
|
const enums_1 = require("../../enums");
|
|
12
|
-
const RectangleROITool_1 = __importDefault(require("../annotation/RectangleROITool"));
|
|
13
12
|
const drawingSvg_1 = require("../../drawingSvg");
|
|
14
13
|
const elementCursor_1 = require("../../cursors/elementCursor");
|
|
15
14
|
const triggerAnnotationRenderForViewportIds_1 = __importDefault(require("../../utilities/triggerAnnotationRenderForViewportIds"));
|
|
@@ -72,7 +71,6 @@ class RectangleScissorsTool extends base_1.BaseTool {
|
|
|
72
71
|
},
|
|
73
72
|
},
|
|
74
73
|
};
|
|
75
|
-
core_1.Settings.getObjectSettings(annotation, RectangleROITool_1.default);
|
|
76
74
|
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, this.getToolName());
|
|
77
75
|
this.editData = {
|
|
78
76
|
annotation,
|
|
@@ -189,7 +187,6 @@ class RectangleScissorsTool extends base_1.BaseTool {
|
|
|
189
187
|
}
|
|
190
188
|
const { viewport } = enabledElement;
|
|
191
189
|
const { annotation } = this.editData;
|
|
192
|
-
const settings = core_1.Settings.getObjectSettings(annotation, RectangleROITool_1.default);
|
|
193
190
|
const toolMetadata = annotation.metadata;
|
|
194
191
|
const annotationUID = annotation.annotationUID;
|
|
195
192
|
const data = annotation.data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RectangleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleScissorsTool.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"RectangleScissorsTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleScissorsTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
declare type Modes = '' | 'Active' | 'Passive' | 'Enabled';
|
|
2
|
+
declare type States = '' | 'Highlighted' | 'Selected' | 'Locked';
|
|
3
|
+
declare type Properties = 'color' | 'lineWidth' | 'lineDash' | 'textBoxFontFamily' | 'textBoxFontSize' | 'textBoxColor' | 'textBoxBackground' | 'textBoxLinkLineWidth' | 'textBoxLinkLineDash';
|
|
4
|
+
export declare type AnnotationStyle = {
|
|
5
|
+
[key in `${Properties}${States}${Modes}`]?: string;
|
|
6
|
+
};
|
|
7
|
+
export declare type ToolStyleConfig = {
|
|
8
|
+
[toolName: string]: AnnotationStyle;
|
|
9
|
+
global?: AnnotationStyle;
|
|
10
|
+
};
|
|
11
|
+
export declare type StyleConfig = {
|
|
12
|
+
annotations?: {
|
|
13
|
+
[annotationUID: string]: AnnotationStyle;
|
|
14
|
+
};
|
|
15
|
+
viewports?: {
|
|
16
|
+
[viewportId: string]: ToolStyleConfig;
|
|
17
|
+
};
|
|
18
|
+
toolGroups?: {
|
|
19
|
+
[toolGroupId: string]: ToolStyleConfig;
|
|
20
|
+
};
|
|
21
|
+
default: ToolStyleConfig;
|
|
22
|
+
};
|
|
23
|
+
export declare type StyleSpecifier = {
|
|
24
|
+
viewportId?: string;
|
|
25
|
+
toolGroupId?: string;
|
|
26
|
+
toolName?: string;
|
|
27
|
+
annotationUID?: string;
|
|
28
|
+
};
|
|
29
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AnnotationStyle.js","sourceRoot":"","sources":["../../../src/types/AnnotationStyle.ts"],"names":[],"mappings":""}
|
|
@@ -6,6 +6,7 @@ import type PlanarBoundingBox from './PlanarBoundingBox';
|
|
|
6
6
|
import type { SetToolBindingsType, IToolBinding, ToolOptionsType } from './ISetToolModeOptions';
|
|
7
7
|
import type IToolGroup from './IToolGroup';
|
|
8
8
|
import type * as ToolSpecificAnnotationTypes from './ToolSpecificAnnotationTypes';
|
|
9
|
+
import type * as AnnotationStyle from './AnnotationStyle';
|
|
9
10
|
import type ToolHandle from './ToolHandle';
|
|
10
11
|
import type { AnnotationHandle, TextBoxHandle } from './ToolHandle';
|
|
11
12
|
import type InteractionTypes from './InteractionTypes';
|
|
@@ -14,4 +15,4 @@ import type { SVGCursorDescriptor, SVGPoint } from './CursorTypes';
|
|
|
14
15
|
import type JumpToSliceOptions from './JumpToSliceOptions';
|
|
15
16
|
import type ScrollOptions from './ScrollOptions';
|
|
16
17
|
import type { Color, ColorLUT, RepresentationConfig, SegmentationRepresentationConfig, SegmentationRepresentationData, Segmentation, ToolGroupSpecificRepresentationState, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, SegmentationState, RepresentationPublicInput } from './SegmentationStateTypes';
|
|
17
|
-
export type { Annotation, Annotations, FrameOfReferenceSpecificAnnotations, AnnotationState, ToolSpecificAnnotationTypes, JumpToSliceOptions, PlanarBoundingBox, ToolProps, PublicToolProps, EventTypes, IPoints, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, IToolGroup, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, SegmentationRepresentationData, SegmentationRepresentationConfig, RepresentationConfig, ToolGroupSpecificRepresentationState, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, RepresentationPublicInput, Color, ColorLUT, LabelmapTypes, SVGCursorDescriptor, SVGPoint, ScrollOptions, };
|
|
18
|
+
export type { Annotation, Annotations, FrameOfReferenceSpecificAnnotations, AnnotationState, AnnotationStyle, ToolSpecificAnnotationTypes, JumpToSliceOptions, PlanarBoundingBox, ToolProps, PublicToolProps, EventTypes, IPoints, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, IToolGroup, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, SegmentationRepresentationData, SegmentationRepresentationConfig, RepresentationConfig, ToolGroupSpecificRepresentationState, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, RepresentationPublicInput, Color, ColorLUT, LabelmapTypes, SVGCursorDescriptor, SVGPoint, ScrollOptions, };
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ToolModes, AnnotationStyleStates } from '../enums';
|
|
2
|
-
import { getDefaultStyleProperty } from '../stateManagement/annotation/config/annotationStyle';
|
|
3
2
|
import ImageMouseCursor from './ImageMouseCursor';
|
|
4
3
|
import { getDefinedSVGCursorDescriptor } from './SVGCursorDescriptor';
|
|
4
|
+
import { getStyleProperty } from '../stateManagement/annotation/config/helpers';
|
|
5
5
|
const PROPERTY = 'color';
|
|
6
6
|
const STATE = AnnotationStyleStates.Highlighted;
|
|
7
7
|
const MODE = ToolModes.Active;
|
|
@@ -11,7 +11,7 @@ export default class SVGMouseCursor extends ImageMouseCursor {
|
|
|
11
11
|
}
|
|
12
12
|
static getDefinedCursor(name, pointer = false, color) {
|
|
13
13
|
if (!color) {
|
|
14
|
-
color =
|
|
14
|
+
color = getStyleProperty(PROPERTY, {}, STATE, MODE);
|
|
15
15
|
}
|
|
16
16
|
const urn = getCursorURN(name, pointer, color);
|
|
17
17
|
let cursor = super.getDefinedCursor(urn);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SVGMouseCursor.js","sourceRoot":"","sources":["../../../src/cursors/SVGMouseCursor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"SVGMouseCursor.js","sourceRoot":"","sources":["../../../src/cursors/SVGMouseCursor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAE5D,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAKhF,MAAM,QAAQ,GAAG,OAAO,CAAC;AACzB,MAAM,KAAK,GAAG,qBAAqB,CAAC,WAAW,CAAC;AAChD,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,gBAAgB;IAC1D,YACE,GAAW,EACX,CAAU,EACV,CAAU,EACV,IAAyB,EACzB,QAAkC;QAElC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC;IAYD,MAAM,CAAC,gBAAgB,CACrB,IAAY,EACZ,OAAO,GAAG,KAAK,EACf,KAAc;QAEd,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,gBAAgB,CAAC,QAAQ,EAAE,EAAoB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;SACvE;QACD,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,MAAM,GAAG,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,UAAU,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;YACvD,IAAI,UAAU,EAAE;gBACd,MAAM,GAAG,oBAAoB,CAC3B,UAAU,EACV,GAAG,EACH,OAAO,EACP,KAAK,EACL,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAClC,CAAC;gBACF,KAAK,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aACrC;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAMD,SAAS,MAAM,CAAC,QAAgB,EAAE,UAAmC;IACnE,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3D,OAAO,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAC9D,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CAAC,IAAY,EAAE,OAAgB,EAAE,KAAa;IACjE,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC5C,OAAO,GAAG,IAAI,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;AACpC,CAAC;AAED,SAAS,oBAAoB,CAC3B,UAA+B,EAC/B,IAAY,EACZ,OAAgB,EAChB,KAAa,EACb,QAAqB;IAErB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC;IACvC,OAAO,IAAI,cAAc,CACvB,gBAAgB,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAChD,CAAC,EACD,CAAC,EACD,IAAI,EACJ,QAAQ,CACT,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,UAA+B,EAC/B,OAAgB,EAChB,OAAgC;IAEhC,OAAO,GAAG,CAAC,eAAe,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,iBAAiB,CACxB,UAA+B,EAC/B,OAAgB,EAChB,OAAgC;IAEhC,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,aAAa,CAAC,CACpE,UAAU,EACV,OAAO,CACR,CAAC;IACF,OAAO,IAAI,IAAI,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,aAAa,CACpB,UAA+B,EAC/B,OAAgC;IAEhC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IACtD,MAAM,SAAS,GAAG;;eAEL,QAAQ,aAAa,QAAQ;QACpC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC;QACtB,WAAW;WACR,CAAC;IACV,OAAO,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,wBAAwB,CAC/B,UAA+B,EAC/B,OAAgC;IAEhC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,uBAAuB,EAAE,GAC/D,UAAU,CAAC;IACb,MAAM,KAAK,GAAG,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,EAAE,GAAG,QAAQ,CAAC;IAC9B,MAAM,SAAS,GAAG;;eAEL,OAAO,aAAa,OAAO,kBAAkB,OAAO,IAAI,OAAO;WACnE,uBAAuB;8CACY,KAAK,MAAM,WAAW;WACzD,CAAC;IACV,OAAO,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC"}
|
|
@@ -35,13 +35,11 @@ export default function drawArrow(svgDrawingHelper, annotationUID, arrowUID, sta
|
|
|
35
35
|
color,
|
|
36
36
|
width,
|
|
37
37
|
lineWidth,
|
|
38
|
-
lineDash,
|
|
39
38
|
});
|
|
40
39
|
drawLine(svgDrawingHelper, annotationUID, '3', secondLine.start, secondLine.end, {
|
|
41
40
|
color,
|
|
42
41
|
width,
|
|
43
42
|
lineWidth,
|
|
44
|
-
lineDash,
|
|
45
43
|
});
|
|
46
44
|
}
|
|
47
45
|
//# sourceMappingURL=drawArrow.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawArrow.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawArrow.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,gBAAqB,EACrB,aAAqB,EACrB,QAAgB,EAChB,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE;IAGZ,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;QACxE,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CACzD;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;KACpB,EACD,OAAO,CACR,CAAC;IAGF,QAAQ,CAAC,gBAAgB,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE;QAC9D,KAAK;QACL,KAAK;QACL,SAAS;QACT,QAAQ;KACT,CAAC,CAAC;IAIH,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG;QAChB,KAAK,EAAE;YACL,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YACnD,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;SACpC;QACjB,GAAG,EAAE,GAAG;KACT,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,KAAK,EAAE;YACL,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YACnD,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;SACpC;QACjB,GAAG,EAAE,GAAG;KACT,CAAC;IAEF,QAAQ,CACN,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,SAAS,CAAC,KAAK,EACf,SAAS,CAAC,GAAG,EACb;QACE,KAAK;QACL,KAAK;QACL,SAAS;
|
|
1
|
+
{"version":3,"file":"drawArrow.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawArrow.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,gBAAqB,EACrB,aAAqB,EACrB,QAAgB,EAChB,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE;IAGZ,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;QACxE,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CACzD;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;KACpB,EACD,OAAO,CACR,CAAC;IAGF,QAAQ,CAAC,gBAAgB,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE;QAC9D,KAAK;QACL,KAAK;QACL,SAAS;QACT,QAAQ;KACT,CAAC,CAAC;IAIH,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG;QAChB,KAAK,EAAE;YACL,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YACnD,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;SACpC;QACjB,GAAG,EAAE,GAAG;KACT,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,KAAK,EAAE;YACL,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YACnD,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;SACpC;QACjB,GAAG,EAAE,GAAG;KACT,CAAC;IAEF,QAAQ,CACN,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,SAAS,CAAC,KAAK,EACf,SAAS,CAAC,GAAG,EACb;QACE,KAAK;QACL,KAAK;QACL,SAAS;KACV,CACF,CAAC;IAEF,QAAQ,CACN,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,UAAU,CAAC,KAAK,EAChB,UAAU,CAAC,GAAG,EACd;QACE,KAAK;QACL,KAAK;QACL,SAAS;KACV,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -28,6 +28,15 @@ function _drawTextGroup(svgDrawingHelper, annotationUID, textUID, textLines, pos
|
|
|
28
28
|
const text = textLines[i] || '';
|
|
29
29
|
textSpanElement.textContent = text;
|
|
30
30
|
}
|
|
31
|
+
if (textLines.length > textSpans.length) {
|
|
32
|
+
for (let i = 0; i < textLines.length - textSpans.length; i++) {
|
|
33
|
+
const textLine = textLines[i + textSpans.length];
|
|
34
|
+
const textSpan = _createTextSpan(textLine);
|
|
35
|
+
textElement.appendChild(textSpan);
|
|
36
|
+
}
|
|
37
|
+
existingTextGroup.appendChild(textElement);
|
|
38
|
+
svgDrawingHelper._appendNode(existingTextGroup, svgNodeHash);
|
|
39
|
+
}
|
|
31
40
|
const textAttributes = {
|
|
32
41
|
fill: color,
|
|
33
42
|
'font-size': fontSize,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawTextBox.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawTextBox.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AAUpE,SAAS,WAAW,CAClB,gBAAyC,EACzC,aAAqB,EACrB,OAAe,EACf,SAAwB,EACxB,QAAsB,EACtB,OAAO,GAAG,EAAE;IAEZ,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CACjC;QACE,UAAU,EAAE,8BAA8B;QAC1C,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE,kBAAkB;QACzB,UAAU,EAAE,EAAE;QACd,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,IAAI;KACd,EACD,OAAO,CACR,CAAC;IAGF,MAAM,oBAAoB,GAAG,cAAc,CACzC,gBAAgB,EAChB,aAAa,EACb,OAAO,EACP,SAAS,EACT,QAAQ,EACR,aAAa,CACd,CAAC;IAEF,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,SAAS,cAAc,CACrB,gBAAqB,EACrB,aAAqB,EACrB,OAAe,EACf,SAAwB,EACxB,QAAsB,EACtB,OAAY;IAEZ,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAErE,IAAI,oBAAoB,CAAC;IACzB,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAIpE,IAAI,iBAAiB,EAAE;
|
|
1
|
+
{"version":3,"file":"drawTextBox.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawTextBox.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AAUpE,SAAS,WAAW,CAClB,gBAAyC,EACzC,aAAqB,EACrB,OAAe,EACf,SAAwB,EACxB,QAAsB,EACtB,OAAO,GAAG,EAAE;IAEZ,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CACjC;QACE,UAAU,EAAE,8BAA8B;QAC1C,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE,kBAAkB;QACzB,UAAU,EAAE,EAAE;QACd,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,IAAI;KACd,EACD,OAAO,CACR,CAAC;IAGF,MAAM,oBAAoB,GAAG,cAAc,CACzC,gBAAgB,EAChB,aAAa,EACb,OAAO,EACP,SAAS,EACT,QAAQ,EACR,aAAa,CACd,CAAC;IAEF,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,SAAS,cAAc,CACrB,gBAAqB,EACrB,aAAqB,EACrB,OAAe,EACf,SAAwB,EACxB,QAAsB,EACtB,OAAY;IAEZ,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAErE,IAAI,oBAAoB,CAAC;IACzB,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAIpE,IAAI,iBAAiB,EAAE;QAErB,MAAM,WAAW,GAAG,iBAAiB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAsB,CAAC;QAExE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACzC,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAEhC,eAAe,CAAC,WAAW,GAAG,IAAI,CAAC;SACpC;QAGD,IAAI,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE;YACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC5D,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;gBACjD,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;gBAE3C,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;aACnC;YAED,iBAAiB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAC3C,gBAAgB,CAAC,WAAW,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;SAC9D;QAED,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,QAAQ;YACrB,aAAa,EAAE,UAAU;SAC1B,CAAC;QAEF,MAAM,mBAAmB,GAAG;YAC1B,SAAS,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG;SAClC,CAAC;QAGF,yBAAyB,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QACvD,yBAAyB,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;QAElE,oBAAoB,GAAG,mBAAmB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;QAE1E,gBAAgB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;KAC/C;SAAM;QACL,MAAM,SAAS,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAEvD,SAAS,CAAC,YAAY,CAAC,WAAW,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAG5D,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAChD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACzC,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;YAE3C,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SACnC;QAED,SAAS,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACnC,gBAAgB,CAAC,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QACrD,oBAAoB,GAAG,mBAAmB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;KACnE;IAKD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,oBAAoB,EAAE;QAC7C,CAAC;QACD,CAAC;QACD,MAAM,EAAE,oBAAoB,CAAC,MAAM,GAAG,OAAO;QAC7C,KAAK,EAAE,oBAAoB,CAAC,KAAK,GAAG,OAAO;KAC5C,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAY;IACtC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAChD,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5D,MAAM,aAAa,GACjB,gGAAgG,CAAC;IACnG,MAAM,eAAe,GAAG,sBAAsB,CAAC;IAC/C,MAAM,aAAa,GAAG,GAAG,aAAa,GAAG,eAAe,EAAE,CAAC;IAG3D,WAAW,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACnC,WAAW,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACnC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACxC,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACpD,WAAW,CAAC,YAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAChD,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAEjD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,eAAe,CAAC,IAAI;IAC3B,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAMjE,eAAe,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACvC,eAAe,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,eAAe,CAAC,WAAW,GAAG,IAAI,CAAC;IAEnC,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAkB,EAAE,KAAa;IAC5D,IAAI,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAIrD,IAAI,CAAC,KAAK,EAAE;QACV,IAAI,OAAO,EAAE;YACX,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SAC5B;QAED,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;KACxB;IAGD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,4BAA4B,EAAE,MAAM,CAAC,CAAC;QACzE,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAC5C,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;KAC/C;IAGD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;IAE7B,MAAM,UAAU,GAAG;QACjB,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE;QACd,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE;QACd,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE;QACtB,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE;QACxB,IAAI,EAAE,KAAK;KACZ,CAAC;IAEF,yBAAyB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAE/C,OAAO,IAAI,CAAC;AACd,CAAC;AAED,eAAe,WAAW,CAAC"}
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -8,6 +8,6 @@ import * as cursors from './cursors';
|
|
|
8
8
|
import * as Types from './types';
|
|
9
9
|
import * as annotation from './stateManagement/annotation';
|
|
10
10
|
import * as segmentation from './stateManagement/segmentation';
|
|
11
|
-
import { BaseTool, AnnotationTool, PanTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, CrosshairsTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, SegmentationDisplayTool, BrushTool } from './tools';
|
|
11
|
+
import { BaseTool, AnnotationTool, PanTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, CrosshairsTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, SegmentationDisplayTool, BrushTool } from './tools';
|
|
12
12
|
import * as Enums from './enums';
|
|
13
|
-
export { init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, PanTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, CrosshairsTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, BrushTool, synchronizers, Synchronizer, SynchronizerManager, Types, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, };
|
|
13
|
+
export { init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, PanTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, CrosshairsTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, BrushTool, synchronizers, Synchronizer, SynchronizerManager, Types, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, };
|
package/dist/esm/index.js
CHANGED
|
@@ -8,7 +8,7 @@ import * as cursors from './cursors';
|
|
|
8
8
|
import * as Types from './types';
|
|
9
9
|
import * as annotation from './stateManagement/annotation';
|
|
10
10
|
import * as segmentation from './stateManagement/segmentation';
|
|
11
|
-
import { BaseTool, AnnotationTool, PanTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, CrosshairsTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, SegmentationDisplayTool, BrushTool, } from './tools';
|
|
11
|
+
import { BaseTool, AnnotationTool, PanTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, CrosshairsTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, SegmentationDisplayTool, BrushTool, } from './tools';
|
|
12
12
|
import * as Enums from './enums';
|
|
13
|
-
export { init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, PanTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, CrosshairsTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, BrushTool, synchronizers, Synchronizer, SynchronizerManager, Types, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, };
|
|
13
|
+
export { init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, PanTool, DragProbeTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, CrosshairsTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, PlanarFreehandROITool, ArrowAnnotateTool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, BrushTool, synchronizers, Synchronizer, SynchronizerManager, Types, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, };
|
|
14
14
|
//# sourceMappingURL=index.js.map
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EACL,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,yBAAyB,GAC1B,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AAGzC,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EACL,QAAQ,EACR,cAAc,EACd,OAAO,EACP,eAAe,EACf,QAAQ,EACR,eAAe,EACf,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EACjB,cAAc,EACd,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,iCAAiC,EACjC,uBAAuB,EACvB,SAAS,GACV,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,OAAO,EAEL,IAAI,EACJ,OAAO,EACP,OAAO,EACP,UAAU,EACV,yBAAyB,EAEzB,QAAQ,EACR,cAAc,EAEd,OAAO,EACP,eAAe,EACf,QAAQ,EACR,eAAe,EACf,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAElB,UAAU,EACV,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EAEjB,uBAAuB,EAEvB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,iCAAiC,EACjC,SAAS,EAET,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,KAAK,EAEL,gBAAgB,EAEhB,KAAK,EAEL,SAAS,EAET,OAAO,EAEP,UAAU,EAEV,YAAY,EAEZ,SAAS,EACT,OAAO,GACR,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EACL,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,yBAAyB,GAC1B,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AAGzC,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EACL,QAAQ,EACR,cAAc,EACd,OAAO,EACP,aAAa,EACb,eAAe,EACf,QAAQ,EACR,eAAe,EACf,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EACjB,cAAc,EACd,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,iCAAiC,EACjC,uBAAuB,EACvB,SAAS,GACV,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,OAAO,EAEL,IAAI,EACJ,OAAO,EACP,OAAO,EACP,UAAU,EACV,yBAAyB,EAEzB,QAAQ,EACR,cAAc,EAEd,OAAO,EACP,aAAa,EACb,eAAe,EACf,QAAQ,EACR,eAAe,EACf,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAElB,UAAU,EACV,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EAEjB,uBAAuB,EAEvB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,iCAAiC,EACjC,SAAS,EAET,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,KAAK,EAEL,gBAAgB,EAEhB,KAAK,EAEL,SAAS,EAET,OAAO,EAEP,UAAU,EAEV,YAAY,EAEZ,SAAS,EACT,OAAO,GACR,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { StyleConfig, ToolStyleConfig, StyleSpecifier, AnnotationStyle } from '../../../types/AnnotationStyle';
|
|
2
|
+
declare class ToolStyle {
|
|
3
|
+
config: StyleConfig;
|
|
4
|
+
constructor();
|
|
5
|
+
getAnnotationToolStyles(annotationUID: string): AnnotationStyle;
|
|
6
|
+
getViewportToolStyles(viewportId: string): ToolStyleConfig;
|
|
7
|
+
getToolGroupToolStyles(toolGroupId: string): ToolStyleConfig;
|
|
8
|
+
getDefaultToolStyles(): ToolStyleConfig;
|
|
9
|
+
setAnnotationStyles(annotationUID: string, styles: AnnotationStyle): void;
|
|
10
|
+
setViewportToolStyles(viewportId: string, styles: ToolStyleConfig): void;
|
|
11
|
+
setToolGroupToolStyles(toolGroupId: string, styles: ToolStyleConfig): void;
|
|
12
|
+
setDefaultToolStyles(styles: ToolStyleConfig): void;
|
|
13
|
+
getStyleProperty(toolStyle: string, specifications: StyleSpecifier): any;
|
|
14
|
+
private _getToolStyle;
|
|
15
|
+
private _initializeConfig;
|
|
16
|
+
}
|
|
17
|
+
declare const toolStyle: ToolStyle;
|
|
18
|
+
export default toolStyle;
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
class ToolStyle {
|
|
2
|
+
constructor() {
|
|
3
|
+
const defaultConfig = {
|
|
4
|
+
color: 'rgb(255, 255, 0)',
|
|
5
|
+
colorHighlighted: 'rgb(0, 255, 0)',
|
|
6
|
+
colorSelected: 'rgb(0, 220, 0)',
|
|
7
|
+
colorLocked: 'rgb(255, 255, 0)',
|
|
8
|
+
lineWidth: '1',
|
|
9
|
+
lineDash: '',
|
|
10
|
+
textBoxFontFamily: 'Helvetica Neue, Helvetica, Arial, sans-serif',
|
|
11
|
+
textBoxFontSize: '14px',
|
|
12
|
+
textBoxColor: 'rgb(255, 255, 0)',
|
|
13
|
+
textBoxColorHighlighted: 'rgb(0, 255, 0)',
|
|
14
|
+
textBoxColorSelected: 'rgb(0, 255, 0)',
|
|
15
|
+
textBoxColorLocked: 'rgb(255, 255, 0)',
|
|
16
|
+
textBoxBackground: '',
|
|
17
|
+
textBoxLinkLineWidth: '1',
|
|
18
|
+
textBoxLinkLineDash: '2,3',
|
|
19
|
+
};
|
|
20
|
+
this._initializeConfig(defaultConfig);
|
|
21
|
+
}
|
|
22
|
+
getAnnotationToolStyles(annotationUID) {
|
|
23
|
+
return this.config.annotations && this.config.annotations[annotationUID];
|
|
24
|
+
}
|
|
25
|
+
getViewportToolStyles(viewportId) {
|
|
26
|
+
return this.config.viewports && this.config.viewports[viewportId];
|
|
27
|
+
}
|
|
28
|
+
getToolGroupToolStyles(toolGroupId) {
|
|
29
|
+
return this.config.toolGroups && this.config.toolGroups[toolGroupId];
|
|
30
|
+
}
|
|
31
|
+
getDefaultToolStyles() {
|
|
32
|
+
return this.config.default;
|
|
33
|
+
}
|
|
34
|
+
setAnnotationStyles(annotationUID, styles) {
|
|
35
|
+
let annotationSpecificStyles = this.config.annotations;
|
|
36
|
+
if (!annotationSpecificStyles) {
|
|
37
|
+
this.config = {
|
|
38
|
+
...this.config,
|
|
39
|
+
annotations: {},
|
|
40
|
+
};
|
|
41
|
+
annotationSpecificStyles = this.config.annotations;
|
|
42
|
+
}
|
|
43
|
+
if (annotationSpecificStyles[annotationUID]) {
|
|
44
|
+
console.warn('overriding annotation styles for annotationUID:', annotationUID);
|
|
45
|
+
}
|
|
46
|
+
annotationSpecificStyles[annotationUID] = styles;
|
|
47
|
+
}
|
|
48
|
+
setViewportToolStyles(viewportId, styles) {
|
|
49
|
+
let viewportSpecificStyles = this.config.viewports;
|
|
50
|
+
if (!viewportSpecificStyles) {
|
|
51
|
+
this.config = {
|
|
52
|
+
...this.config,
|
|
53
|
+
viewports: {},
|
|
54
|
+
};
|
|
55
|
+
viewportSpecificStyles = this.config.viewports;
|
|
56
|
+
}
|
|
57
|
+
if (viewportSpecificStyles[viewportId]) {
|
|
58
|
+
console.warn('overriding viewport styles for viewportId:', viewportId);
|
|
59
|
+
}
|
|
60
|
+
viewportSpecificStyles[viewportId] = styles;
|
|
61
|
+
}
|
|
62
|
+
setToolGroupToolStyles(toolGroupId, styles) {
|
|
63
|
+
let toolGroupSpecificStyles = this.config.toolGroups;
|
|
64
|
+
if (!toolGroupSpecificStyles) {
|
|
65
|
+
this.config = {
|
|
66
|
+
...this.config,
|
|
67
|
+
toolGroups: {},
|
|
68
|
+
};
|
|
69
|
+
toolGroupSpecificStyles = this.config.toolGroups;
|
|
70
|
+
}
|
|
71
|
+
if (toolGroupSpecificStyles[toolGroupId]) {
|
|
72
|
+
console.warn('overriding toolGroup styles for toolGroupId:', toolGroupId);
|
|
73
|
+
}
|
|
74
|
+
toolGroupSpecificStyles[toolGroupId] = styles;
|
|
75
|
+
}
|
|
76
|
+
setDefaultToolStyles(styles) {
|
|
77
|
+
this.config.default = styles;
|
|
78
|
+
}
|
|
79
|
+
getStyleProperty(toolStyle, specifications) {
|
|
80
|
+
const { annotationUID, viewportId, toolGroupId, toolName } = specifications;
|
|
81
|
+
return this._getToolStyle(toolStyle, annotationUID, viewportId, toolGroupId, toolName);
|
|
82
|
+
}
|
|
83
|
+
_getToolStyle(property, annotationUID, viewportId, toolGroupId, toolName) {
|
|
84
|
+
if (annotationUID) {
|
|
85
|
+
const styles = this.getAnnotationToolStyles(annotationUID);
|
|
86
|
+
if (styles) {
|
|
87
|
+
if (styles[property]) {
|
|
88
|
+
return styles[property];
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
if (viewportId) {
|
|
93
|
+
const styles = this.getViewportToolStyles(viewportId);
|
|
94
|
+
if (styles) {
|
|
95
|
+
if (styles[toolName] && styles[toolName][property]) {
|
|
96
|
+
return styles[toolName][property];
|
|
97
|
+
}
|
|
98
|
+
if (styles.global && styles.global[property]) {
|
|
99
|
+
return styles.global[property];
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
if (toolGroupId) {
|
|
104
|
+
const styles = this.getToolGroupToolStyles(toolGroupId);
|
|
105
|
+
if (styles) {
|
|
106
|
+
if (styles[toolName] && styles[toolName][property]) {
|
|
107
|
+
return styles[toolName][property];
|
|
108
|
+
}
|
|
109
|
+
if (styles.global && styles.global[property]) {
|
|
110
|
+
return styles.global[property];
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
const globalStyles = this.getDefaultToolStyles();
|
|
115
|
+
if (globalStyles[toolName] && globalStyles[toolName][property]) {
|
|
116
|
+
return globalStyles[toolName][property];
|
|
117
|
+
}
|
|
118
|
+
if (globalStyles.global && globalStyles.global[property]) {
|
|
119
|
+
return globalStyles.global[property];
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
_initializeConfig(config) {
|
|
123
|
+
const toolStyles = {};
|
|
124
|
+
for (const name in config) {
|
|
125
|
+
toolStyles[name] = config[name];
|
|
126
|
+
}
|
|
127
|
+
this.config = {
|
|
128
|
+
default: {
|
|
129
|
+
global: toolStyles,
|
|
130
|
+
},
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
const toolStyle = new ToolStyle();
|
|
135
|
+
export default toolStyle;
|
|
136
|
+
//# sourceMappingURL=ToolStyle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ToolStyle.js","sourceRoot":"","sources":["../../../../../src/stateManagement/annotation/config/ToolStyle.ts"],"names":[],"mappings":"AAyBA,MAAM,SAAS;IAGb;QACE,MAAM,aAAa,GAAG;YACpB,KAAK,EAAE,kBAAkB;YACzB,gBAAgB,EAAE,gBAAgB;YAClC,aAAa,EAAE,gBAAgB;YAC/B,WAAW,EAAE,kBAAkB;YAC/B,SAAS,EAAE,GAAG;YACd,QAAQ,EAAE,EAAE;YACZ,iBAAiB,EAAE,8CAA8C;YACjE,eAAe,EAAE,MAAM;YACvB,YAAY,EAAE,kBAAkB;YAChC,uBAAuB,EAAE,gBAAgB;YACzC,oBAAoB,EAAE,gBAAgB;YACtC,kBAAkB,EAAE,kBAAkB;YACtC,iBAAiB,EAAE,EAAE;YACrB,oBAAoB,EAAE,GAAG;YACzB,mBAAmB,EAAE,KAAK;SAC3B,CAAC;QAEF,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACxC,CAAC;IAOD,uBAAuB,CAAC,aAAqB;QAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IAC3E,CAAC;IAQD,qBAAqB,CAAC,UAAkB;QACtC,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACpE,CAAC;IAQD,sBAAsB,CAAC,WAAmB;QACxC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IACvE,CAAC;IAOD,oBAAoB;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7B,CAAC;IASD,mBAAmB,CAAC,aAAqB,EAAE,MAAuB;QAChE,IAAI,wBAAwB,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QAEvD,IAAI,CAAC,wBAAwB,EAAE;YAC7B,IAAI,CAAC,MAAM,GAAG;gBACZ,GAAG,IAAI,CAAC,MAAM;gBACd,WAAW,EAAE,EAAE;aAChB,CAAC;YAEF,wBAAwB,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;SACpD;QAED,IAAI,wBAAwB,CAAC,aAAa,CAAC,EAAE;YAC3C,OAAO,CAAC,IAAI,CACV,iDAAiD,EACjD,aAAa,CACd,CAAC;SACH;QAED,wBAAwB,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;IACnD,CAAC;IAQD,qBAAqB,CAAC,UAAkB,EAAE,MAAuB;QAC/D,IAAI,sBAAsB,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;QAEnD,IAAI,CAAC,sBAAsB,EAAE;YAC3B,IAAI,CAAC,MAAM,GAAG;gBACZ,GAAG,IAAI,CAAC,MAAM;gBACd,SAAS,EAAE,EAAE;aACd,CAAC;YAEF,sBAAsB,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;SAChD;QAED,IAAI,sBAAsB,CAAC,UAAU,CAAC,EAAE;YACtC,OAAO,CAAC,IAAI,CAAC,4CAA4C,EAAE,UAAU,CAAC,CAAC;SACxE;QAED,sBAAsB,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC;IAC9C,CAAC;IASD,sBAAsB,CAAC,WAAmB,EAAE,MAAuB;QACjE,IAAI,uBAAuB,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QAErD,IAAI,CAAC,uBAAuB,EAAE;YAC5B,IAAI,CAAC,MAAM,GAAG;gBACZ,GAAG,IAAI,CAAC,MAAM;gBACd,UAAU,EAAE,EAAE;aACf,CAAC;YAEF,uBAAuB,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;SAClD;QAED,IAAI,uBAAuB,CAAC,WAAW,CAAC,EAAE;YACxC,OAAO,CAAC,IAAI,CAAC,8CAA8C,EAAE,WAAW,CAAC,CAAC;SAC3E;QAED,uBAAuB,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC;IAChD,CAAC;IAOD,oBAAoB,CAAC,MAAuB;QAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;IAC/B,CAAC;IAYD,gBAAgB,CAAC,SAAiB,EAAE,cAA8B;QAChE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAE5E,OAAO,IAAI,CAAC,aAAa,CACvB,SAAS,EACT,aAAa,EACb,UAAU,EACV,WAAW,EACX,QAAQ,CACT,CAAC;IACJ,CAAC;IAEO,aAAa,CACnB,QAAgB,EAChB,aAAqB,EACrB,UAAkB,EAClB,WAAmB,EACnB,QAAgB;QAEhB,IAAI,aAAa,EAAE;YACjB,MAAM,MAAM,GAAG,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;YAE3D,IAAI,MAAM,EAAE;gBAEV,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE;oBACpB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;iBACzB;aACF;SACF;QAED,IAAI,UAAU,EAAE;YACd,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;YAEtD,IAAI,MAAM,EAAE;gBAGV,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE;oBAClD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;iBACnC;gBAGD,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;oBAC5C,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;iBAChC;aACF;SACF;QAED,IAAI,WAAW,EAAE;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;YAExD,IAAI,MAAM,EAAE;gBAEV,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE;oBAClD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;iBACnC;gBAGD,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;oBAC5C,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;iBAChC;aACF;SACF;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAEjD,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE;YAC9D,OAAO,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;SACzC;QAED,IAAI,YAAY,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YACxD,OAAO,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACtC;IACH,CAAC;IAEO,iBAAiB,CAAC,MAAM;QAC9B,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;YACzB,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;SACjC;QAED,IAAI,CAAC,MAAM,GAAG;YACZ,OAAO,EAAE;gBACP,MAAM,EAAE,UAA6B;aACtC;SACF,CAAC;IACJ,CAAC;CACF;AAED,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;AAElC,eAAe,SAAS,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Settings } from '@cornerstonejs/core';
|
|
2
1
|
import { ToolModes, AnnotationStyleStates } from '../../../enums';
|
|
3
|
-
|
|
2
|
+
import { StyleSpecifier } from '../../../types/AnnotationStyle';
|
|
3
|
+
declare function getFont(styleSpecifier: StyleSpecifier, state?: AnnotationStyleStates, mode?: ToolModes): string;
|
|
4
4
|
export default getFont;
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const fontSize = getStyleProperty(sty, 'textBox.fontSize', state, mode);
|
|
6
|
-
const fontFamily = getStyleProperty(sty, 'textBox.fontFamily', state, mode);
|
|
1
|
+
import { getStyleProperty } from './helpers';
|
|
2
|
+
function getFont(styleSpecifier, state, mode) {
|
|
3
|
+
const fontSize = getStyleProperty('textBoxFontSize', styleSpecifier, state, mode);
|
|
4
|
+
const fontFamily = getStyleProperty('textBoxFontFamily', styleSpecifier, state, mode);
|
|
7
5
|
return `${fontSize}px ${fontFamily}`;
|
|
8
6
|
}
|
|
9
7
|
export default getFont;
|