@cornerstonejs/tools 1.70.5 → 1.70.6
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/AdvancedMagnifyTool.d.ts +1 -1
- package/dist/cjs/tools/AdvancedMagnifyTool.js +35 -43
- package/dist/cjs/tools/AdvancedMagnifyTool.js.map +1 -1
- package/dist/cjs/tools/AdvancedMagnifyViewport.d.ts +1 -1
- package/dist/cjs/tools/AdvancedMagnifyViewport.js +8 -2
- package/dist/cjs/tools/AdvancedMagnifyViewport.js.map +1 -1
- package/dist/cjs/tools/AdvancedMagnifyViewportManager.d.ts +2 -1
- package/dist/cjs/tools/AdvancedMagnifyViewportManager.js +32 -3
- package/dist/cjs/tools/AdvancedMagnifyViewportManager.js.map +1 -1
- package/dist/cjs/tools/OrientationMarkerTool.js +6 -1
- package/dist/cjs/tools/OrientationMarkerTool.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationTool.js +4 -1
- package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js +5 -0
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/cjs/tools/segmentation/BrushTool.js +12 -1
- package/dist/cjs/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/compositions/dynamicThreshold.js +3 -0
- package/dist/cjs/tools/segmentation/strategies/compositions/dynamicThreshold.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/compositions/preview.js +10 -2
- package/dist/cjs/tools/segmentation/strategies/compositions/preview.js.map +1 -1
- package/dist/cjs/types/ToolSpecificAnnotationTypes.d.ts +2 -1
- package/dist/cjs/utilities/cine/playClip.d.ts +1 -1
- package/dist/cjs/utilities/cine/playClip.js +2 -5
- package/dist/cjs/utilities/cine/playClip.js.map +1 -1
- package/dist/cjs/utilities/planar/filterAnnotationsForDisplay.js +3 -0
- package/dist/cjs/utilities/planar/filterAnnotationsForDisplay.js.map +1 -1
- package/dist/esm/tools/AdvancedMagnifyTool.js +35 -43
- package/dist/esm/tools/AdvancedMagnifyTool.js.map +1 -1
- package/dist/esm/tools/AdvancedMagnifyViewport.js +8 -2
- package/dist/esm/tools/AdvancedMagnifyViewport.js.map +1 -1
- package/dist/esm/tools/AdvancedMagnifyViewportManager.js +38 -4
- package/dist/esm/tools/AdvancedMagnifyViewportManager.js.map +1 -1
- package/dist/esm/tools/OrientationMarkerTool.js +6 -1
- package/dist/esm/tools/OrientationMarkerTool.js.map +1 -1
- package/dist/esm/tools/base/AnnotationTool.js +4 -1
- package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js +5 -0
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/esm/tools/segmentation/BrushTool.js +13 -2
- package/dist/esm/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/compositions/dynamicThreshold.js +3 -0
- package/dist/esm/tools/segmentation/strategies/compositions/dynamicThreshold.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/compositions/preview.js +10 -2
- package/dist/esm/tools/segmentation/strategies/compositions/preview.js.map +1 -1
- package/dist/esm/utilities/cine/playClip.js +2 -2
- package/dist/esm/utilities/cine/playClip.js.map +1 -1
- package/dist/esm/utilities/planar/filterAnnotationsForDisplay.js +3 -0
- package/dist/esm/utilities/planar/filterAnnotationsForDisplay.js.map +1 -1
- package/dist/types/tools/AdvancedMagnifyTool.d.ts +1 -1
- package/dist/types/tools/AdvancedMagnifyTool.d.ts.map +1 -1
- package/dist/types/tools/AdvancedMagnifyViewport.d.ts +1 -1
- package/dist/types/tools/AdvancedMagnifyViewport.d.ts.map +1 -1
- package/dist/types/tools/AdvancedMagnifyViewportManager.d.ts +2 -1
- package/dist/types/tools/AdvancedMagnifyViewportManager.d.ts.map +1 -1
- package/dist/types/tools/OrientationMarkerTool.d.ts.map +1 -1
- package/dist/types/tools/base/AnnotationTool.d.ts.map +1 -1
- package/dist/types/tools/displayTools/Labelmap/labelmapDisplay.d.ts.map +1 -1
- package/dist/types/tools/segmentation/BrushTool.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/compositions/dynamicThreshold.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/compositions/preview.d.ts.map +1 -1
- package/dist/types/types/ToolSpecificAnnotationTypes.d.ts +2 -1
- package/dist/types/types/ToolSpecificAnnotationTypes.d.ts.map +1 -1
- package/dist/types/utilities/cine/playClip.d.ts +1 -1
- package/dist/types/utilities/cine/playClip.d.ts.map +1 -1
- package/dist/types/utilities/planar/filterAnnotationsForDisplay.d.ts.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +4 -4
- package/src/tools/AdvancedMagnifyTool.ts +42 -66
- package/src/tools/AdvancedMagnifyViewport.ts +11 -3
- package/src/tools/AdvancedMagnifyViewportManager.ts +74 -3
- package/src/tools/OrientationMarkerTool.ts +7 -1
- package/src/tools/base/AnnotationTool.ts +8 -2
- package/src/tools/displayTools/Labelmap/labelmapDisplay.ts +7 -0
- package/src/tools/segmentation/BrushTool.ts +17 -1
- package/src/tools/segmentation/strategies/compositions/dynamicThreshold.ts +6 -0
- package/src/tools/segmentation/strategies/compositions/preview.ts +14 -4
- package/src/types/ToolSpecificAnnotationTypes.ts +2 -1
- package/src/utilities/cine/playClip.ts +2 -2
- package/src/utilities/planar/filterAnnotationsForDisplay.ts +3 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -204,6 +204,11 @@ function _setLabelmapColorAndOpacity(viewportId, actorEntry, cfun, ofun, colorLU
|
|
|
204
204
|
const { activeSegmentIndex } = SegmentationState.getSegmentation(segmentationRepresentation.segmentationId);
|
|
205
205
|
const outlineWidths = new Array(numColors - 1);
|
|
206
206
|
for (let i = 1; i < numColors; i++) {
|
|
207
|
+
const isHidden = segmentsHidden.has(i);
|
|
208
|
+
if (isHidden) {
|
|
209
|
+
outlineWidths[i - 1] = 0;
|
|
210
|
+
continue;
|
|
211
|
+
}
|
|
207
212
|
outlineWidths[i - 1] =
|
|
208
213
|
i === activeSegmentIndex
|
|
209
214
|
? outlineWidth + toolGroupLabelmapConfig.activeSegmentOutlineWidthDelta
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"labelmapDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/labelmapDisplay.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2GAAsF;AACtF,iHAA4F;AAE5F,8CAM6B;AAE7B,6GAAyE;AACzE,2GAA6F;AAC7F,sEAA+D;AAW/D,kFAA0D;AAC1D,4FAAoE;AACpE,2FAA4F;AAC5F,wEAAgE;AAEhE,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAC9B,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAE,CAAC;AAEtC,SAAS,gCAAgC;IACvC,MAAM,IAAI,GAAG,+BAAwB,CAAC,WAAW,EAAE,CAAC;IACpD,MAAM,IAAI,GAAG,2BAAoB,CAAC,WAAW,EAAE,CAAC;IAChD,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpB,OAAO;QACL,IAAI;QACJ,IAAI;KACL,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"labelmapDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/labelmapDisplay.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,6 @@ class BrushTool extends base_1.BaseTool {
|
|
|
31
31
|
strategySpecificConfiguration: {
|
|
32
32
|
THRESHOLD: {
|
|
33
33
|
threshold: [-150, -70],
|
|
34
|
-
dynamicRadius: 0,
|
|
35
34
|
},
|
|
36
35
|
},
|
|
37
36
|
defaultStrategy: 'FILL_INSIDE_CIRCLE',
|
|
@@ -213,6 +212,18 @@ class BrushTool extends base_1.BaseTool {
|
|
|
213
212
|
if ((0, stackVolumeCheck_1.isVolumeSegmentation)(labelmapData, viewport)) {
|
|
214
213
|
const { volumeId } = representationData[type];
|
|
215
214
|
const actors = viewport.getActors();
|
|
215
|
+
const isStackViewport = viewport instanceof core_1.StackViewport;
|
|
216
|
+
if (isStackViewport) {
|
|
217
|
+
const event = new CustomEvent(core_1.Enums.Events.ERROR_EVENT, {
|
|
218
|
+
detail: {
|
|
219
|
+
type: 'Segmentation',
|
|
220
|
+
message: 'Cannot perform brush operation on the selected viewport',
|
|
221
|
+
},
|
|
222
|
+
cancelable: true,
|
|
223
|
+
});
|
|
224
|
+
core_1.eventTarget.dispatchEvent(event);
|
|
225
|
+
return null;
|
|
226
|
+
}
|
|
216
227
|
const volumes = actors.map((actorEntry) => core_1.cache.getVolume(actorEntry.referenceId));
|
|
217
228
|
const segmentationVolume = core_1.cache.getVolume(volumeId);
|
|
218
229
|
const referencedVolumeIdToThreshold = ((_a = volumes.find((volume) => core_1.utilities.isEqual(volume.dimensions, segmentationVolume.dimensions))) === null || _a === void 0 ? void 0 : _a.volumeId) || ((_b = volumes[0]) === null || _b === void 0 ? void 0 : _b.volumeId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrushTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/BrushTool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BrushTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/BrushTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,6 +46,9 @@ exports.default = {
|
|
|
46
46
|
[StrategyCallbacks_1.default.ComputeInnerCircleRadius]: (operationData) => {
|
|
47
47
|
const { configuration, viewport } = operationData;
|
|
48
48
|
const { THRESHOLD: { dynamicRadius = 0 } = {} } = configuration.strategySpecificConfiguration || {};
|
|
49
|
+
if (dynamicRadius === 0) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
49
52
|
const { spacing } = viewport.getImageData();
|
|
50
53
|
const centerCanvas = [
|
|
51
54
|
viewport.element.clientWidth / 2,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamicThreshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/dynamicThreshold.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dynamicThreshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/dynamicThreshold.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const triggerSegmentationEvents_1 = require("../../../../stateManagement/segmentation/triggerSegmentationEvents");
|
|
7
7
|
const segmentation_1 = require("../../../../stateManagement/segmentation");
|
|
8
8
|
const StrategyCallbacks_1 = __importDefault(require("../../../../enums/StrategyCallbacks"));
|
|
9
|
+
function lightenColor(r, g, b, a, factor = 0.4) {
|
|
10
|
+
return [
|
|
11
|
+
Math.round(r + (255 - r) * factor),
|
|
12
|
+
Math.round(g + (255 - g) * factor),
|
|
13
|
+
Math.round(b + (255 - b) * factor),
|
|
14
|
+
a,
|
|
15
|
+
];
|
|
16
|
+
}
|
|
9
17
|
exports.default = {
|
|
10
18
|
[StrategyCallbacks_1.default.Preview]: function (operationData) {
|
|
11
19
|
var _a, _b;
|
|
@@ -44,12 +52,12 @@ exports.default = {
|
|
|
44
52
|
if (!configColor && !segmentColor) {
|
|
45
53
|
return;
|
|
46
54
|
}
|
|
47
|
-
const previewColor = configColor || segmentColor
|
|
55
|
+
const previewColor = configColor || lightenColor(...segmentColor);
|
|
48
56
|
segmentation_1.config.color.setColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, previewSegmentIndex, previewColor);
|
|
49
57
|
},
|
|
50
58
|
[StrategyCallbacks_1.default.AcceptPreview]: (operationData) => {
|
|
51
59
|
var _a;
|
|
52
|
-
const { segmentationVoxelManager: segmentationVoxelManager, previewVoxelManager: previewVoxelManager, previewSegmentIndex, preview, } = operationData;
|
|
60
|
+
const { segmentationVoxelManager: segmentationVoxelManager, previewVoxelManager: previewVoxelManager, previewSegmentIndex, preview, } = operationData || {};
|
|
53
61
|
if (previewSegmentIndex === undefined) {
|
|
54
62
|
return;
|
|
55
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/preview.ts"],"names":[],"mappings":";;;;;AAEA,kHAAqH;AACrH,2EAAwF;AACxF,4FAAoE;
|
|
1
|
+
{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/preview.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,8 +82,9 @@ export interface AdvancedMagnifyAnnotation extends Annotation {
|
|
|
82
82
|
zoomFactor: number;
|
|
83
83
|
sourceViewportId: string;
|
|
84
84
|
magnifyViewportId: string;
|
|
85
|
+
isCanvasAnnotation: boolean;
|
|
85
86
|
handles: {
|
|
86
|
-
points: Types.Point3
|
|
87
|
+
points: [Types.Point3, Types.Point3, Types.Point3, Types.Point3];
|
|
87
88
|
activeHandleIndex: number | null;
|
|
88
89
|
};
|
|
89
90
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { CINETypes } from '../../types';
|
|
2
2
|
declare function playClip(element: HTMLDivElement, playClipOptions: CINETypes.PlayClipOptions): void;
|
|
3
|
-
declare function stopClip(element: HTMLDivElement,
|
|
3
|
+
declare function stopClip(element: HTMLDivElement, options?: any): void;
|
|
4
4
|
export { playClip, stopClip };
|
|
@@ -118,11 +118,8 @@ function playClip(element, playClipOptions) {
|
|
|
118
118
|
triggerEvent(element, events_1.default.CLIP_STARTED, eventDetail);
|
|
119
119
|
}
|
|
120
120
|
exports.playClip = playClip;
|
|
121
|
-
function stopClip(element,
|
|
122
|
-
_stopClip(element, {
|
|
123
|
-
stopDynamicCine: true,
|
|
124
|
-
viewportId,
|
|
125
|
-
});
|
|
121
|
+
function stopClip(element, options = {}) {
|
|
122
|
+
_stopClip(element, Object.assign({ stopDynamicCine: true }, options));
|
|
126
123
|
}
|
|
127
124
|
exports.stopClip = stopClip;
|
|
128
125
|
function _stopClip(element, options = { stopDynamicCine: true, viewportId: undefined }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playClip.js","sourceRoot":"","sources":["../../../../src/utilities/cine/playClip.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"playClip.js","sourceRoot":"","sources":["../../../../src/utilities/cine/playClip.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,9 @@ function filterAnnotationsForDisplay(viewport, annotations, filterOptions = {})
|
|
|
20
20
|
if (!annotation.isVisible) {
|
|
21
21
|
return false;
|
|
22
22
|
}
|
|
23
|
+
if (annotation.data.isCanvasAnnotation) {
|
|
24
|
+
return true;
|
|
25
|
+
}
|
|
23
26
|
return viewport.isReferenceViewable(annotation.metadata, filterOptions);
|
|
24
27
|
});
|
|
25
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterAnnotationsForDisplay.js","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":";;;;;AAAA,8CAK6B;AAE7B,kGAA0E;AAS1E,SAAwB,2BAA2B,CACjD,QAAyB,EACzB,WAAwB,EACxB,gBAAkD,EAAE;IAEpD,IAAI,QAAQ,YAAY,qBAAc,EAAE;QACtC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAEpC,MAAM,EAAE,wBAAwB,EAAE,GAChC,gBAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAGjE,OAAO,IAAA,sCAA4B,EACjC,WAAW,EACX,MAAM,EACN,wBAAwB,CACzB,CAAC;KACH;IACD,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAErC,MAAM,OAAO,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAK7C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAExC,aAAa,CAAC,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;KAC5D;IACD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;QACvC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;YACzB,OAAO,KAAK,CAAC;SACd;QACD,OAAO,QAAQ,CAAC,mBAAmB,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;AACL,CAAC;
|
|
1
|
+
{"version":3,"file":"filterAnnotationsForDisplay.js","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":";;;;;AAAA,8CAK6B;AAE7B,kGAA0E;AAS1E,SAAwB,2BAA2B,CACjD,QAAyB,EACzB,WAAwB,EACxB,gBAAkD,EAAE;IAEpD,IAAI,QAAQ,YAAY,qBAAc,EAAE;QACtC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAEpC,MAAM,EAAE,wBAAwB,EAAE,GAChC,gBAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAGjE,OAAO,IAAA,sCAA4B,EACjC,WAAW,EACX,MAAM,EACN,wBAAwB,CACzB,CAAC;KACH;IACD,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAErC,MAAM,OAAO,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAK7C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAExC,aAAa,CAAC,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;KAC5D;IACD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;QACvC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;YACzB,OAAO,KAAK,CAAC;SACd;QACD,IAAI,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE;YACtC,OAAO,IAAI,CAAC;SACb;QACD,OAAO,QAAQ,CAAC,mBAAmB,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;AACL,CAAC;AAtCD,8CAsCC"}
|
|
@@ -23,8 +23,8 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
23
23
|
shadow: true,
|
|
24
24
|
magnifyingGlass: {
|
|
25
25
|
radius: 125,
|
|
26
|
-
zoomFactor:
|
|
27
|
-
zoomFactorList: [2.5, 3, 3.5, 4, 4.5, 5],
|
|
26
|
+
zoomFactor: 3,
|
|
27
|
+
zoomFactorList: [1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5],
|
|
28
28
|
autoPan: {
|
|
29
29
|
enabled: true,
|
|
30
30
|
padding: 10,
|
|
@@ -53,7 +53,7 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
53
53
|
const canvasPos = currentPoints.canvas;
|
|
54
54
|
const { magnifyingGlass: config } = this.configuration;
|
|
55
55
|
const { radius, zoomFactor, autoPan } = config;
|
|
56
|
-
const
|
|
56
|
+
const canvasHandlePoints = this._getCanvasHandlePoints(canvasPos, radius);
|
|
57
57
|
const camera = viewport.getCamera();
|
|
58
58
|
const { viewPlaneNormal, viewUp } = camera;
|
|
59
59
|
const referencedImageId = this.getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp);
|
|
@@ -75,8 +75,9 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
75
75
|
sourceViewportId: viewport.id,
|
|
76
76
|
magnifyViewportId,
|
|
77
77
|
zoomFactor,
|
|
78
|
+
isCanvasAnnotation: true,
|
|
78
79
|
handles: {
|
|
79
|
-
points:
|
|
80
|
+
points: canvasHandlePoints,
|
|
80
81
|
activeHandleIndex: null,
|
|
81
82
|
},
|
|
82
83
|
},
|
|
@@ -92,11 +93,12 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
92
93
|
padding: autoPan.padding,
|
|
93
94
|
callback: (data) => {
|
|
94
95
|
const annotationPoints = annotation.data.handles.points;
|
|
95
|
-
const {
|
|
96
|
+
const { canvas: canvasDelta } = data.delta;
|
|
96
97
|
for (let i = 0, len = annotationPoints.length; i < len; i++) {
|
|
97
|
-
annotationPoints[i]
|
|
98
|
-
|
|
99
|
-
|
|
98
|
+
const point = annotationPoints[i];
|
|
99
|
+
point[0] += canvasDelta[0];
|
|
100
|
+
point[1] += canvasDelta[1];
|
|
101
|
+
annotation.invalidated = true;
|
|
100
102
|
}
|
|
101
103
|
},
|
|
102
104
|
},
|
|
@@ -117,11 +119,9 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
117
119
|
});
|
|
118
120
|
};
|
|
119
121
|
this.isPointNearTool = (element, annotation, canvasCoords, proximity) => {
|
|
120
|
-
const enabledElement = getEnabledElement(element);
|
|
121
|
-
const { viewport } = enabledElement;
|
|
122
122
|
const { data } = annotation;
|
|
123
123
|
const { points } = data.handles;
|
|
124
|
-
const canvasCoordinates = points
|
|
124
|
+
const canvasCoordinates = points;
|
|
125
125
|
const canvasTop = canvasCoordinates[0];
|
|
126
126
|
const canvasBottom = canvasCoordinates[2];
|
|
127
127
|
const canvasLeft = canvasCoordinates[3];
|
|
@@ -131,7 +131,7 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
131
131
|
canvasTop[1] + radius,
|
|
132
132
|
];
|
|
133
133
|
const radiusPoint = getCanvasCircleRadius([center, canvasCoords]);
|
|
134
|
-
if (Math.abs(radiusPoint - radius) < proximity *
|
|
134
|
+
if (Math.abs(radiusPoint - radius) < proximity * 2) {
|
|
135
135
|
return true;
|
|
136
136
|
}
|
|
137
137
|
return false;
|
|
@@ -193,15 +193,14 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
193
193
|
this.isDrawing = true;
|
|
194
194
|
const eventDetail = evt.detail;
|
|
195
195
|
const { element, deltaPoints } = eventDetail;
|
|
196
|
-
const
|
|
196
|
+
const canvasDelta = deltaPoints?.canvas ?? [0, 0, 0];
|
|
197
197
|
const enabledElement = getEnabledElement(element);
|
|
198
198
|
const { renderingEngine } = enabledElement;
|
|
199
199
|
const { annotation, viewportIdsToRender } = this.editData;
|
|
200
200
|
const { points } = annotation.data.handles;
|
|
201
201
|
points.forEach((point) => {
|
|
202
|
-
point[0] +=
|
|
203
|
-
point[1] +=
|
|
204
|
-
point[2] += worldPosDelta[2];
|
|
202
|
+
point[0] += canvasDelta[0];
|
|
203
|
+
point[1] += canvasDelta[1];
|
|
205
204
|
});
|
|
206
205
|
annotation.invalidated = true;
|
|
207
206
|
this.editData.hasMoved = true;
|
|
@@ -215,12 +214,11 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
215
214
|
const { data } = annotation;
|
|
216
215
|
if (handleIndex === undefined) {
|
|
217
216
|
const { deltaPoints } = eventDetail;
|
|
218
|
-
const
|
|
217
|
+
const canvasDelta = deltaPoints.canvas;
|
|
219
218
|
const points = data.handles.points;
|
|
220
219
|
points.forEach((point) => {
|
|
221
|
-
point[0] +=
|
|
222
|
-
point[1] +=
|
|
223
|
-
point[2] += worldPosDelta[2];
|
|
220
|
+
point[0] += canvasDelta[0];
|
|
221
|
+
point[1] += canvasDelta[1];
|
|
224
222
|
});
|
|
225
223
|
annotation.invalidated = true;
|
|
226
224
|
}
|
|
@@ -234,14 +232,10 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
234
232
|
};
|
|
235
233
|
this._dragHandle = (evt) => {
|
|
236
234
|
const eventDetail = evt.detail;
|
|
237
|
-
const { element } = eventDetail;
|
|
238
|
-
const enabledElement = getEnabledElement(element);
|
|
239
|
-
const { viewport } = enabledElement;
|
|
240
|
-
const { worldToCanvas } = viewport;
|
|
241
235
|
const { annotation } = this.editData;
|
|
242
236
|
const { data } = annotation;
|
|
243
237
|
const { points } = data.handles;
|
|
244
|
-
const canvasCoordinates = points
|
|
238
|
+
const canvasCoordinates = points;
|
|
245
239
|
const canvasTop = canvasCoordinates[0];
|
|
246
240
|
const canvasBottom = canvasCoordinates[2];
|
|
247
241
|
const canvasLeft = canvasCoordinates[3];
|
|
@@ -256,11 +250,11 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
256
250
|
canvasCenter,
|
|
257
251
|
currentCanvasPoints,
|
|
258
252
|
]);
|
|
259
|
-
const
|
|
260
|
-
points[0] =
|
|
261
|
-
points[1] =
|
|
262
|
-
points[2] =
|
|
263
|
-
points[3] =
|
|
253
|
+
const newCanvasHandlePoints = this._getCanvasHandlePoints(canvasCenter, newRadius);
|
|
254
|
+
points[0] = newCanvasHandlePoints[0];
|
|
255
|
+
points[1] = newCanvasHandlePoints[1];
|
|
256
|
+
points[2] = newCanvasHandlePoints[2];
|
|
257
|
+
points[3] = newCanvasHandlePoints[3];
|
|
264
258
|
};
|
|
265
259
|
this.cancel = (element) => {
|
|
266
260
|
if (!this.isDrawing) {
|
|
@@ -308,10 +302,10 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
308
302
|
if (!annotations?.length) {
|
|
309
303
|
return renderStatus;
|
|
310
304
|
}
|
|
311
|
-
annotations = this.filterInteractableAnnotationsForElement(element, annotations);
|
|
312
305
|
annotations = annotations?.filter((annotation) => annotation.data.sourceViewportId ===
|
|
313
306
|
viewport.id);
|
|
314
|
-
|
|
307
|
+
const filteredAnnotations = this.filterInteractableAnnotationsForElement(element, annotations);
|
|
308
|
+
if (!filteredAnnotations?.length) {
|
|
315
309
|
return renderStatus;
|
|
316
310
|
}
|
|
317
311
|
const styleSpecifier = {
|
|
@@ -319,8 +313,8 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
319
313
|
toolName: this.getToolName(),
|
|
320
314
|
viewportId: enabledElement.viewport.id,
|
|
321
315
|
};
|
|
322
|
-
for (let i = 0; i <
|
|
323
|
-
const annotation =
|
|
316
|
+
for (let i = 0; i < filteredAnnotations.length; i++) {
|
|
317
|
+
const annotation = filteredAnnotations[i];
|
|
324
318
|
const { annotationUID, data } = annotation;
|
|
325
319
|
const { magnifyViewportId, zoomFactor, handles } = data;
|
|
326
320
|
const { points, activeHandleIndex } = handles;
|
|
@@ -328,7 +322,7 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
328
322
|
const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
|
|
329
323
|
const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
|
|
330
324
|
const color = this.getStyle('color', styleSpecifier, annotation);
|
|
331
|
-
const canvasCoordinates = points
|
|
325
|
+
const canvasCoordinates = points;
|
|
332
326
|
const canvasTop = canvasCoordinates[0];
|
|
333
327
|
const canvasBottom = canvasCoordinates[2];
|
|
334
328
|
const canvasLeft = canvasCoordinates[3];
|
|
@@ -371,15 +365,13 @@ class AdvancedMagnifyTool extends AnnotationTool {
|
|
|
371
365
|
}
|
|
372
366
|
return renderStatus;
|
|
373
367
|
};
|
|
374
|
-
this.
|
|
375
|
-
|
|
376
|
-
[canvasCenterPos[0], canvasCenterPos[1] - canvasRadius],
|
|
377
|
-
[canvasCenterPos[0] + canvasRadius, canvasCenterPos[1]],
|
|
378
|
-
[canvasCenterPos[0], canvasCenterPos[1] + canvasRadius],
|
|
379
|
-
[canvasCenterPos[0] - canvasRadius, canvasCenterPos[1]],
|
|
368
|
+
this._getCanvasHandlePoints = (canvasCenterPos, canvasRadius) => {
|
|
369
|
+
return [
|
|
370
|
+
[canvasCenterPos[0], canvasCenterPos[1] - canvasRadius, 0],
|
|
371
|
+
[canvasCenterPos[0] + canvasRadius, canvasCenterPos[1], 0],
|
|
372
|
+
[canvasCenterPos[0], canvasCenterPos[1] + canvasRadius, 0],
|
|
373
|
+
[canvasCenterPos[0] - canvasRadius, canvasCenterPos[1], 0],
|
|
380
374
|
];
|
|
381
|
-
const worldHandlesPoints = canvasHandlesPoints.map((p) => viewport.canvasToWorld(p));
|
|
382
|
-
return worldHandlesPoints;
|
|
383
375
|
};
|
|
384
376
|
this.magnifyViewportManager = AdvancedMagnifyViewportManager.getInstance();
|
|
385
377
|
}
|