@cornerstonejs/tools 5.10.8 → 5.10.10
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/esm/tools/annotation/CircleROITool.js +2 -1
- package/dist/esm/tools/annotation/EllipticalROITool.js +2 -1
- package/dist/esm/tools/annotation/RectangleROITool.js +2 -1
- package/dist/esm/utilities/areaAnnotationShapeUtils.d.ts +2 -0
- package/dist/esm/utilities/areaAnnotationShapeUtils.js +4 -0
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +3 -3
|
@@ -24,6 +24,7 @@ import { getStyleProperty } from '../../stateManagement/annotation/config/helper
|
|
|
24
24
|
import { createGetTextLines, } from '../../utilities/defaultGetTextLines.js';
|
|
25
25
|
import getEllipseWorldCoordinates from '../../utilities/getEllipseWorldCoordinates.js';
|
|
26
26
|
import sampleAreaAnnotationVoxels from '../../utilities/sampleAreaAnnotationVoxels.js';
|
|
27
|
+
import { hasValidAreaAnnotationDimensions } from '../../utilities/areaAnnotationShapeUtils.js';
|
|
27
28
|
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
28
29
|
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('tools.annotation.CircleROITool');
|
|
29
30
|
const { transformWorldToIndex } = csUtils;
|
|
@@ -558,7 +559,7 @@ class CircleROITool extends AnnotationTool {
|
|
|
558
559
|
points: points,
|
|
559
560
|
boundsMargin: worldRadius,
|
|
560
561
|
createShape: ({ volume, planePoint, viewPlaneNormal }) => {
|
|
561
|
-
if (!(worldRadius
|
|
562
|
+
if (!hasValidAreaAnnotationDimensions(worldRadius)) {
|
|
562
563
|
return null;
|
|
563
564
|
}
|
|
564
565
|
return createCircleShape({
|
|
@@ -14,6 +14,7 @@ import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters/
|
|
|
14
14
|
import getViewportICamera from '../../utilities/getViewportICamera.js';
|
|
15
15
|
import getWorldWidthAndHeightFromTwoPoints from '../../utilities/planar/getWorldWidthAndHeightFromTwoPoints.js';
|
|
16
16
|
import sampleAreaAnnotationVoxels from '../../utilities/sampleAreaAnnotationVoxels.js';
|
|
17
|
+
import { hasValidAreaAnnotationDimensions } from '../../utilities/areaAnnotationShapeUtils.js';
|
|
17
18
|
import { getCanvasEllipseCorners } from '../../utilities/math/ellipse/index.js';
|
|
18
19
|
import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor.js';
|
|
19
20
|
import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds.js';
|
|
@@ -552,7 +553,7 @@ class EllipticalROITool extends AnnotationTool {
|
|
|
552
553
|
points: points,
|
|
553
554
|
boundsMargin: Math.max(majorRadius, minorRadius),
|
|
554
555
|
createShape: ({ volume, planePoint, viewPlaneNormal: normal }) => {
|
|
555
|
-
if (!(majorRadius
|
|
556
|
+
if (!hasValidAreaAnnotationDimensions(majorRadius, minorRadius)) {
|
|
556
557
|
return null;
|
|
557
558
|
}
|
|
558
559
|
const majorAxis = vec3.sub(vec3.create(), points[3], points[2]);
|
|
@@ -23,6 +23,7 @@ import { BasicStatsCalculator } from '../../utilities/math/basic/index.js';
|
|
|
23
23
|
import { getStyleProperty } from '../../stateManagement/annotation/config/helpers.js';
|
|
24
24
|
import { defaultAreaGetTextLines } from '../../utilities/defaultGetTextLines.js';
|
|
25
25
|
import sampleAreaAnnotationVoxels from '../../utilities/sampleAreaAnnotationVoxels.js';
|
|
26
|
+
import { hasValidAreaAnnotationDimensions } from '../../utilities/areaAnnotationShapeUtils.js';
|
|
26
27
|
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
27
28
|
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('tools.annotation.RectangleROITool');
|
|
28
29
|
const { transformWorldToIndex, transformWorldToIndexContinuous } = csUtils;
|
|
@@ -475,7 +476,7 @@ class RectangleROITool extends AnnotationTool {
|
|
|
475
476
|
const majorAxis = vec3.sub(vec3.create(), worldHandles[1], worldHandles[0]);
|
|
476
477
|
const majorHalfLength = vec3.distance(worldHandles[0], worldHandles[1]) / 2;
|
|
477
478
|
const minorHalfLength = vec3.distance(worldHandles[0], worldHandles[2]) / 2;
|
|
478
|
-
if (!(majorHalfLength
|
|
479
|
+
if (!hasValidAreaAnnotationDimensions(majorHalfLength, minorHalfLength)) {
|
|
479
480
|
return null;
|
|
480
481
|
}
|
|
481
482
|
return createRectangleShape({
|
package/dist/esm/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "5.10.
|
|
1
|
+
export declare const version = "5.10.10";
|
package/dist/esm/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '5.10.
|
|
1
|
+
export const version = '5.10.10';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cornerstonejs/tools",
|
|
3
|
-
"version": "5.10.
|
|
3
|
+
"version": "5.10.10",
|
|
4
4
|
"description": "Cornerstone3D Tools",
|
|
5
5
|
"types": "./dist/esm/index.d.ts",
|
|
6
6
|
"module": "./dist/esm/index.js",
|
|
@@ -126,11 +126,11 @@
|
|
|
126
126
|
"lodash.get": "4.4.2"
|
|
127
127
|
},
|
|
128
128
|
"devDependencies": {
|
|
129
|
-
"@cornerstonejs/core": "5.10.
|
|
129
|
+
"@cornerstonejs/core": "5.10.10",
|
|
130
130
|
"canvas": "3.2.0"
|
|
131
131
|
},
|
|
132
132
|
"peerDependencies": {
|
|
133
|
-
"@cornerstonejs/core": "5.10.
|
|
133
|
+
"@cornerstonejs/core": "5.10.10",
|
|
134
134
|
"@kitware/vtk.js": "36.4.1",
|
|
135
135
|
"@types/d3-array": "3.2.1",
|
|
136
136
|
"@types/d3-interpolate": "3.0.4",
|