@cornerstonejs/core 0.40.0 → 0.41.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/RenderingEngine/BaseVolumeViewport.js +18 -19
- package/dist/cjs/RenderingEngine/BaseVolumeViewport.js.map +1 -1
- package/dist/cjs/RenderingEngine/vtkClasses/vtkStreamingOpenGLVolumeMapper.js.map +1 -1
- package/dist/cjs/cache/cache.js +1 -1
- package/dist/cjs/cache/cache.js.map +1 -1
- package/dist/cjs/cache/classes/ContourSet.d.ts +5 -0
- package/dist/cjs/cache/classes/ContourSet.js +32 -0
- package/dist/cjs/cache/classes/ContourSet.js.map +1 -1
- package/dist/cjs/cache/classes/ImageVolume.d.ts +2 -1
- package/dist/cjs/cache/classes/ImageVolume.js +4 -0
- package/dist/cjs/cache/classes/ImageVolume.js.map +1 -1
- package/dist/cjs/types/IContourSet.d.ts +1 -0
- package/dist/esm/RenderingEngine/BaseVolumeViewport.js +18 -19
- package/dist/esm/RenderingEngine/BaseVolumeViewport.js.map +1 -1
- package/dist/esm/RenderingEngine/vtkClasses/vtkStreamingOpenGLVolumeMapper.js.map +1 -1
- package/dist/esm/cache/cache.js +1 -1
- package/dist/esm/cache/cache.js.map +1 -1
- package/dist/esm/cache/classes/ContourSet.d.ts +5 -0
- package/dist/esm/cache/classes/ContourSet.js +32 -0
- package/dist/esm/cache/classes/ContourSet.js.map +1 -1
- package/dist/esm/cache/classes/ImageVolume.d.ts +2 -1
- package/dist/esm/cache/classes/ImageVolume.js +4 -0
- package/dist/esm/cache/classes/ImageVolume.js.map +1 -1
- package/dist/esm/types/IContourSet.d.ts +1 -0
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +2 -2
- package/src/RenderingEngine/BaseVolumeViewport.ts +23 -22
- package/src/RenderingEngine/vtkClasses/vtkStreamingOpenGLVolumeMapper.js +12 -0
- package/src/cache/cache.ts +1 -1
- package/src/cache/classes/ContourSet.ts +55 -1
- package/src/cache/classes/ImageVolume.ts +7 -1
- package/src/types/IContourSet.ts +2 -0
|
@@ -13,10 +13,14 @@ export declare class ContourSet implements IContourSet {
|
|
|
13
13
|
readonly frameOfReferenceUID: string;
|
|
14
14
|
private color;
|
|
15
15
|
private segmentIndex;
|
|
16
|
+
private polyData;
|
|
17
|
+
private centroid;
|
|
16
18
|
contours: IContour[];
|
|
17
19
|
constructor(props: ContourSetProps);
|
|
18
20
|
_createEachContour(contourDataArray: ContourData[]): void;
|
|
21
|
+
_updateContourSetCentroid(): void;
|
|
19
22
|
_getSizeInBytes(): number;
|
|
23
|
+
getCentroid(): Point3;
|
|
20
24
|
getSegmentIndex(): number;
|
|
21
25
|
getColor(): Point3;
|
|
22
26
|
getContours(): IContour[];
|
|
@@ -27,5 +31,6 @@ export declare class ContourSet implements IContourSet {
|
|
|
27
31
|
getNumberOfPointsArray(): number[];
|
|
28
32
|
getPointsInContour(contourIndex: number): Point3[];
|
|
29
33
|
getNumberOfPointsInAContour(contourIndex: number): number;
|
|
34
|
+
private _getDistance;
|
|
30
35
|
}
|
|
31
36
|
export default Contour;
|
|
@@ -26,12 +26,39 @@ export class ContourSet {
|
|
|
26
26
|
});
|
|
27
27
|
this.contours.push(contour);
|
|
28
28
|
});
|
|
29
|
+
this._updateContourSetCentroid();
|
|
30
|
+
}
|
|
31
|
+
_updateContourSetCentroid() {
|
|
32
|
+
const numberOfPoints = this.getTotalNumberOfPoints();
|
|
33
|
+
const flatPointsArray = this.getFlatPointsArray();
|
|
34
|
+
const sumOfPoints = flatPointsArray.reduce((acc, point) => {
|
|
35
|
+
return [acc[0] + point[0], acc[1] + point[1], acc[2] + point[2]];
|
|
36
|
+
}, [0, 0, 0]);
|
|
37
|
+
const centroid = [
|
|
38
|
+
sumOfPoints[0] / numberOfPoints,
|
|
39
|
+
sumOfPoints[1] / numberOfPoints,
|
|
40
|
+
sumOfPoints[2] / numberOfPoints,
|
|
41
|
+
];
|
|
42
|
+
const closestPoint = flatPointsArray.reduce((closestPoint, point) => {
|
|
43
|
+
const distanceToPoint = this._getDistance(centroid, point);
|
|
44
|
+
const distanceToClosestPoint = this._getDistance(centroid, closestPoint);
|
|
45
|
+
if (distanceToPoint < distanceToClosestPoint) {
|
|
46
|
+
return point;
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
return closestPoint;
|
|
50
|
+
}
|
|
51
|
+
}, flatPointsArray[0]);
|
|
52
|
+
this.centroid = closestPoint;
|
|
29
53
|
}
|
|
30
54
|
_getSizeInBytes() {
|
|
31
55
|
return this.contours.reduce((sizeInBytes, contour) => {
|
|
32
56
|
return sizeInBytes + contour.sizeInBytes;
|
|
33
57
|
}, 0);
|
|
34
58
|
}
|
|
59
|
+
getCentroid() {
|
|
60
|
+
return this.centroid;
|
|
61
|
+
}
|
|
35
62
|
getSegmentIndex() {
|
|
36
63
|
return this.segmentIndex;
|
|
37
64
|
}
|
|
@@ -67,6 +94,11 @@ export class ContourSet {
|
|
|
67
94
|
getNumberOfPointsInAContour(contourIndex) {
|
|
68
95
|
return this.getPointsInContour(contourIndex).length;
|
|
69
96
|
}
|
|
97
|
+
_getDistance(pointA, pointB) {
|
|
98
|
+
return Math.sqrt((pointA[0] - pointB[0]) ** 2 +
|
|
99
|
+
(pointA[1] - pointB[1]) ** 2 +
|
|
100
|
+
(pointA[2] - pointB[2]) ** 2);
|
|
101
|
+
}
|
|
70
102
|
}
|
|
71
103
|
export default Contour;
|
|
72
104
|
//# sourceMappingURL=ContourSet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContourSet.js","sourceRoot":"","sources":["../../../../src/cache/classes/ContourSet.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ContourSet.js","sourceRoot":"","sources":["../../../../src/cache/classes/ContourSet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { vtkImageData } from '@kitware/vtk.js/Common/DataModel/ImageData';
|
|
1
2
|
import { IVolume, VolumeScalarData, Metadata, Point3, IImageVolume, Mat3 } from '../../types';
|
|
2
3
|
export declare class ImageVolume implements IImageVolume {
|
|
3
4
|
private _imageIds;
|
|
@@ -21,7 +22,7 @@ export declare class ImageVolume implements IImageVolume {
|
|
|
21
22
|
sizeInBytes?: number;
|
|
22
23
|
spacing: Point3;
|
|
23
24
|
numVoxels: number;
|
|
24
|
-
imageData?:
|
|
25
|
+
imageData?: vtkImageData;
|
|
25
26
|
vtkOpenGLTexture: any;
|
|
26
27
|
loadStatus?: Record<string, any>;
|
|
27
28
|
referencedVolumeId?: string;
|
|
@@ -57,7 +57,11 @@ export class ImageVolume {
|
|
|
57
57
|
return this._imageURIsIndexMap.get(imageURI);
|
|
58
58
|
}
|
|
59
59
|
destroy() {
|
|
60
|
+
this.vtkOpenGLTexture.releaseGraphicsResources();
|
|
61
|
+
this.vtkOpenGLTexture.destroyTexture();
|
|
60
62
|
this.vtkOpenGLTexture.delete();
|
|
63
|
+
this.imageData.delete();
|
|
64
|
+
this.imageData = null;
|
|
61
65
|
this.scalarData = null;
|
|
62
66
|
}
|
|
63
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImageVolume.js","sourceRoot":"","sources":["../../../../src/cache/classes/ImageVolume.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"ImageVolume.js","sourceRoot":"","sources":["../../../../src/cache/classes/ImageVolume.ts"],"names":[],"mappings":"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"}
|