@cornerstonejs/tools 0.67.3 → 0.67.5
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/drawingSvg/drawCircle.js +3 -1
- package/dist/cjs/drawingSvg/drawCircle.js.map +1 -1
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.js +10 -1
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationDisplayTool.js +1 -1
- package/dist/cjs/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js +2 -2
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/esm/drawingSvg/drawCircle.js +3 -1
- package/dist/esm/drawingSvg/drawCircle.js.map +1 -1
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js +10 -1
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js.map +1 -1
- package/dist/esm/tools/base/AnnotationDisplayTool.js +1 -1
- package/dist/esm/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js +2 -2
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js +1 -1
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +3 -3
- package/src/drawingSvg/drawCircle.ts +3 -1
- package/src/tools/annotation/ArrowAnnotateTool.ts +15 -2
- package/src/tools/base/AnnotationDisplayTool.ts +1 -2
- package/src/tools/segmentation/RectangleROIStartEndThresholdTool.ts +2 -4
- package/src/tools/segmentation/RectangleROIThresholdTool.ts +1 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cornerstonejs/tools",
|
|
3
|
-
"version": "0.67.
|
|
3
|
+
"version": "0.67.5",
|
|
4
4
|
"description": "Cornerstone3D Tools",
|
|
5
5
|
"main": "dist/umd/index.js",
|
|
6
6
|
"types": "dist/esm/index.d.ts",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"webpack:watch": "webpack --mode development --progress --watch --config ./.webpack/webpack.dev.js"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@cornerstonejs/core": "^0.47.
|
|
29
|
+
"@cornerstonejs/core": "^0.47.2",
|
|
30
30
|
"lodash.clonedeep": "4.5.0",
|
|
31
31
|
"lodash.get": "^4.4.2"
|
|
32
32
|
},
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"type": "individual",
|
|
50
50
|
"url": "https://ohif.org/donate"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "d0865c2e805bf58d9d6cee290ba39440518b3f8d"
|
|
53
53
|
}
|
|
@@ -15,11 +15,12 @@ function drawCircle(
|
|
|
15
15
|
options = {},
|
|
16
16
|
dataId = ''
|
|
17
17
|
): void {
|
|
18
|
-
const { color, fill, width, lineWidth } = Object.assign(
|
|
18
|
+
const { color, fill, width, lineWidth, lineDash } = Object.assign(
|
|
19
19
|
{
|
|
20
20
|
color: 'dodgerblue',
|
|
21
21
|
fill: 'transparent',
|
|
22
22
|
width: '2',
|
|
23
|
+
lineDash: undefined,
|
|
23
24
|
lineWidth: undefined,
|
|
24
25
|
},
|
|
25
26
|
options
|
|
@@ -40,6 +41,7 @@ function drawCircle(
|
|
|
40
41
|
stroke: color,
|
|
41
42
|
fill,
|
|
42
43
|
'stroke-width': strokeWidth,
|
|
44
|
+
'stroke-dasharray': lineDash,
|
|
43
45
|
};
|
|
44
46
|
|
|
45
47
|
if (existingCircleElement) {
|
|
@@ -25,7 +25,10 @@ import { state } from '../../store';
|
|
|
25
25
|
import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
|
|
26
26
|
import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
|
|
27
27
|
import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
|
|
28
|
-
import {
|
|
28
|
+
import {
|
|
29
|
+
AnnotationCompletedEventDetail,
|
|
30
|
+
AnnotationModifiedEventDetail,
|
|
31
|
+
} from '../../types/EventTypes';
|
|
29
32
|
|
|
30
33
|
import {
|
|
31
34
|
resetElementCursor,
|
|
@@ -310,7 +313,7 @@ class ArrowAnnotateTool extends AnnotationTool {
|
|
|
310
313
|
resetElementCursor(element);
|
|
311
314
|
|
|
312
315
|
const enabledElement = getEnabledElement(element);
|
|
313
|
-
const { renderingEngine } = enabledElement;
|
|
316
|
+
const { viewportId, renderingEngineId, renderingEngine } = enabledElement;
|
|
314
317
|
|
|
315
318
|
if (
|
|
316
319
|
this.isHandleOutsideImage &&
|
|
@@ -346,6 +349,16 @@ class ArrowAnnotateTool extends AnnotationTool {
|
|
|
346
349
|
viewportIdsToRender
|
|
347
350
|
);
|
|
348
351
|
});
|
|
352
|
+
} else {
|
|
353
|
+
const eventType = Events.ANNOTATION_MODIFIED;
|
|
354
|
+
|
|
355
|
+
const eventDetail: AnnotationModifiedEventDetail = {
|
|
356
|
+
annotation,
|
|
357
|
+
viewportId,
|
|
358
|
+
renderingEngineId,
|
|
359
|
+
};
|
|
360
|
+
|
|
361
|
+
triggerEvent(eventTarget, eventType, eventDetail);
|
|
349
362
|
}
|
|
350
363
|
|
|
351
364
|
this.editData = null;
|
|
@@ -109,8 +109,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
|
|
|
109
109
|
referencedImageId = csUtils.getClosestImageId(
|
|
110
110
|
imageVolume,
|
|
111
111
|
worldPos,
|
|
112
|
-
viewPlaneNormal
|
|
113
|
-
viewUp
|
|
112
|
+
viewPlaneNormal
|
|
114
113
|
);
|
|
115
114
|
}
|
|
116
115
|
|
|
@@ -257,8 +256,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
|
|
|
257
256
|
const imageId = csUtils.getClosestImageId(
|
|
258
257
|
imageVolume,
|
|
259
258
|
RectanglePoints[0],
|
|
260
|
-
viewPlaneNormal
|
|
261
|
-
metadata.viewUp
|
|
259
|
+
viewPlaneNormal
|
|
262
260
|
);
|
|
263
261
|
projectionPointsImageIds.push(imageId);
|
|
264
262
|
}
|