@cornerstonejs/tools 1.77.8 → 1.77.9
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/TrackballRotateTool.d.ts +1 -0
- package/dist/cjs/tools/TrackballRotateTool.js +13 -8
- package/dist/cjs/tools/TrackballRotateTool.js.map +1 -1
- package/dist/esm/tools/TrackballRotateTool.js +13 -8
- package/dist/esm/tools/TrackballRotateTool.js.map +1 -1
- package/dist/types/tools/TrackballRotateTool.d.ts +1 -0
- package/dist/types/tools/TrackballRotateTool.d.ts.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/tools/TrackballRotateTool.ts +15 -19
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cornerstonejs/tools",
|
|
3
|
-
"version": "1.77.
|
|
3
|
+
"version": "1.77.9",
|
|
4
4
|
"description": "Cornerstone3D Tools",
|
|
5
5
|
"main": "src/index.ts",
|
|
6
6
|
"types": "dist/types/index.d.ts",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"webpack:watch": "webpack --mode development --progress --watch --config ./.webpack/webpack.dev.js"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@cornerstonejs/core": "^1.77.
|
|
32
|
+
"@cornerstonejs/core": "^1.77.9",
|
|
33
33
|
"@icr/polyseg-wasm": "0.4.0",
|
|
34
34
|
"@types/offscreencanvas": "2019.7.3",
|
|
35
35
|
"comlink": "^4.4.1",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"type": "individual",
|
|
60
60
|
"url": "https://ohif.org/donate"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "5e851b48111469c3669a0240a44f6980ec2860e8"
|
|
63
63
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import vtkMath from '@kitware/vtk.js/Common/Core/Math';
|
|
2
2
|
import { Events } from '../enums';
|
|
3
|
-
|
|
4
3
|
import {
|
|
5
4
|
eventTarget,
|
|
6
5
|
getEnabledElement,
|
|
@@ -12,9 +11,6 @@ import { EventTypes, PublicToolProps, ToolProps } from '../types';
|
|
|
12
11
|
import { BaseTool } from './base';
|
|
13
12
|
import { getToolGroup } from '../store/ToolGroupManager';
|
|
14
13
|
|
|
15
|
-
/**
|
|
16
|
-
* Tool that rotates the camera in the plane defined by the viewPlaneNormal and the viewUp.
|
|
17
|
-
*/
|
|
18
14
|
class TrackballRotateTool extends BaseTool {
|
|
19
15
|
static toolName;
|
|
20
16
|
touchDragCallback: (evt: EventTypes.InteractionEventType) => void;
|
|
@@ -22,6 +18,7 @@ class TrackballRotateTool extends BaseTool {
|
|
|
22
18
|
cleanUp: () => void;
|
|
23
19
|
_resizeObservers = new Map();
|
|
24
20
|
_viewportAddedListener: (evt: any) => void;
|
|
21
|
+
_hasResolutionChanged = false;
|
|
25
22
|
|
|
26
23
|
constructor(
|
|
27
24
|
toolProps: PublicToolProps = {},
|
|
@@ -33,7 +30,6 @@ class TrackballRotateTool extends BaseTool {
|
|
|
33
30
|
}
|
|
34
31
|
) {
|
|
35
32
|
super(toolProps, defaultToolProps);
|
|
36
|
-
|
|
37
33
|
this.touchDragCallback = this._dragCallback.bind(this);
|
|
38
34
|
this.mouseDragCallback = this._dragCallback.bind(this);
|
|
39
35
|
}
|
|
@@ -43,31 +39,33 @@ class TrackballRotateTool extends BaseTool {
|
|
|
43
39
|
const { element } = eventDetail;
|
|
44
40
|
const enabledElement = getEnabledElement(element);
|
|
45
41
|
const { viewport } = enabledElement;
|
|
46
|
-
|
|
47
42
|
const actorEntry = viewport.getDefaultActor();
|
|
48
43
|
const actor = actorEntry.actor as Types.VolumeActor;
|
|
49
44
|
const mapper = actor.getMapper();
|
|
50
45
|
const originalSampleDistance = mapper.getSampleDistance();
|
|
51
46
|
|
|
52
|
-
|
|
47
|
+
if (!this._hasResolutionChanged) {
|
|
48
|
+
mapper.setSampleDistance(originalSampleDistance * 2);
|
|
49
|
+
this._hasResolutionChanged = true;
|
|
53
50
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
51
|
+
if (this.cleanUp !== null) {
|
|
52
|
+
// Clean up previous event listener
|
|
53
|
+
document.removeEventListener('mouseup', this.cleanUp);
|
|
54
|
+
}
|
|
58
55
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
56
|
+
this.cleanUp = () => {
|
|
57
|
+
mapper.setSampleDistance(originalSampleDistance);
|
|
58
|
+
viewport.render();
|
|
59
|
+
this._hasResolutionChanged = false;
|
|
60
|
+
};
|
|
63
61
|
|
|
64
|
-
|
|
62
|
+
document.addEventListener('mouseup', this.cleanUp, { once: true });
|
|
63
|
+
}
|
|
65
64
|
return true;
|
|
66
65
|
};
|
|
67
66
|
|
|
68
67
|
_getViewportsInfo = () => {
|
|
69
68
|
const viewports = getToolGroup(this.toolGroupId).viewportsInfo;
|
|
70
|
-
|
|
71
69
|
return viewports;
|
|
72
70
|
};
|
|
73
71
|
|
|
@@ -168,8 +166,6 @@ class TrackballRotateTool extends BaseTool {
|
|
|
168
166
|
});
|
|
169
167
|
};
|
|
170
168
|
|
|
171
|
-
// pseudocode inspired from
|
|
172
|
-
// https://github.com/kitware/vtk-js/blob/HEAD/Sources/Interaction/Manipulators/MouseCameraUnicamRotateManipulator/index.js
|
|
173
169
|
_dragCallback(evt: EventTypes.InteractionEventType): void {
|
|
174
170
|
const { element, currentPoints, lastPoints } = evt.detail;
|
|
175
171
|
const currentPointsCanvas = currentPoints.canvas;
|