@cornerstonejs/core 2.0.0-beta.10 → 2.0.0-beta.12
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/esm/RenderingEngine/BaseVolumeViewport.js +5 -15
- package/dist/esm/RenderingEngine/BaseVolumeViewport.js.map +1 -1
- package/dist/esm/RenderingEngine/RenderingEngine.js +9 -3
- package/dist/esm/RenderingEngine/RenderingEngine.js.map +1 -1
- package/dist/esm/RenderingEngine/StackViewport.js +4 -27
- package/dist/esm/RenderingEngine/StackViewport.js.map +1 -1
- package/dist/esm/RenderingEngine/Viewport.js +14 -4
- package/dist/esm/RenderingEngine/Viewport.js.map +1 -1
- package/dist/esm/RenderingEngine/VolumeViewport.js +10 -4
- package/dist/esm/RenderingEngine/VolumeViewport.js.map +1 -1
- package/dist/esm/RenderingEngine/VolumeViewport3D.js +1 -1
- package/dist/esm/RenderingEngine/VolumeViewport3D.js.map +1 -1
- package/dist/esm/enums/Events.js +1 -1
- package/dist/esm/enums/Events.js.map +1 -1
- package/dist/esm/loaders/volumeLoader.js +2 -2
- package/dist/esm/loaders/volumeLoader.js.map +1 -1
- package/dist/esm/requestPool/imageLoadPoolManager.js.map +1 -1
- package/dist/esm/requestPool/requestPoolManager.js.map +1 -1
- package/dist/esm/utilities/convertStackToVolumeViewport.js +2 -2
- package/dist/esm/utilities/convertStackToVolumeViewport.js.map +1 -1
- package/dist/esm/utilities/getImageSliceDataForVolumeViewport.js +2 -1
- package/dist/esm/utilities/getImageSliceDataForVolumeViewport.js.map +1 -1
- package/dist/esm/utilities/getTargetVolumeAndSpacingInNormalDir.js +1 -1
- package/dist/esm/utilities/getTargetVolumeAndSpacingInNormalDir.js.map +1 -1
- package/dist/esm/utilities/loadImageToCanvas.js +0 -3
- package/dist/esm/utilities/loadImageToCanvas.js.map +1 -1
- package/dist/types/RenderingEngine/BaseVolumeViewport.d.ts +1 -1
- package/dist/types/RenderingEngine/BaseVolumeViewport.d.ts.map +1 -1
- package/dist/types/RenderingEngine/StackViewport.d.ts +2 -5
- package/dist/types/RenderingEngine/StackViewport.d.ts.map +1 -1
- package/dist/types/RenderingEngine/Viewport.d.ts +2 -1
- package/dist/types/RenderingEngine/Viewport.d.ts.map +1 -1
- package/dist/types/RenderingEngine/VolumeViewport.d.ts +1 -1
- package/dist/types/RenderingEngine/VolumeViewport.d.ts.map +1 -1
- package/dist/types/enums/Events.d.ts +1 -1
- package/dist/types/enums/Events.d.ts.map +1 -1
- package/dist/types/loaders/volumeLoader.d.ts +1 -1
- package/dist/types/loaders/volumeLoader.d.ts.map +1 -1
- package/dist/types/requestPool/imageLoadPoolManager.d.ts.map +1 -1
- package/dist/types/requestPool/requestPoolManager.d.ts.map +1 -1
- package/dist/types/types/EventTypes.d.ts +0 -1
- package/dist/types/types/EventTypes.d.ts.map +1 -1
- package/dist/types/types/IActor.d.ts +1 -1
- package/dist/types/types/IActor.d.ts.map +1 -1
- package/dist/types/types/ICamera.d.ts +1 -0
- package/dist/types/types/ICamera.d.ts.map +1 -1
- package/dist/types/types/IVideoViewport.d.ts +2 -19
- package/dist/types/types/IVideoViewport.d.ts.map +1 -1
- package/dist/types/types/IViewport.d.ts +6 -1
- package/dist/types/types/IViewport.d.ts.map +1 -1
- package/dist/types/types/IVolumeViewport.d.ts +7 -1
- package/dist/types/types/IVolumeViewport.d.ts.map +1 -1
- package/dist/types/types/StackViewportProperties.d.ts +0 -1
- package/dist/types/types/StackViewportProperties.d.ts.map +1 -1
- package/dist/types/types/ViewportProperties.d.ts +0 -1
- package/dist/types/types/ViewportProperties.d.ts.map +1 -1
- package/dist/types/utilities/getImageSliceDataForVolumeViewport.d.ts.map +1 -1
- package/dist/types/utilities/loadImageToCanvas.d.ts.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/BaseVolumeViewport.ts +6 -21
- package/src/RenderingEngine/RenderingEngine.ts +6 -6
- package/src/RenderingEngine/StackViewport.ts +6 -34
- package/src/RenderingEngine/Viewport.ts +31 -16
- package/src/RenderingEngine/VolumeViewport.ts +17 -11
- package/src/RenderingEngine/VolumeViewport3D.ts +1 -1
- package/src/enums/Events.ts +1 -1
- package/src/loaders/volumeLoader.ts +2 -3
- package/src/requestPool/imageLoadPoolManager.ts +0 -3
- package/src/requestPool/requestPoolManager.ts +0 -3
- package/src/types/EventTypes.ts +0 -2
- package/src/types/IActor.ts +2 -2
- package/src/types/ICamera.ts +2 -0
- package/src/types/IVideoViewport.ts +2 -86
- package/src/types/IViewport.ts +11 -6
- package/src/types/IVolumeViewport.ts +13 -7
- package/src/types/StackViewportProperties.ts +0 -2
- package/src/types/ViewportProperties.ts +0 -2
- package/src/utilities/convertStackToVolumeViewport.ts +2 -2
- package/src/utilities/getImageSliceDataForVolumeViewport.ts +2 -1
- package/src/utilities/getTargetVolumeAndSpacingInNormalDir.ts +1 -1
- package/src/utilities/loadImageToCanvas.ts +0 -3
package/src/types/IViewport.ts
CHANGED
|
@@ -325,12 +325,17 @@ interface IViewport {
|
|
|
325
325
|
/** sets the camera */
|
|
326
326
|
setCamera(cameraInterface: ICamera, storeAsInitialCamera?: boolean): void;
|
|
327
327
|
/** Resets the camera */
|
|
328
|
-
resetCamera(
|
|
329
|
-
resetPan
|
|
330
|
-
resetZoom
|
|
331
|
-
resetToCenter
|
|
332
|
-
storeAsInitialCamera
|
|
333
|
-
|
|
328
|
+
resetCamera({
|
|
329
|
+
resetPan,
|
|
330
|
+
resetZoom,
|
|
331
|
+
resetToCenter,
|
|
332
|
+
storeAsInitialCamera,
|
|
333
|
+
}?: {
|
|
334
|
+
resetPan?: boolean;
|
|
335
|
+
resetZoom?: boolean;
|
|
336
|
+
resetToCenter?: boolean;
|
|
337
|
+
storeAsInitialCamera?: boolean;
|
|
338
|
+
}): boolean;
|
|
334
339
|
/** Gets the number of slices in the current camera orientation */
|
|
335
340
|
getNumberOfSlices(): number;
|
|
336
341
|
/** Gets the index of the current image, it is not guaranteed to be the slice index in the view, use getSliceIndex for positional information */
|
|
@@ -133,13 +133,19 @@ export default interface IVolumeViewport extends IViewport {
|
|
|
133
133
|
/**
|
|
134
134
|
* Reset the camera for the volume viewport
|
|
135
135
|
*/
|
|
136
|
-
resetCamera(
|
|
137
|
-
resetPan
|
|
138
|
-
resetZoom
|
|
139
|
-
resetToCenter
|
|
140
|
-
resetRotation
|
|
141
|
-
|
|
142
|
-
|
|
136
|
+
resetCamera({
|
|
137
|
+
resetPan,
|
|
138
|
+
resetZoom,
|
|
139
|
+
resetToCenter,
|
|
140
|
+
resetRotation,
|
|
141
|
+
suppressEvents,
|
|
142
|
+
}?: {
|
|
143
|
+
resetPan?: boolean;
|
|
144
|
+
resetZoom?: boolean;
|
|
145
|
+
resetToCenter?: boolean;
|
|
146
|
+
resetRotation?: boolean;
|
|
147
|
+
suppressEvents?: boolean;
|
|
148
|
+
}): boolean;
|
|
143
149
|
/**
|
|
144
150
|
* Reset the slab thickness for actors of the viewport.
|
|
145
151
|
*/
|
|
@@ -7,8 +7,6 @@ import { ViewportProperties } from './ViewportProperties';
|
|
|
7
7
|
type StackViewportProperties = ViewportProperties & {
|
|
8
8
|
/** interpolation type - linear or nearest neighbor */
|
|
9
9
|
interpolationType?: InterpolationType;
|
|
10
|
-
/** image rotation */
|
|
11
|
-
rotation?: number;
|
|
12
10
|
/** suppress events (optional) */
|
|
13
11
|
suppressEvents?: boolean;
|
|
14
12
|
/** Indicates if the voi is a computed VOI (not user set) */
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { IStackViewport, IVolumeViewport, Point3 } from '../types';
|
|
2
2
|
import { setVolumesForViewports } from '../RenderingEngine/helpers';
|
|
3
3
|
import {
|
|
4
|
-
|
|
4
|
+
createAndCacheEmptyVolume,
|
|
5
5
|
getUnknownVolumeLoaderSchema,
|
|
6
6
|
} from '../loaders/volumeLoader';
|
|
7
7
|
import { Events, OrientationAxis, ViewportType } from '../enums';
|
|
@@ -64,7 +64,7 @@ async function convertStackToVolumeViewport({
|
|
|
64
64
|
// imageIds or not so we just let the loader handle it and we have cache
|
|
65
65
|
// optimizations in place to avoid fetching the same imageId if it is already
|
|
66
66
|
// cached
|
|
67
|
-
const volume = await
|
|
67
|
+
const volume = await createAndCacheEmptyVolume(volumeId, {
|
|
68
68
|
imageIds,
|
|
69
69
|
});
|
|
70
70
|
|
|
@@ -26,7 +26,8 @@ function getImageSliceDataForVolumeViewport(
|
|
|
26
26
|
.getActors()
|
|
27
27
|
.find(
|
|
28
28
|
(a) =>
|
|
29
|
-
a.
|
|
29
|
+
a.referencedId === imageVolume.volumeId ||
|
|
30
|
+
a.uid === imageVolume.volumeId
|
|
30
31
|
);
|
|
31
32
|
|
|
32
33
|
if (!actorEntry) {
|
|
@@ -59,7 +59,7 @@ export default function getTargetVolumeAndSpacingInNormalDir(
|
|
|
59
59
|
.map((va) => {
|
|
60
60
|
// prefer the referenceUID if it is set, since it can be a derived actor
|
|
61
61
|
// and the uid does not necessarily match the volumeId
|
|
62
|
-
const actorUID = va.
|
|
62
|
+
const actorUID = va.referencedId ?? va.uid;
|
|
63
63
|
return cache.getVolume(actorUID);
|
|
64
64
|
})
|
|
65
65
|
.filter((iv) => !!iv);
|