@cornerstonejs/tools 3.10.12 → 3.10.14

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.
@@ -8,12 +8,14 @@ declare class ZoomTool extends BaseTool {
8
8
  initialMousePosWorld: Types.Point3;
9
9
  dirVec: Types.Point3;
10
10
  constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
11
+ mouseWheelCallback(evt: EventTypes.MouseWheelEventType): void;
11
12
  preMouseDownCallback: (evt: EventTypes.InteractionEventType) => boolean;
12
13
  preTouchStartCallback: (evt: EventTypes.InteractionEventType) => boolean;
13
14
  _pinchCallback(evt: EventTypes.InteractionEventType): void;
14
15
  _dragCallback(evt: EventTypes.InteractionEventType): void;
15
16
  _dragParallelProjection: (evt: EventTypes.InteractionEventType, viewport: Types.IStackViewport | Types.IVolumeViewport, camera: Types.ICamera, pinch?: boolean) => void;
16
17
  _dragPerspectiveProjection: (evt: EventTypes.InteractionEventType, viewport: Types.IStackViewport | Types.IVolumeViewport, camera: Types.ICamera, pinch?: boolean) => void;
18
+ _zoom(evt: EventTypes.MouseWheelEventType): void;
17
19
  _panCallback(evt: EventTypes.InteractionEventType): void;
18
20
  }
19
21
  export default ZoomTool;
@@ -1,7 +1,8 @@
1
1
  import { vec3 } from 'gl-matrix';
2
2
  import vtkMath from '@kitware/vtk.js/Common/Core/Math';
3
- import { getEnabledElement } from '@cornerstonejs/core';
3
+ import { Enums, getEnabledElement } from '@cornerstonejs/core';
4
4
  import { BaseTool } from './base';
5
+ import { Events } from '../enums';
5
6
  class ZoomTool extends BaseTool {
6
7
  constructor(toolProps = {}, defaultToolProps = {
7
8
  supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -114,6 +115,9 @@ class ZoomTool extends BaseTool {
114
115
  }
115
116
  this.mouseDragCallback = this._dragCallback.bind(this);
116
117
  }
118
+ mouseWheelCallback(evt) {
119
+ this._zoom(evt);
120
+ }
117
121
  _pinchCallback(evt) {
118
122
  const pointsList = evt.detail
119
123
  .currentPointsList;
@@ -153,6 +157,36 @@ class ZoomTool extends BaseTool {
153
157
  }
154
158
  viewport.render();
155
159
  }
160
+ _zoom(evt) {
161
+ const { element, points } = evt.detail;
162
+ const enabledElement = getEnabledElement(element);
163
+ const { viewport } = enabledElement;
164
+ const camera = viewport.getCamera();
165
+ const wheelData = evt.detail.wheel;
166
+ const direction = wheelData.direction;
167
+ const eventDetails = {
168
+ detail: {
169
+ element,
170
+ eventName: Events.MOUSE_WHEEL,
171
+ renderingEngineId: enabledElement.renderingEngineId,
172
+ viewportId: viewport.id,
173
+ camera: {},
174
+ deltaPoints: {
175
+ page: points.page,
176
+ client: points.client,
177
+ world: points.world,
178
+ canvas: [0, -direction * 5],
179
+ },
180
+ startPoints: points,
181
+ lastPoints: points,
182
+ currentPoints: points,
183
+ },
184
+ };
185
+ if (viewport.type === Enums.ViewportType.STACK) {
186
+ this.preMouseDownCallback(eventDetails);
187
+ }
188
+ this._dragCallback(eventDetails);
189
+ }
156
190
  _panCallback(evt) {
157
191
  const { element, deltaPoints } = evt.detail;
158
192
  const enabledElement = getEnabledElement(element);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cornerstonejs/tools",
3
- "version": "3.10.12",
3
+ "version": "3.10.14",
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": "^3.1.0"
104
104
  },
105
105
  "peerDependencies": {
106
- "@cornerstonejs/core": "^3.10.12",
106
+ "@cornerstonejs/core": "^3.10.14",
107
107
  "@kitware/vtk.js": "32.12.1",
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": "cc91d41846e22cfba08e23dad44fa80e91540a16"
125
+ "gitHead": "4d2b50a32ea906f586529504cfa670e2f618621c"
126
126
  }