@cornerstonejs/core 2.2.15 → 2.2.17

package/dist/esm/RenderingEngine/vtkClasses/vtkStreamingOpenGLTexture.js

@@ -2,6 +2,12 @@ import macro from '@kitware/vtk.js/macros';
 import vtkOpenGLTexture from '@kitware/vtk.js/Rendering/OpenGL/Texture';
 import cache from '../../cache/cache';
 import { getConstructorFromType } from '../../utilities/getBufferConfiguration';
+function convertDataType(data, targetDataType) {
+    const Constructor = getConstructorFromType(targetDataType);
+    const convertedData = new Constructor(data.length);
+    convertedData.set(data);
+    return convertedData;
+}
 function vtkStreamingOpenGLTexture(publicAPI, model) {
     model.classHierarchy.push('vtkStreamingOpenGLTexture');
     model.updatedFrames = [];
@@ -52,10 +58,14 @@ function vtkStreamingOpenGLTexture(publicAPI, model) {
                 if (!image) {
                     continue;
                 }
-                const data = image.voxelManager.getScalarData();
+                let data = image.voxelManager.getScalarData();
                 const gl = model.context;
-                const dataType = data.constructor.name;
-                const [pixData] = publicAPI.updateArrayDataTypeForGL(dataType, [data]);
+                if (volume.dataType !== data.constructor.name) {
+                    data = convertDataType(data, volume.dataType);
+                }
+                const [pixData] = publicAPI.updateArrayDataTypeForGL(volume.dataType, [
+                    data,
+                ]);
                 publicAPI.bind();
                 const zOffset = i;
                 gl.texSubImage3D(model.target, 0, 0, 0, zOffset, model.width, model.height, 1, model.format, model.openGLDataType, pixData);
@@ -89,8 +99,12 @@ function vtkStreamingOpenGLTexture(publicAPI, model) {
                 constructor = data.constructor;
             }
             const gl = model.context;
-            const dataType = data.constructor.name;
-            const [pixData] = publicAPI.updateArrayDataTypeForGL(dataType, [data]);
+            if (volume.dataType !== data.constructor.name) {
+                data = convertDataType(data, volume.dataType);
+            }
+            const [pixData] = publicAPI.updateArrayDataTypeForGL(volume.dataType, [
+                data,
+            ]);
             publicAPI.bind();
             let zOffset = i;
             gl.texSubImage3D(model.target, 0, 0, 0, zOffset, model.width, model.height, 1, model.format, model.openGLDataType, pixData);

package/dist/esm/utilities/generateVolumePropsFromImageIds.js

@@ -4,6 +4,13 @@ import sortImageIdsAndGetSpacing from './sortImageIdsAndGetSpacing';
 import getScalingParameters from './getScalingParameters';
 import { hasFloatScalingParameters } from './hasFloatScalingParameters';
 import { canRenderFloatTextures } from '../init';
+import cache from '../cache/cache';
+const constructorToTypedArray = {
+    Uint8Array: 'Uint8Array',
+    Int16Array: 'Int16Array',
+    Uint16Array: 'Uint16Array',
+    Float32Array: 'Float32Array',
+};
 function generateVolumePropsFromImageIds(imageIds, volumeId) {
     const volumeMetadata = makeVolumeMetadata(imageIds);
     const { ImageOrientationPatient, PixelSpacing, Columns, Rows } = volumeMetadata;
@@ -36,6 +43,10 @@ function generateVolumePropsFromImageIds(imageIds, volumeId) {
 function _determineDataType(imageIds, volumeMetadata) {
     const { BitsAllocated, PixelRepresentation } = volumeMetadata;
     const signed = PixelRepresentation === 1;
+    const cachedDataType = _getDataTypeFromCache(imageIds);
+    if (cachedDataType) {
+        return cachedDataType;
+    }
     const [firstIndex, middleIndex, lastIndex] = [
         0,
         Math.floor(imageIds.length / 2),
@@ -70,4 +81,17 @@ function _determineDataType(imageIds, volumeMetadata) {
             throw new Error(`Bits allocated of ${BitsAllocated} is not defined to generate scalarData for the volume.`);
     }
 }
+function _getDataTypeFromCache(imageIds) {
+    const indices = [0, Math.floor(imageIds.length / 2), imageIds.length - 1];
+    const images = indices.map((i) => cache.getImage(imageIds[i]));
+    if (!images.every(Boolean)) {
+        return null;
+    }
+    const constructorName = images[0].getPixelData().constructor.name;
+    if (images.every((img) => img.getPixelData().constructor.name === constructorName) &&
+        constructorName in constructorToTypedArray) {
+        return constructorToTypedArray[constructorName];
+    }
+    return null;
+}
 export { generateVolumePropsFromImageIds };

package/dist/esm/utilities/getViewportImageCornersInWorld.js

@@ -1,5 +1,8 @@
 export default function getViewportImageCornersInWorld(viewport) {
-    const { imageData, dimensions } = viewport.getImageData();
+    const { imageData, dimensions } = viewport.getImageData() || {};
+    if (!imageData || !dimensions) {
+        return [];
+    }
     const { canvas } = viewport;
     const ratio = window.devicePixelRatio;
     const topLeftCanvas = [0, 0];

package/dist/esm/utilities/imageRetrieveMetadataProvider.d.ts

@@ -2,6 +2,8 @@ declare const imageRetrieveMetadataProvider: {
     IMAGE_RETRIEVE_CONFIGURATION: string;
     clear: () => void;
     add: (key: string, payload: any) => void;
+    clone: () => Map<string, unknown>;
+    restore: (state: Map<string, unknown>) => void;
     get: (type: string, ...queries: string[]) => unknown;
 };
 export default imageRetrieveMetadataProvider;

package/dist/esm/utilities/imageRetrieveMetadataProvider.js

@@ -9,6 +9,15 @@ const imageRetrieveMetadataProvider = {
     add: (key, payload) => {
         retrieveConfigurationState.set(key, payload);
     },
+    clone: () => {
+        return new Map(retrieveConfigurationState);
+    },
+    restore: (state) => {
+        retrieveConfigurationState.clear();
+        state.forEach((value, key) => {
+            retrieveConfigurationState.set(key, value);
+        });
+    },
     get: (type, ...queries) => {
         if (type === IMAGE_RETRIEVE_CONFIGURATION) {
             return queries

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "2.2.15",
+  "version": "2.2.17",
   "description": "",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -83,5 +83,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "8ced02a99bf153c9d268449db47f5abfe4a557b3"
+  "gitHead": "5652ca06035e63a5d19be9cfe711afc38c67e6b2"
 }