@cornerstonejs/nifti-volume-loader 2.2.8 → 2.2.10

package/dist/esm/cornerstoneNiftiImageLoader.js

@@ -2,8 +2,7 @@ import { Enums, eventTarget, metaData, triggerEvent, utilities, } from '@corners
 import * as NiftiReader from 'nifti-reader-js';
 import { Events } from './enums';
 import { modalityScaleNifti } from './helpers';
-const fetchStarted = new Map();
-let niftiScalarData = null;
+const dataFetchStateMap = new Map();
 function fetchArrayBuffer({ url, signal, onload, }) {
     return new Promise((resolve, reject) => {
         const xhr = new XMLHttpRequest();
@@ -47,14 +46,14 @@ export default function cornerstoneNiftiImageLoader(imageId) {
     const imagePixelModule = metaData.get(Enums.MetadataModules.IMAGE_PIXEL, imageId);
     const imagePlaneModule = metaData.get(Enums.MetadataModules.IMAGE_PLANE, imageId);
     const promise = new Promise((resolve, reject) => {
-        if (!fetchStarted.get(url)) {
-            fetchStarted.set(url, true);
+        if (!dataFetchStateMap.get(url)) {
+            dataFetchStateMap.set(url, { status: 'fetching' });
             fetchAndProcessNiftiData(imageId, url, sliceIndex, imagePixelModule, imagePlaneModule)
                 .then(resolve)
                 .catch(reject);
         }
         else {
-            waitForNiftiData(imageId, sliceIndex, imagePixelModule, imagePlaneModule)
+            waitForNiftiData(imageId, url, sliceIndex, imagePixelModule, imagePlaneModule)
                 .then(resolve)
                 .catch(reject);
         }
@@ -81,20 +80,21 @@ async function fetchAndProcessNiftiData(imageId, url, sliceIndex, imagePixelModu
         throw new Error(errorMessage);
     }
     const { scalarData } = modalityScaleNifti(niftiHeader, niftiImage);
-    niftiScalarData = scalarData;
-    return createImage(imageId, sliceIndex, imagePixelModule, imagePlaneModule);
+    dataFetchStateMap.set(url, { status: 'fetched', scalarData });
+    return createImage(imageId, sliceIndex, imagePixelModule, imagePlaneModule, scalarData);
 }
-function waitForNiftiData(imageId, sliceIndex, imagePixelModule, imagePlaneModule) {
+function waitForNiftiData(imageId, url, sliceIndex, imagePixelModule, imagePlaneModule) {
     return new Promise((resolve) => {
         const intervalId = setInterval(() => {
-            if (niftiScalarData) {
+            const dataFetchState = dataFetchStateMap.get(url);
+            if (dataFetchState.status === 'fetched') {
                 clearInterval(intervalId);
-                resolve(createImage(imageId, sliceIndex, imagePixelModule, imagePlaneModule));
+                resolve(createImage(imageId, sliceIndex, imagePixelModule, imagePlaneModule, dataFetchState.scalarData));
             }
         }, 10);
     });
 }
-function createImage(imageId, sliceIndex, imagePixelModule, imagePlaneModule) {
+function createImage(imageId, sliceIndex, imagePixelModule, imagePlaneModule, niftiScalarData) {
     const { rows, columns } = imagePlaneModule;
     const numVoxels = rows * columns;
     const sliceOffset = numVoxels * sliceIndex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/nifti-volume-loader",
-  "version": "2.2.8",
+  "version": "2.2.10",
   "description": "Nifti Image Loader for Cornerstone3D",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
@@ -62,7 +62,7 @@
     "nifti-reader-js": "^0.6.8"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^2.2.8"
+    "@cornerstonejs/core": "^2.2.10"
   },
   "contributors": [
     {
@@ -75,5 +75,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "9d190e98431221e60c802e308621404455d3eb5a"
+  "gitHead": "8575aed359ecd7ca55caaa9b104deef54e44c7fb"
 }