@cornerstonejs/tools 3.1.1 → 3.1.2
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.
|
@@ -3,6 +3,7 @@ declare enum Events {
|
|
|
3
3
|
TOOLGROUP_VIEWPORT_ADDED = "CORNERSTONE_TOOLS_TOOLGROUP_VIEWPORT_ADDED",
|
|
4
4
|
TOOLGROUP_VIEWPORT_REMOVED = "CORNERSTONE_TOOLS_TOOLGROUP_VIEWPORT_REMOVED",
|
|
5
5
|
TOOL_MODE_CHANGED = "CORNERSTONE_TOOLS_TOOL_MODE_CHANGED",
|
|
6
|
+
CROSSHAIR_TOOL_CENTER_CHANGED = "CORNERSTONE_TOOLS_CROSSHAIR_TOOL_CENTER_CHANGED",
|
|
6
7
|
ANNOTATION_ADDED = "CORNERSTONE_TOOLS_ANNOTATION_ADDED",
|
|
7
8
|
ANNOTATION_COMPLETED = "CORNERSTONE_TOOLS_ANNOTATION_COMPLETED",
|
|
8
9
|
ANNOTATION_MODIFIED = "CORNERSTONE_TOOLS_ANNOTATION_MODIFIED",
|
package/dist/esm/enums/Events.js
CHANGED
|
@@ -4,6 +4,7 @@ var Events;
|
|
|
4
4
|
Events["TOOLGROUP_VIEWPORT_ADDED"] = "CORNERSTONE_TOOLS_TOOLGROUP_VIEWPORT_ADDED";
|
|
5
5
|
Events["TOOLGROUP_VIEWPORT_REMOVED"] = "CORNERSTONE_TOOLS_TOOLGROUP_VIEWPORT_REMOVED";
|
|
6
6
|
Events["TOOL_MODE_CHANGED"] = "CORNERSTONE_TOOLS_TOOL_MODE_CHANGED";
|
|
7
|
+
Events["CROSSHAIR_TOOL_CENTER_CHANGED"] = "CORNERSTONE_TOOLS_CROSSHAIR_TOOL_CENTER_CHANGED";
|
|
7
8
|
Events["ANNOTATION_ADDED"] = "CORNERSTONE_TOOLS_ANNOTATION_ADDED";
|
|
8
9
|
Events["ANNOTATION_COMPLETED"] = "CORNERSTONE_TOOLS_ANNOTATION_COMPLETED";
|
|
9
10
|
Events["ANNOTATION_MODIFIED"] = "CORNERSTONE_TOOLS_ANNOTATION_MODIFIED";
|
|
@@ -33,6 +33,7 @@ declare class CrosshairsTool extends AnnotationTool {
|
|
|
33
33
|
resetCrosshairs: () => void;
|
|
34
34
|
computeToolCenter: () => void;
|
|
35
35
|
_computeToolCenter: (viewportsInfo: any) => void;
|
|
36
|
+
setToolCenter(toolCenter: Types.Point3, suppressEvents?: boolean): void;
|
|
36
37
|
addNewAnnotation: (evt: EventTypes.InteractionEventType) => CrosshairsAnnotation;
|
|
37
38
|
cancel: () => void;
|
|
38
39
|
getHandleNearImagePoint(element: HTMLDivElement, annotation: Annotation, canvasCoords: Types.Point2, proximity: number): ToolHandle | undefined;
|
|
@@ -2,7 +2,7 @@ import { vec2, vec3 } from 'gl-matrix';
|
|
|
2
2
|
import vtkMath from '@kitware/vtk.js/Common/Core/Math';
|
|
3
3
|
import vtkMatrixBuilder from '@kitware/vtk.js/Common/Core/MatrixBuilder';
|
|
4
4
|
import { AnnotationTool } from './base';
|
|
5
|
-
import { getEnabledElementByIds, getEnabledElement, utilities as csUtils, Enums, CONSTANTS, } from '@cornerstonejs/core';
|
|
5
|
+
import { getEnabledElementByIds, getEnabledElement, utilities as csUtils, Enums, CONSTANTS, triggerEvent, eventTarget, } from '@cornerstonejs/core';
|
|
6
6
|
import { getToolGroup, getToolGroupForViewport, } from '../store/ToolGroupManager';
|
|
7
7
|
import { addAnnotation, getAnnotations, removeAnnotation, } from '../stateManagement/annotation/annotationState';
|
|
8
8
|
import { drawCircle as drawCircleSvg, drawHandles as drawHandlesSvg, drawLine as drawLineSvg, } from '../drawingSvg';
|
|
@@ -162,8 +162,8 @@ class CrosshairsTool extends AnnotationTool {
|
|
|
162
162
|
const firstPlane = csUtils.planar.planeEquation(normal1, point1);
|
|
163
163
|
const secondPlane = csUtils.planar.planeEquation(normal2, point2);
|
|
164
164
|
const thirdPlane = csUtils.planar.planeEquation(normal3, point3);
|
|
165
|
-
|
|
166
|
-
|
|
165
|
+
const toolCenter = csUtils.planar.threePlaneIntersection(firstPlane, secondPlane, thirdPlane);
|
|
166
|
+
this.setToolCenter(toolCenter);
|
|
167
167
|
};
|
|
168
168
|
this.addNewAnnotation = (evt) => {
|
|
169
169
|
const eventDetail = evt.detail;
|
|
@@ -258,6 +258,10 @@ class CrosshairsTool extends AnnotationTool {
|
|
|
258
258
|
this.toolCenter[0] += deltaCameraPosition[0];
|
|
259
259
|
this.toolCenter[1] += deltaCameraPosition[1];
|
|
260
260
|
this.toolCenter[2] += deltaCameraPosition[2];
|
|
261
|
+
triggerEvent(eventTarget, Events.CROSSHAIR_TOOL_CENTER_CHANGED, {
|
|
262
|
+
toolGroupId: this.toolGroupId,
|
|
263
|
+
toolCenter: this.toolCenter,
|
|
264
|
+
});
|
|
261
265
|
}
|
|
262
266
|
}
|
|
263
267
|
if (this.configuration.autoPan?.enabled) {
|
|
@@ -1171,6 +1175,17 @@ class CrosshairsTool extends AnnotationTool {
|
|
|
1171
1175
|
}
|
|
1172
1176
|
});
|
|
1173
1177
|
}
|
|
1178
|
+
setToolCenter(toolCenter, suppressEvents = false) {
|
|
1179
|
+
this.toolCenter = toolCenter;
|
|
1180
|
+
const viewportsInfo = this._getViewportsInfo();
|
|
1181
|
+
triggerAnnotationRenderForViewportIds(viewportsInfo.map(({ viewportId }) => viewportId));
|
|
1182
|
+
if (!suppressEvents) {
|
|
1183
|
+
triggerEvent(eventTarget, Events.CROSSHAIR_TOOL_CENTER_CHANGED, {
|
|
1184
|
+
toolGroupId: this.toolGroupId,
|
|
1185
|
+
toolCenter: this.toolCenter,
|
|
1186
|
+
});
|
|
1187
|
+
}
|
|
1188
|
+
}
|
|
1174
1189
|
getHandleNearImagePoint(element, annotation, canvasCoords, proximity) {
|
|
1175
1190
|
const enabledElement = getEnabledElement(element);
|
|
1176
1191
|
const { viewport } = enabledElement;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cornerstonejs/tools",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.2",
|
|
4
4
|
"description": "Cornerstone3D Tools",
|
|
5
5
|
"types": "./dist/esm/index.d.ts",
|
|
6
6
|
"module": "./dist/esm/index.js",
|
|
@@ -103,7 +103,7 @@
|
|
|
103
103
|
"canvas": "^2.11.2"
|
|
104
104
|
},
|
|
105
105
|
"peerDependencies": {
|
|
106
|
-
"@cornerstonejs/core": "^3.1.
|
|
106
|
+
"@cornerstonejs/core": "^3.1.2",
|
|
107
107
|
"@kitware/vtk.js": "32.9.0",
|
|
108
108
|
"@types/d3-array": "^3.0.4",
|
|
109
109
|
"@types/d3-interpolate": "^3.0.1",
|
|
@@ -122,5 +122,5 @@
|
|
|
122
122
|
"type": "individual",
|
|
123
123
|
"url": "https://ohif.org/donate"
|
|
124
124
|
},
|
|
125
|
-
"gitHead": "
|
|
125
|
+
"gitHead": "eb97520fe08be3b204a9b8a6d77463e5207f3422"
|
|
126
126
|
}
|