@cornerstonejs/core 2.5.3 → 2.6.0

package/dist/esm/RenderingEngine/VolumeViewport.d.ts

@@ -20,7 +20,7 @@ declare class VolumeViewport extends BaseVolumeViewport {
     resetCamera(options?: any): boolean;
     setSlabThickness(slabThickness: number, filterActorUIDs?: any[]): void;
     resetSlabThickness(): void;
-    getCurrentImageIdIndex: (volumeId?: string) => number;
+    getCurrentImageIdIndex: (volumeId?: string, useSlabThickness?: boolean) => number;
     getSliceIndex: () => number;
     getSliceViewInfo(): {
         sliceIndex: number;

package/dist/esm/RenderingEngine/VolumeViewport.js

@@ -15,6 +15,7 @@ import { setTransferFunctionNodes } from '../utilities/transferFunctionUtils';
 import getImageSliceDataForVolumeViewport from '../utilities/getImageSliceDataForVolumeViewport';
 import { transformCanvasToIJK } from '../utilities/transformCanvasToIJK';
 import { transformIJKToCanvas } from '../utilities/transformIJKToCanvas';
+import getVolumeViewportScrollInfo from '../utilities/getVolumeViewportScrollInfo';
 class VolumeViewport extends BaseVolumeViewport {
     constructor(props) {
         super(props);
@@ -32,18 +33,9 @@ class VolumeViewport extends BaseVolumeViewport {
                 suppressEvents: true,
             });
         };
-        this.getCurrentImageIdIndex = (volumeId) => {
-            const { viewPlaneNormal, focalPoint } = this.getCamera();
-            const imageData = this.getImageData(volumeId);
-            if (!imageData) {
-                return;
-            }
-            const { origin, direction, spacing } = imageData;
-            const spacingInNormal = getSpacingInNormalDirection({ direction, spacing }, viewPlaneNormal);
-            const sub = vec3.create();
-            vec3.sub(sub, focalPoint, origin);
-            const distance = vec3.dot(sub, viewPlaneNormal);
-            return Math.round(Math.abs(distance) / spacingInNormal);
+        this.getCurrentImageIdIndex = (volumeId, useSlabThickness = true) => {
+            const { currentStepIndex } = getVolumeViewportScrollInfo(this, volumeId || this.getVolumeId(), useSlabThickness);
+            return currentStepIndex;
         };
         this.getSliceIndex = () => {
             const { imageIndex } = getImageSliceDataForVolumeViewport(this) || {};

package/dist/esm/RenderingEngine/helpers/addImageSlicesToViewports.js

@@ -1,4 +1,4 @@
-async function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds) {
+function addImageSlicesToViewports(renderingEngine, stackInputs, viewportIds) {
     for (const viewportId of viewportIds) {
         const viewport = renderingEngine.getStackViewport(viewportId);
         if (!viewport) {
@@ -9,10 +9,9 @@ async function addImageSlicesToViewports(renderingEngine, stackInputs, viewportI
             return;
         }
     }
-    const addStackPromises = viewportIds.map(async (viewportId) => {
+    viewportIds.forEach((viewportId) => {
         const viewport = renderingEngine.getStackViewport(viewportId);
         viewport.addImages(stackInputs);
     });
-    await Promise.all(addStackPromises);
 }
 export default addImageSlicesToViewports;

package/dist/esm/utilities/VoxelManager.js

@@ -427,11 +427,11 @@ export default class VoxelManager {
             return true;
         }
         const _getConstructor = () => {
-            const pixelInfo = getPixelInfo(0);
-            if (!pixelInfo?.pixelData) {
+            const { voxelManager: imageVoxelManager } = getPixelInfo(0);
+            if (!imageVoxelManager) {
                 return null;
             }
-            return pixelInfo.pixelData.constructor;
+            return imageVoxelManager.getConstructor();
         };
         const voxelManager = new VoxelManager(dimensions, {
             _get: getVoxelValue,
@@ -497,13 +497,13 @@ export default class VoxelManager {
             let minValue = Infinity;
             let maxValue = -Infinity;
             for (let sliceIndex = 0; sliceIndex < dimensions[2]; sliceIndex++) {
-                const { pixelData } = getPixelInfo((sliceIndex * sliceSize) / numberOfComponents);
-                if (pixelData && SliceDataConstructor) {
+                const { voxelManager: imageVoxelManager } = getPixelInfo((sliceIndex * sliceSize) / numberOfComponents);
+                if (imageVoxelManager && SliceDataConstructor) {
                     const sliceStart = sliceIndex * sliceSize;
                     const sliceEnd = sliceStart + sliceSize;
                     const sliceData = new SliceDataConstructor(sliceSize);
                     sliceData.set(scalarData.subarray(sliceStart, sliceEnd));
-                    pixelData.set(sliceData);
+                    imageVoxelManager.scalarData = sliceData;
                     for (let i = 0; i < sliceData.length; i++) {
                         const value = sliceData[i];
                         minValue = Math.min(minValue, value);
@@ -641,6 +641,7 @@ export default class VoxelManager {
                 scalarData[index] = v;
                 return isChanged;
             },
+            _getConstructor: () => scalarData.constructor,
             _id: '_createNumberVolumeVoxelManager',
         });
         voxels.scalarData = scalarData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "2.5.3",
+  "version": "2.6.0",
   "description": "",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -82,5 +82,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "f2996db78ea77e524dabd88d176177064a0f2ef3"
+  "gitHead": "d5c8036b08e8927a3fbbc1af6a0557687fc0645c"
 }