@cornerstonejs/core 0.47.0 → 0.47.1
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/RenderingEngine/VolumeViewport.d.ts +0 -1
- package/dist/cjs/RenderingEngine/VolumeViewport.js +10 -21
- package/dist/cjs/RenderingEngine/VolumeViewport.js.map +1 -1
- package/dist/cjs/utilities/getClosestImageId.d.ts +1 -1
- package/dist/cjs/utilities/getClosestImageId.js +3 -2
- package/dist/cjs/utilities/getClosestImageId.js.map +1 -1
- package/dist/esm/RenderingEngine/VolumeViewport.d.ts +0 -1
- package/dist/esm/RenderingEngine/VolumeViewport.js +12 -23
- package/dist/esm/RenderingEngine/VolumeViewport.js.map +1 -1
- package/dist/esm/utilities/getClosestImageId.d.ts +1 -1
- package/dist/esm/utilities/getClosestImageId.js +3 -2
- package/dist/esm/utilities/getClosestImageId.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +2 -2
- package/src/RenderingEngine/VolumeViewport.ts +26 -45
- package/src/utilities/getClosestImageId.ts +3 -4
|
@@ -17,7 +17,6 @@ declare class VolumeViewport extends BaseVolumeViewport {
|
|
|
17
17
|
getSlabThickness(): number;
|
|
18
18
|
getCurrentImageIdIndex: () => number | undefined;
|
|
19
19
|
getCurrentImageId: () => string | undefined;
|
|
20
|
-
private _getImageIdIndex;
|
|
21
20
|
getRotation: () => number;
|
|
22
21
|
}
|
|
23
22
|
export default VolumeViewport;
|
|
@@ -25,12 +25,17 @@ class VolumeViewport extends BaseVolumeViewport_1.default {
|
|
|
25
25
|
super(props);
|
|
26
26
|
this._useAcquisitionPlaneForViewPlane = false;
|
|
27
27
|
this.getCurrentImageIdIndex = () => {
|
|
28
|
-
|
|
28
|
+
const { viewPlaneNormal, focalPoint } = this.getCamera();
|
|
29
|
+
const { origin, spacing } = this.getImageData();
|
|
30
|
+
const spacingInNormal = spacing[2];
|
|
31
|
+
const sub = gl_matrix_1.vec3.create();
|
|
32
|
+
gl_matrix_1.vec3.sub(sub, focalPoint, origin);
|
|
33
|
+
const distance = gl_matrix_1.vec3.dot(sub, viewPlaneNormal);
|
|
34
|
+
return Math.round(Math.abs(distance) / spacingInNormal);
|
|
29
35
|
};
|
|
30
36
|
this.getCurrentImageId = () => {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
return;
|
|
37
|
+
if (this.getActors().length > 1) {
|
|
38
|
+
console.warn(`Using the first/default actor of ${this.getActors().length} actors for getCurrentImageId.`);
|
|
34
39
|
}
|
|
35
40
|
const actorEntry = this.getDefaultActor();
|
|
36
41
|
if (!(0, utilities_1.actorIsA)(actorEntry, 'vtkVolume')) {
|
|
@@ -41,24 +46,8 @@ class VolumeViewport extends BaseVolumeViewport_1.default {
|
|
|
41
46
|
if (!volume) {
|
|
42
47
|
return;
|
|
43
48
|
}
|
|
44
|
-
const imageIds = volume.imageIds;
|
|
45
|
-
return imageIds[index];
|
|
46
|
-
};
|
|
47
|
-
this._getImageIdIndex = () => {
|
|
48
49
|
const { viewPlaneNormal, focalPoint } = this.getCamera();
|
|
49
|
-
|
|
50
|
-
const dir = direction.slice(direction.length - 3);
|
|
51
|
-
const dot = Math.abs(dir[0] * viewPlaneNormal[0] +
|
|
52
|
-
dir[1] * viewPlaneNormal[1] +
|
|
53
|
-
dir[2] * viewPlaneNormal[2]);
|
|
54
|
-
if (dot - 1 > constants_1.EPSILON) {
|
|
55
|
-
return;
|
|
56
|
-
}
|
|
57
|
-
const spacingInNormal = spacing[2];
|
|
58
|
-
const sub = gl_matrix_1.vec3.create();
|
|
59
|
-
gl_matrix_1.vec3.sub(sub, focalPoint, origin);
|
|
60
|
-
const distance = gl_matrix_1.vec3.dot(sub, viewPlaneNormal);
|
|
61
|
-
return Math.round(Math.abs(distance) / spacingInNormal);
|
|
50
|
+
return (0, utilities_1.getClosestImageId)(volume, focalPoint, viewPlaneNormal);
|
|
62
51
|
};
|
|
63
52
|
this.getRotation = () => 0;
|
|
64
53
|
const { orientation } = this.options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VolumeViewport.js","sourceRoot":"","sources":["../../../src/RenderingEngine/VolumeViewport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,mFAA8D;AAC9D,yCAAiC;AAEjC,qDAA6B;AAC7B,4CAA8E;AAC9E,oCAAuD;AASvD,
|
|
1
|
+
{"version":3,"file":"VolumeViewport.js","sourceRoot":"","sources":["../../../src/RenderingEngine/VolumeViewport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { IImageVolume, Point3 } from '../types';
|
|
2
|
-
export default function getClosestImageId(imageVolume: IImageVolume, worldPos: Point3, viewPlaneNormal: Point3
|
|
2
|
+
export default function getClosestImageId(imageVolume: IImageVolume, worldPos: Point3, viewPlaneNormal: Point3): string;
|
|
@@ -29,7 +29,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
29
|
const gl_matrix_1 = require("gl-matrix");
|
|
30
30
|
const metaData = __importStar(require("../metaData"));
|
|
31
31
|
const getSpacingInNormalDirection_1 = __importDefault(require("./getSpacingInNormalDirection"));
|
|
32
|
-
|
|
32
|
+
const constants_1 = require("../constants");
|
|
33
|
+
function getClosestImageId(imageVolume, worldPos, viewPlaneNormal) {
|
|
33
34
|
if (!imageVolume) {
|
|
34
35
|
return;
|
|
35
36
|
}
|
|
@@ -39,7 +40,7 @@ function getClosestImageId(imageVolume, worldPos, viewPlaneNormal, viewUp) {
|
|
|
39
40
|
}
|
|
40
41
|
const kVector = direction.slice(6, 9);
|
|
41
42
|
const dotProducts = gl_matrix_1.vec3.dot(kVector, viewPlaneNormal);
|
|
42
|
-
if (Math.abs(dotProducts) <
|
|
43
|
+
if (Math.abs(dotProducts) < 1 - constants_1.EPSILON) {
|
|
43
44
|
return;
|
|
44
45
|
}
|
|
45
46
|
const spacingInNormalDirection = (0, getSpacingInNormalDirection_1.default)(imageVolume, viewPlaneNormal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClosestImageId.js","sourceRoot":"","sources":["../../../src/utilities/getClosestImageId.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAiC;AACjC,sDAAwC;AAGxC,gGAAwE;
|
|
1
|
+
{"version":3,"file":"getClosestImageId.js","sourceRoot":"","sources":["../../../src/utilities/getClosestImageId.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAiC;AACjC,sDAAwC;AAGxC,gGAAwE;AACxE,4CAAuC;AAYvC,SAAwB,iBAAiB,CACvC,WAAyB,EACzB,QAAgB,EAChB,eAAuB;IAEvB,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO;KACR;IAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;IAE5C,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACjC,OAAO;KACR;IAGD,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAGtC,MAAM,WAAW,GAAG,gBAAI,CAAC,GAAG,CAAC,OAAiB,EAAQ,eAAe,CAAC,CAAC;IAIvE,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,mBAAO,EAAE;QACvC,OAAO;KACR;IAID,MAAM,wBAAwB,GAAG,IAAA,qCAA2B,EAC1D,WAAW,EACX,eAAe,CAChB,CAAC;IAEF,MAAM,4BAA4B,GAAG,wBAAwB,GAAG,CAAC,CAAC;IAIlE,IAAI,cAAc,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAG5B,MAAM,EAAE,oBAAoB,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAI3E,MAAM,GAAG,GAAG,gBAAI,CAAC,MAAM,EAAE,CAAC;QAC1B,gBAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC;QAI9C,MAAM,GAAG,GAAG,gBAAI,CAAC,GAAG,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAG3C,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,4BAA4B,EAAE;YAChD,cAAc,GAAG,OAAO,CAAC;SAC1B;KACF;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AA7DD,oCA6DC"}
|
|
@@ -17,7 +17,6 @@ declare class VolumeViewport extends BaseVolumeViewport {
|
|
|
17
17
|
getSlabThickness(): number;
|
|
18
18
|
getCurrentImageIdIndex: () => number | undefined;
|
|
19
19
|
getCurrentImageId: () => string | undefined;
|
|
20
|
-
private _getImageIdIndex;
|
|
21
20
|
getRotation: () => number;
|
|
22
21
|
}
|
|
23
22
|
export default VolumeViewport;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import vtkPlane from '@kitware/vtk.js/Common/DataModel/Plane';
|
|
2
2
|
import { vec3 } from 'gl-matrix';
|
|
3
3
|
import cache from '../cache';
|
|
4
|
-
import {
|
|
4
|
+
import { MPR_CAMERA_VALUES, RENDERING_DEFAULTS } from '../constants';
|
|
5
5
|
import { OrientationAxis } from '../enums';
|
|
6
|
-
import { actorIsA } from '../utilities';
|
|
6
|
+
import { actorIsA, getClosestImageId } from '../utilities';
|
|
7
7
|
import transformWorldToIndex from '../utilities/transformWorldToIndex';
|
|
8
8
|
import BaseVolumeViewport from './BaseVolumeViewport';
|
|
9
9
|
class VolumeViewport extends BaseVolumeViewport {
|
|
@@ -11,12 +11,17 @@ class VolumeViewport extends BaseVolumeViewport {
|
|
|
11
11
|
super(props);
|
|
12
12
|
this._useAcquisitionPlaneForViewPlane = false;
|
|
13
13
|
this.getCurrentImageIdIndex = () => {
|
|
14
|
-
|
|
14
|
+
const { viewPlaneNormal, focalPoint } = this.getCamera();
|
|
15
|
+
const { origin, spacing } = this.getImageData();
|
|
16
|
+
const spacingInNormal = spacing[2];
|
|
17
|
+
const sub = vec3.create();
|
|
18
|
+
vec3.sub(sub, focalPoint, origin);
|
|
19
|
+
const distance = vec3.dot(sub, viewPlaneNormal);
|
|
20
|
+
return Math.round(Math.abs(distance) / spacingInNormal);
|
|
15
21
|
};
|
|
16
22
|
this.getCurrentImageId = () => {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
return;
|
|
23
|
+
if (this.getActors().length > 1) {
|
|
24
|
+
console.warn(`Using the first/default actor of ${this.getActors().length} actors for getCurrentImageId.`);
|
|
20
25
|
}
|
|
21
26
|
const actorEntry = this.getDefaultActor();
|
|
22
27
|
if (!actorIsA(actorEntry, 'vtkVolume')) {
|
|
@@ -27,24 +32,8 @@ class VolumeViewport extends BaseVolumeViewport {
|
|
|
27
32
|
if (!volume) {
|
|
28
33
|
return;
|
|
29
34
|
}
|
|
30
|
-
const imageIds = volume.imageIds;
|
|
31
|
-
return imageIds[index];
|
|
32
|
-
};
|
|
33
|
-
this._getImageIdIndex = () => {
|
|
34
35
|
const { viewPlaneNormal, focalPoint } = this.getCamera();
|
|
35
|
-
|
|
36
|
-
const dir = direction.slice(direction.length - 3);
|
|
37
|
-
const dot = Math.abs(dir[0] * viewPlaneNormal[0] +
|
|
38
|
-
dir[1] * viewPlaneNormal[1] +
|
|
39
|
-
dir[2] * viewPlaneNormal[2]);
|
|
40
|
-
if (dot - 1 > EPSILON) {
|
|
41
|
-
return;
|
|
42
|
-
}
|
|
43
|
-
const spacingInNormal = spacing[2];
|
|
44
|
-
const sub = vec3.create();
|
|
45
|
-
vec3.sub(sub, focalPoint, origin);
|
|
46
|
-
const distance = vec3.dot(sub, viewPlaneNormal);
|
|
47
|
-
return Math.round(Math.abs(distance) / spacingInNormal);
|
|
36
|
+
return getClosestImageId(volume, focalPoint, viewPlaneNormal);
|
|
48
37
|
};
|
|
49
38
|
this.getRotation = () => 0;
|
|
50
39
|
const { orientation } = this.options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VolumeViewport.js","sourceRoot":"","sources":["../../../src/RenderingEngine/VolumeViewport.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,wCAAwC,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"VolumeViewport.js","sourceRoot":"","sources":["../../../src/RenderingEngine/VolumeViewport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { IImageVolume, Point3 } from '../types';
|
|
2
|
-
export default function getClosestImageId(imageVolume: IImageVolume, worldPos: Point3, viewPlaneNormal: Point3
|
|
2
|
+
export default function getClosestImageId(imageVolume: IImageVolume, worldPos: Point3, viewPlaneNormal: Point3): string;
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { vec3 } from 'gl-matrix';
|
|
2
2
|
import * as metaData from '../metaData';
|
|
3
3
|
import getSpacingInNormalDirection from './getSpacingInNormalDirection';
|
|
4
|
-
|
|
4
|
+
import { EPSILON } from '../constants';
|
|
5
|
+
export default function getClosestImageId(imageVolume, worldPos, viewPlaneNormal) {
|
|
5
6
|
if (!imageVolume) {
|
|
6
7
|
return;
|
|
7
8
|
}
|
|
@@ -11,7 +12,7 @@ export default function getClosestImageId(imageVolume, worldPos, viewPlaneNormal
|
|
|
11
12
|
}
|
|
12
13
|
const kVector = direction.slice(6, 9);
|
|
13
14
|
const dotProducts = vec3.dot(kVector, viewPlaneNormal);
|
|
14
|
-
if (Math.abs(dotProducts) <
|
|
15
|
+
if (Math.abs(dotProducts) < 1 - EPSILON) {
|
|
15
16
|
return;
|
|
16
17
|
}
|
|
17
18
|
const spacingInNormalDirection = getSpacingInNormalDirection(imageVolume, viewPlaneNormal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClosestImageId.js","sourceRoot":"","sources":["../../../src/utilities/getClosestImageId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAC;AAGxC,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"getClosestImageId.js","sourceRoot":"","sources":["../../../src/utilities/getClosestImageId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAC;AAGxC,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAYvC,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,WAAyB,EACzB,QAAgB,EAChB,eAAuB;IAEvB,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO;KACR;IAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;IAE5C,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACjC,OAAO;KACR;IAGD,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAGtC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,OAAiB,EAAQ,eAAe,CAAC,CAAC;IAIvE,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE;QACvC,OAAO;KACR;IAID,MAAM,wBAAwB,GAAG,2BAA2B,CAC1D,WAAW,EACX,eAAe,CAChB,CAAC;IAEF,MAAM,4BAA4B,GAAG,wBAAwB,GAAG,CAAC,CAAC;IAIlE,IAAI,cAAc,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAG5B,MAAM,EAAE,oBAAoB,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAI3E,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC;QAI9C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAG3C,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,4BAA4B,EAAE;YAChD,cAAc,GAAG,OAAO,CAAC;SAC1B;KACF;IAED,OAAO,cAAc,CAAC;AACxB,CAAC"}
|