@cornerstonejs/tools 0.63.2 → 0.64.0
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/ZoomTool.js +6 -3
- package/dist/cjs/tools/ZoomTool.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationDisplayTool.js +2 -2
- package/dist/cjs/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/cjs/utilities/calibrateImageSpacing.js +2 -2
- package/dist/esm/tools/ZoomTool.js +6 -3
- package/dist/esm/tools/ZoomTool.js.map +1 -1
- package/dist/esm/tools/base/AnnotationDisplayTool.js +2 -2
- package/dist/esm/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/esm/utilities/calibrateImageSpacing.js +2 -2
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +3 -3
- package/src/tools/ZoomTool.ts +6 -4
- package/src/tools/base/AnnotationDisplayTool.ts +2 -2
- package/src/utilities/calibrateImageSpacing.ts +2 -2
|
@@ -16,6 +16,7 @@ class ZoomTool extends base_1.BaseTool {
|
|
|
16
16
|
maxZoomScale: 30,
|
|
17
17
|
pinchToZoom: true,
|
|
18
18
|
pan: true,
|
|
19
|
+
invert: false,
|
|
19
20
|
},
|
|
20
21
|
}) {
|
|
21
22
|
super(toolProps, defaultToolProps);
|
|
@@ -45,14 +46,14 @@ class ZoomTool extends base_1.BaseTool {
|
|
|
45
46
|
const size = [element.clientWidth, element.clientHeight];
|
|
46
47
|
const { parallelScale, focalPoint, position } = camera;
|
|
47
48
|
const zoomScale = 1.5 / size[1];
|
|
48
|
-
const k = deltaY * zoomScale;
|
|
49
|
+
const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
|
|
49
50
|
let parallelScaleToSet = (1.0 - k) * parallelScale;
|
|
50
51
|
let focalPointToSet = focalPoint;
|
|
51
52
|
let positionToSet = position;
|
|
52
53
|
if (!this.configuration.zoomToCenter) {
|
|
53
54
|
const distanceToCanvasCenter = gl_matrix_1.vec3.distance(focalPoint, this.initialMousePosWorld);
|
|
54
55
|
const zoomScale = 5 / size[1];
|
|
55
|
-
const k = deltaY * zoomScale;
|
|
56
|
+
const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
|
|
56
57
|
parallelScaleToSet = (1.0 - k) * parallelScale;
|
|
57
58
|
positionToSet = gl_matrix_1.vec3.scaleAndAdd(gl_matrix_1.vec3.create(), position, this.dirVec, -distanceToCanvasCenter * k);
|
|
58
59
|
focalPointToSet = gl_matrix_1.vec3.scaleAndAdd(gl_matrix_1.vec3.create(), focalPoint, this.dirVec, -distanceToCanvasCenter * k);
|
|
@@ -97,7 +98,9 @@ class ZoomTool extends base_1.BaseTool {
|
|
|
97
98
|
-viewPlaneNormal[1],
|
|
98
99
|
-viewPlaneNormal[2],
|
|
99
100
|
];
|
|
100
|
-
const k =
|
|
101
|
+
const k = this.configuration.invert
|
|
102
|
+
? deltaY / zoomScale
|
|
103
|
+
: deltaY * zoomScale;
|
|
101
104
|
let tmp = k * directionOfProjection[0];
|
|
102
105
|
position[0] += tmp;
|
|
103
106
|
focalPoint[0] += tmp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZoomTool.js","sourceRoot":"","sources":["../../../src/tools/ZoomTool.ts"],"names":[],"mappings":";;;;;AAAA,yCAAiC;AACjC,4EAAuD;AACvD,8CAA+D;AAC/D,iCAAkC;AAQlC,MAAM,QAAS,SAAQ,eAAQ;
|
|
1
|
+
{"version":3,"file":"ZoomTool.js","sourceRoot":"","sources":["../../../src/tools/ZoomTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ class AnnotationDisplayTool extends BaseTool_1.default {
|
|
|
15
15
|
constructor() {
|
|
16
16
|
super(...arguments);
|
|
17
17
|
this.onImageSpacingCalibrated = (evt) => {
|
|
18
|
-
const { element, rowScale, columnScale, imageId, imageData: calibratedImageData, worldToIndex:
|
|
18
|
+
const { element, rowScale, columnScale, imageId, imageData: calibratedImageData, worldToIndex: nonCalibratedWorldToIndex, } = evt.detail;
|
|
19
19
|
const { viewport } = (0, core_1.getEnabledElement)(element);
|
|
20
20
|
if (viewport instanceof core_1.VolumeViewport) {
|
|
21
21
|
throw new Error('Cannot calibrate a volume viewport');
|
|
@@ -39,7 +39,7 @@ class AnnotationDisplayTool extends BaseTool_1.default {
|
|
|
39
39
|
const p = gl_matrix_1.vec4.fromValues(...point, 1);
|
|
40
40
|
const pCalibrated = gl_matrix_1.vec4.fromValues(0, 0, 0, 1);
|
|
41
41
|
const nonCalibratedIndexVec4 = gl_matrix_1.vec4.create();
|
|
42
|
-
gl_matrix_1.vec4.transformMat4(nonCalibratedIndexVec4, p,
|
|
42
|
+
gl_matrix_1.vec4.transformMat4(nonCalibratedIndexVec4, p, nonCalibratedWorldToIndex);
|
|
43
43
|
const calibratedIndex = [
|
|
44
44
|
columnScale * nonCalibratedIndexVec4[0],
|
|
45
45
|
rowScale * nonCalibratedIndexVec4[1],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAM6B;AAG7B,yCAAiC;AAEjC,0DAAkC;AAClC,sFAAwF;AAExF,sGAA8E;AAC9E,qHAA6F;AAC7F,6EAAmF;AACnF,oEAAmE;AAanE,MAAe,qBAAsB,SAAQ,kBAAQ;IAArD;;QAoDS,6BAAwB,GAAG,CAChC,GAAiD,EACjD,EAAE;YACF,MAAM,EACJ,OAAO,EACP,QAAQ,EACR,WAAW,EACX,OAAO,EACP,SAAS,EAAE,mBAAmB,EAC9B,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,10 @@ function calibrateImageSpacing(imageId, renderingEngine, rowPixelSpacing, column
|
|
|
6
6
|
if (!columnPixelSpacing) {
|
|
7
7
|
columnPixelSpacing = rowPixelSpacing;
|
|
8
8
|
}
|
|
9
|
-
calibratedPixelSpacingMetadataProvider.add(imageId,
|
|
9
|
+
calibratedPixelSpacingMetadataProvider.add(imageId, {
|
|
10
10
|
rowPixelSpacing,
|
|
11
11
|
columnPixelSpacing,
|
|
12
|
-
|
|
12
|
+
});
|
|
13
13
|
const viewports = renderingEngine.getStackViewports();
|
|
14
14
|
viewports.forEach((viewport) => {
|
|
15
15
|
const imageIds = viewport.getImageIds();
|
|
@@ -11,6 +11,7 @@ class ZoomTool extends BaseTool {
|
|
|
11
11
|
maxZoomScale: 30,
|
|
12
12
|
pinchToZoom: true,
|
|
13
13
|
pan: true,
|
|
14
|
+
invert: false,
|
|
14
15
|
},
|
|
15
16
|
}) {
|
|
16
17
|
super(toolProps, defaultToolProps);
|
|
@@ -40,14 +41,14 @@ class ZoomTool extends BaseTool {
|
|
|
40
41
|
const size = [element.clientWidth, element.clientHeight];
|
|
41
42
|
const { parallelScale, focalPoint, position } = camera;
|
|
42
43
|
const zoomScale = 1.5 / size[1];
|
|
43
|
-
const k = deltaY * zoomScale;
|
|
44
|
+
const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
|
|
44
45
|
let parallelScaleToSet = (1.0 - k) * parallelScale;
|
|
45
46
|
let focalPointToSet = focalPoint;
|
|
46
47
|
let positionToSet = position;
|
|
47
48
|
if (!this.configuration.zoomToCenter) {
|
|
48
49
|
const distanceToCanvasCenter = vec3.distance(focalPoint, this.initialMousePosWorld);
|
|
49
50
|
const zoomScale = 5 / size[1];
|
|
50
|
-
const k = deltaY * zoomScale;
|
|
51
|
+
const k = deltaY * zoomScale * (this.configuration.invert ? -1 : 1);
|
|
51
52
|
parallelScaleToSet = (1.0 - k) * parallelScale;
|
|
52
53
|
positionToSet = vec3.scaleAndAdd(vec3.create(), position, this.dirVec, -distanceToCanvasCenter * k);
|
|
53
54
|
focalPointToSet = vec3.scaleAndAdd(vec3.create(), focalPoint, this.dirVec, -distanceToCanvasCenter * k);
|
|
@@ -92,7 +93,9 @@ class ZoomTool extends BaseTool {
|
|
|
92
93
|
-viewPlaneNormal[1],
|
|
93
94
|
-viewPlaneNormal[2],
|
|
94
95
|
];
|
|
95
|
-
const k =
|
|
96
|
+
const k = this.configuration.invert
|
|
97
|
+
? deltaY / zoomScale
|
|
98
|
+
: deltaY * zoomScale;
|
|
96
99
|
let tmp = k * directionOfProjection[0];
|
|
97
100
|
position[0] += tmp;
|
|
98
101
|
focalPoint[0] += tmp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZoomTool.js","sourceRoot":"","sources":["../../../src/tools/ZoomTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,OAAO,MAAM,kCAAkC,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAS,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAQlC,MAAM,QAAS,SAAQ,QAAQ;
|
|
1
|
+
{"version":3,"file":"ZoomTool.js","sourceRoot":"","sources":["../../../src/tools/ZoomTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ class AnnotationDisplayTool extends BaseTool {
|
|
|
10
10
|
constructor() {
|
|
11
11
|
super(...arguments);
|
|
12
12
|
this.onImageSpacingCalibrated = (evt) => {
|
|
13
|
-
const { element, rowScale, columnScale, imageId, imageData: calibratedImageData, worldToIndex:
|
|
13
|
+
const { element, rowScale, columnScale, imageId, imageData: calibratedImageData, worldToIndex: nonCalibratedWorldToIndex, } = evt.detail;
|
|
14
14
|
const { viewport } = getEnabledElement(element);
|
|
15
15
|
if (viewport instanceof VolumeViewport) {
|
|
16
16
|
throw new Error('Cannot calibrate a volume viewport');
|
|
@@ -34,7 +34,7 @@ class AnnotationDisplayTool extends BaseTool {
|
|
|
34
34
|
const p = vec4.fromValues(...point, 1);
|
|
35
35
|
const pCalibrated = vec4.fromValues(0, 0, 0, 1);
|
|
36
36
|
const nonCalibratedIndexVec4 = vec4.create();
|
|
37
|
-
vec4.transformMat4(nonCalibratedIndexVec4, p,
|
|
37
|
+
vec4.transformMat4(nonCalibratedIndexVec4, p, nonCalibratedWorldToIndex);
|
|
38
38
|
const calibratedIndex = [
|
|
39
39
|
columnScale * nonCalibratedIndexVec4[0],
|
|
40
40
|
rowScale * nonCalibratedIndexVec4[1],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,KAAK,GACN,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AAExF,OAAO,uBAAuB,MAAM,yCAAyC,CAAC;AAC9E,OAAO,2BAA2B,MAAM,oDAAoD,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,yCAAyC,CAAC;AAanE,MAAe,qBAAsB,SAAQ,QAAQ;IAArD;;QAoDS,6BAAwB,GAAG,CAChC,GAAiD,EACjD,EAAE;YACF,MAAM,EACJ,OAAO,EACP,QAAQ,EACR,WAAW,EACX,OAAO,EACP,SAAS,EAAE,mBAAmB,EAC9B,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,10 @@ export default function calibrateImageSpacing(imageId, renderingEngine, rowPixel
|
|
|
4
4
|
if (!columnPixelSpacing) {
|
|
5
5
|
columnPixelSpacing = rowPixelSpacing;
|
|
6
6
|
}
|
|
7
|
-
calibratedPixelSpacingMetadataProvider.add(imageId,
|
|
7
|
+
calibratedPixelSpacingMetadataProvider.add(imageId, {
|
|
8
8
|
rowPixelSpacing,
|
|
9
9
|
columnPixelSpacing,
|
|
10
|
-
|
|
10
|
+
});
|
|
11
11
|
const viewports = renderingEngine.getStackViewports();
|
|
12
12
|
viewports.forEach((viewport) => {
|
|
13
13
|
const imageIds = viewport.getImageIds();
|