larvitar 4.0.0-alpha.49 → 4.0.0-alpha.50

package/dist/imaging/MetaDataTypes.d.ts

@@ -3,6 +3,7 @@ export type ExtendedMetaDataTypes = MetaDataTypes & {
 };
 export declare const arrayTags: string[];
 export type MetaDataTypes = {
+    x52009230?: MetaDataTypes[];
     x50000020?: string;
     x20000010?: number;
     x2000001e?: MetaDataTypes[];

package/dist/imaging/imageUtils.d.ts

@@ -126,9 +126,13 @@ export declare const getReslicedMetadata: (reslicedSeriesId: string, fromOrienta
     };
     currentImageIdIndex: number;
 };
-export declare const getFrameSequenceMammoVOI: (instance: any) => {
+export declare const getVOIFromMetadata: (metadata: MetaData, renderOptionsVoi?: any) => {
     windowCenter: any;
     windowWidth: any;
+};
+export declare const getFrameSequenceMammoVOI: (metadata: MetaData) => {
+    windowCenter: number | number[] | undefined;
+    windowWidth: number | number[] | undefined;
 } | null;
 /**
  * Compute cmpr metadata from pyCmpr data (generated using Scyther {@link https://github.com/dvisionlab/Scyther})

package/dist/larvitar.js

@@ -85695,7 +85695,7 @@ __webpack_require__.d(index_core_dist_esm_namespaceObject, {
 });
 
 ;// ./package.json
-const index_package_namespaceObject = /*#__PURE__*/JSON.parse('{"name":"larvitar","keywords":["DICOM","imaging","medical","cornerstone"],"version":"4.0.0-alpha.49","description":"typescript library for parsing, loading, rendering and interacting with DICOM images","repository":{"url":"https://github.com/dvisionlab/Larvitar.git","type":"git"},"main":"dist/larvitar.js","types":"dist/index.d.ts","files":["dist","imaging/**/*.d.ts","imaging3d/**/*.d.ts"],"scripts":{"coverage":"typescript-coverage-report","format":"prettier --write \\"imaging/**/*.{js,ts,json,css,md}\\" \\"imaging3d/**/*.{js,ts,json,css,md}\\" \\"docs/examples/**/*.html\\"","format:check":"prettier --check \\"imaging/**/*.{js,ts,json,css,md}\\" \\"imaging3d/**/*.{js,ts,json,css,md}\\" \\"docs/examples/**/*.html\\"","postinstall":"patch-package","build":"webpack --config ./bundler/webpack.prod.debug.js","dev":"webpack --progress --config ./bundler/webpack.dev.js","docs:dev":"vuepress dev docs","docs:build":"vuepress build docs","cypress":"cypress open","cypress:run":"cypress run","cypress:run:headless":"cypress run --headless"},"author":"Simone Manini <simone.manini@dvisionlab.com> (https://www.dvisionlab.com)","contributors":["Mattia Ronzoni <mattia.ronzoni@dvisionlab.com> (https://www.dvisionlab.com)","Laura Borghesi <laura.borghesi@dvisionlab.com> (https://www.dvisionlab.com)","Sara Zanchi <sara.zanchi@dvisionlab.com> (https://www.dvisionlab.com)"],"license":"MIT","dependencies":{"@cornerstonejs/core":"^4.5.19","@cornerstonejs/dicom-image-loader":"^4.5.19","@cornerstonejs/nifti-volume-loader":"^4.5.19","@cornerstonejs/tools":"^4.7.0","@hyzyla/pdfium":"^2.1.2","@icr/polyseg-wasm":"^0.4.0","consola":"^3.4.0","cornerstone-core":"^2.6.1","cornerstone-file-image-loader":"^0.3.0","cornerstone-tools":"^6.0.7","cornerstone-wado-image-loader":"^4.13.2","cornerstone-web-image-loader":"^2.1.1","crypto-js":"^4.1.1","dcmjs":"^0.34.0","dicom-character-set":"^1.0.3","dicom-parser":"^1.8.13","hammerjs":"^2.0.8","jpeg-lossless-decoder-js":"^2.0.7","keycode-js":"^3.1.0","lodash":"^4.17.15","pako":"^1.0.10","plotly.js-dist-min":"^2.27.1","uuid":"^8.3.2"},"devDependencies":{"@babel/core":"^7.21.8","@rollup/plugin-commonjs":"^28.0.3","@types/cornerstone-core":"^2.3.0","@types/crypto-js":"^4.1.1","@types/hammerjs":"^2.0.41","@types/lodash":"^4.14.192","@types/papaparse":"^5.3.7","@types/plotly.js":"^2.12.30","@types/plotly.js-dist-min":"^2.3.4","@types/uuid":"^9.0.1","@vuepress/bundler-vite":"^2.0.0-rc.18","@vuepress/plugin-slimsearch":"^2.0.0-rc.68","@vuepress/theme-default":"^2.0.0-rc.60","babel-loader":"^9.1.2","clean-webpack-plugin":"^4.0.0","cypress":"^14.2.0","cypress-image-snapshot":"^4.0.1","cypress-mochawesome-reporter":"^3.8.2","cypress-multi-reporters":"^2.0.5","eslint":"^9.17.0","html-loader":"^4.2.0","html-webpack-plugin":"^5.6.0","jsdom":"^26.0.0","lodash-webpack-plugin":"^0.11.6","mocha-json-reporter":"^1.0.0-1","patch-package":"^8.0.0","prettier":"^3.5.3","sass-embedded":"^1.80.7","ts-loader":"^9.4.2","typescript":"^5.0.2","typescript-coverage-report":"^0.7.0","vuepress":"^2.0.0-rc.18","webpack":"^5.76.3","webpack-cli":"^5.0.1","webpack-dev-server":"^4.13.1"}}');
+const index_package_namespaceObject = /*#__PURE__*/JSON.parse('{"name":"larvitar","keywords":["DICOM","imaging","medical","cornerstone"],"version":"4.0.0-alpha.50","description":"typescript library for parsing, loading, rendering and interacting with DICOM images","repository":{"url":"https://github.com/dvisionlab/Larvitar.git","type":"git"},"main":"dist/larvitar.js","types":"dist/index.d.ts","files":["dist","imaging/**/*.d.ts","imaging3d/**/*.d.ts"],"scripts":{"coverage":"typescript-coverage-report","format":"prettier --write \\"imaging/**/*.{js,ts,json,css,md}\\" \\"imaging3d/**/*.{js,ts,json,css,md}\\" \\"docs/examples/**/*.html\\"","format:check":"prettier --check \\"imaging/**/*.{js,ts,json,css,md}\\" \\"imaging3d/**/*.{js,ts,json,css,md}\\" \\"docs/examples/**/*.html\\"","postinstall":"patch-package","build":"webpack --config ./bundler/webpack.prod.debug.js","dev":"webpack --progress --config ./bundler/webpack.dev.js","docs:dev":"vuepress dev docs","docs:build":"vuepress build docs","cypress":"cypress open","cypress:run":"cypress run","cypress:run:headless":"cypress run --headless"},"author":"Simone Manini <simone.manini@dvisionlab.com> (https://www.dvisionlab.com)","contributors":["Mattia Ronzoni <mattia.ronzoni@dvisionlab.com> (https://www.dvisionlab.com)","Laura Borghesi <laura.borghesi@dvisionlab.com> (https://www.dvisionlab.com)","Sara Zanchi <sara.zanchi@dvisionlab.com> (https://www.dvisionlab.com)"],"license":"MIT","dependencies":{"@cornerstonejs/core":"^4.5.19","@cornerstonejs/dicom-image-loader":"^4.5.19","@cornerstonejs/nifti-volume-loader":"^4.5.19","@cornerstonejs/tools":"^4.7.0","@hyzyla/pdfium":"^2.1.2","@icr/polyseg-wasm":"^0.4.0","consola":"^3.4.0","cornerstone-core":"^2.6.1","cornerstone-file-image-loader":"^0.3.0","cornerstone-tools":"^6.0.7","cornerstone-wado-image-loader":"^4.13.2","cornerstone-web-image-loader":"^2.1.1","crypto-js":"^4.1.1","dcmjs":"^0.34.0","dicom-character-set":"^1.0.3","dicom-parser":"^1.8.13","hammerjs":"^2.0.8","jpeg-lossless-decoder-js":"^2.0.7","keycode-js":"^3.1.0","lodash":"^4.17.15","pako":"^1.0.10","plotly.js-dist-min":"^2.27.1","uuid":"^8.3.2"},"devDependencies":{"@babel/core":"^7.21.8","@rollup/plugin-commonjs":"^28.0.3","@types/cornerstone-core":"^2.3.0","@types/crypto-js":"^4.1.1","@types/hammerjs":"^2.0.41","@types/lodash":"^4.14.192","@types/papaparse":"^5.3.7","@types/plotly.js":"^2.12.30","@types/plotly.js-dist-min":"^2.3.4","@types/uuid":"^9.0.1","@vuepress/bundler-vite":"^2.0.0-rc.18","@vuepress/plugin-slimsearch":"^2.0.0-rc.68","@vuepress/theme-default":"^2.0.0-rc.60","babel-loader":"^9.1.2","clean-webpack-plugin":"^4.0.0","cypress":"^14.2.0","cypress-image-snapshot":"^4.0.1","cypress-mochawesome-reporter":"^3.8.2","cypress-multi-reporters":"^2.0.5","eslint":"^9.17.0","html-loader":"^4.2.0","html-webpack-plugin":"^5.6.0","jsdom":"^26.0.0","lodash-webpack-plugin":"^0.11.6","mocha-json-reporter":"^1.0.0-1","patch-package":"^8.0.0","prettier":"^3.5.3","sass-embedded":"^1.80.7","ts-loader":"^9.4.2","typescript":"^5.0.2","typescript-coverage-report":"^0.7.0","vuepress":"^2.0.0-rc.18","webpack":"^5.76.3","webpack-cli":"^5.0.1","webpack-dev-server":"^4.13.1"}}');
 // EXTERNAL MODULE: ./node_modules/cornerstone-core/dist/cornerstone.js
 var index_dist_cornerstone = __webpack_require__(1198);
 var index_cornerstone_default = /*#__PURE__*/__webpack_require__.n(index_dist_cornerstone);
@@ -171423,8 +171423,7 @@ let index_createCustomImage = function (imageId, metadata, pixelData, dataSet) {
                 : [1, 1];
     let rescaleIntercept = metadata.x00281052;
     let rescaleSlope = metadata.x00281053;
-    let windowCenter = metadata.x00281050;
-    let windowWidth = metadata.x00281051;
+    const { windowWidth, windowCenter } = index_imageUtils_getVOIFromMetadata(metadata);
     function getSizeInBytes() {
         let bytesPerPixel = Math.round(imageFrame.bitsAllocated / 8);
         return (imageFrame.rows *
@@ -171548,6 +171547,7 @@ let index_createCustomImage = function (imageId, metadata, pixelData, dataSet) {
 
 
 
+
 /*
  * This module provides the following functions to be exported:
  * loadReslicedImage(imageId)
@@ -171602,8 +171602,7 @@ let index_resliceLoader_createCustomImage = function (imageId, metadata, pixelDa
                 : [1, 1];
     let rescaleIntercept = metadata.x00281052;
     let rescaleSlope = metadata.x00281053;
-    let windowCenter = metadata.x00281050;
-    let windowWidth = metadata.x00281051;
+    const { windowWidth, windowCenter } = index_imageUtils_getVOIFromMetadata(metadata);
     function getSizeInBytes() {
         let bytesPerPixel = Math.round(imageFrame.bitsAllocated / 8);
         return (imageFrame.rows *
@@ -173755,8 +173754,9 @@ const index_fillMetadataReadable = function (metadata) {
     metadataReadable.numberOfSlices = metadata["x00540081"]
         ? metadata["x00540081"] // number of slices
         : metadata["x00201002"]; // number of instances
-    metadataReadable.windowCenter = metadata["x00281050"];
-    metadataReadable.windowWidth = metadata["x00281051"];
+    const { windowWidth, windowCenter } = index_imageUtils_getVOIFromMetadata(metadata);
+    metadataReadable.windowCenter = windowCenter;
+    metadataReadable.windowWidth = windowWidth;
     metadataReadable.minPixelValue = metadata["x00280106"];
     metadataReadable.maxPixelValue = metadata["x00280107"];
     metadataReadable.numberOfFrames = numberOfFrames;
@@ -174416,6 +174416,7 @@ let index_dsaImageLoader_createCustomImage = function (imageId, srcImage, pixelD
 
 
 
+
 // global module variables
 let index_multiframeLoader_customImageLoaderCounter = 0;
 // Local cache used to store multiframe datasets to avoid reading and parsing
@@ -174646,8 +174647,7 @@ let index_multiframeLoader_createCustomImage = function (id, imageId, frameIndex
                         : [1, 1];
             let rescaleIntercept = metadata.x00281052;
             let rescaleSlope = metadata.x00281053;
-            let windowCenter = metadata.x00281050;
-            let windowWidth = metadata.x00281051;
+            const { windowWidth, windowCenter } = index_imageUtils_getVOIFromMetadata(metadata);
             function getSizeInBytes() {
                 let bytesPerPixel = Math.round(imageFrame.bitsAllocated / 8);
                 return (imageFrame.rows *
@@ -174796,6 +174796,7 @@ var index_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _ar
 // internal libraries
 
 
+
 // global module variables
 let index_singleFrameLoader_customImageLoaderCounter = 0;
 let index_singleFrameCache = {};
@@ -174946,8 +174947,7 @@ const index_singleFrameLoader_createCustomImage = function (imageId) {
                         : [1, 1];
             let rescaleIntercept = metadata.x00281052;
             let rescaleSlope = metadata.x00281053;
-            let windowCenter = metadata.x00281050;
-            let windowWidth = metadata.x00281051;
+            const { windowWidth, windowCenter } = index_imageUtils_getVOIFromMetadata(metadata);
             function getSizeInBytes() {
                 let bytesPerPixel = Math.round(imageFrame.bitsAllocated / 8);
                 return (imageFrame.rows *
@@ -223646,8 +223646,8 @@ const index_resetViewports = function (elementIds, keys) {
             ]);
         }
         if (!keys || keys.find(v => v === "scaleAndTranslationOriginalSize")) {
-            viewport.scale = 1.00;
-            index_imageStore_set(["scale", elementId, 1.00]);
+            viewport.scale = 1.0;
+            index_imageStore_set(["scale", elementId, 1.0]);
             viewport.translation.x = defaultViewport.translation.x;
             viewport.translation.y = defaultViewport.translation.y;
             index_imageStore_set([
@@ -224036,7 +224036,6 @@ const index_getTemporalSeriesData = function (series) {
  * @return {StoreViewport} data - A data dictionary with parsed tags' values
  */
 const index_getSeriesData = function (series, renderOptions) {
-    var _a, _b, _c, _d, _e, _f;
     const data = {};
     data.uniqueUID = series.uniqueUID || series.seriesUID; //case of resliced series
     data.modality = series.modality;
@@ -224095,23 +224094,7 @@ const index_getSeriesData = function (series, renderOptions) {
         let spacing = instance.metadata.x00280030;
         data.spacing_x = spacing ? spacing[0] : 1;
         data.spacing_y = spacing ? spacing[1] : 1;
-        let windowCenter;
-        let windowWidth;
-        if (renderOptions.voi !== undefined) {
-            windowCenter = renderOptions.voi.windowCenter;
-            windowWidth = renderOptions.voi.windowWidth;
-        }
-        else if (((_a = instance.metadata.x00080060) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === "MG") {
-            const frameSequenceMammoVOI = index_getFrameSequenceMammoVOI(instance);
-            windowCenter =
-                (_b = frameSequenceMammoVOI === null || frameSequenceMammoVOI === void 0 ? void 0 : frameSequenceMammoVOI.windowCenter) !== null && _b !== void 0 ? _b : instance.metadata.x00281050;
-            windowWidth =
-                (_c = frameSequenceMammoVOI === null || frameSequenceMammoVOI === void 0 ? void 0 : frameSequenceMammoVOI.windowWidth) !== null && _c !== void 0 ? _c : instance.metadata.x00281051;
-        }
-        else {
-            windowCenter = instance.metadata.x00281050;
-            windowWidth = instance.metadata.x00281051;
-        }
+        const { windowWidth, windowCenter } = index_imageUtils_getVOIFromMetadata(instance.metadata, renderOptions.voi);
         // window center and window width
         data.viewport = {
             voi: {
@@ -224121,19 +224104,7 @@ const index_getSeriesData = function (series, renderOptions) {
         };
         // store default values for the viewport voi from the series metadata
         data.default = {};
-        if (((_d = instance.metadata.x00080060) === null || _d === void 0 ? void 0 : _d.toUpperCase()) === "MG") {
-            const frameSequenceMammoVOI = index_getFrameSequenceMammoVOI(instance);
-            data.default.voi = {
-                windowCenter: ((_e = frameSequenceMammoVOI === null || frameSequenceMammoVOI === void 0 ? void 0 : frameSequenceMammoVOI.windowCenter) !== null && _e !== void 0 ? _e : instance.metadata.x00281050),
-                windowWidth: ((_f = frameSequenceMammoVOI === null || frameSequenceMammoVOI === void 0 ? void 0 : frameSequenceMammoVOI.windowWidth) !== null && _f !== void 0 ? _f : instance.metadata.x00281051)
-            };
-        }
-        else {
-            data.default.voi = {
-                windowCenter: instance.metadata.x00281050,
-                windowWidth: instance.metadata.x00281051
-            };
-        }
+        data.default.voi = index_imageUtils_getVOIFromMetadata(instance.metadata);
         data.default.rotation = 0;
         data.default.translation = { x: 0, y: 0 };
         if (renderOptions.default !== undefined) {
@@ -224178,7 +224149,6 @@ const index_getSeriesData = function (series, renderOptions) {
  * @return {StoreViewport} data - A data dictionary with parsed tags' values
  */
 const index_getSeriesDataFromStore = function (elementId, series, renderOptions = {}) {
-    var _a, _b, _c;
     const data = index_imageStore.get([
         "viewports",
         elementId
@@ -224213,19 +224183,7 @@ const index_getSeriesDataFromStore = function (elementId, series, renderOptions
         if (!data.default.voi) {
             data.default.voi = { windowCenter: 0, windowWidth: 0 };
         }
-        if (((_a = instance.metadata.x00080060) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === "MG") {
-            const frameSequenceMammoVOI = index_getFrameSequenceMammoVOI(instance);
-            data.default.voi = {
-                windowCenter: ((_b = frameSequenceMammoVOI === null || frameSequenceMammoVOI === void 0 ? void 0 : frameSequenceMammoVOI.windowCenter) !== null && _b !== void 0 ? _b : instance.metadata.x00281050),
-                windowWidth: ((_c = frameSequenceMammoVOI === null || frameSequenceMammoVOI === void 0 ? void 0 : frameSequenceMammoVOI.windowWidth) !== null && _c !== void 0 ? _c : instance.metadata.x00281051)
-            };
-        }
-        else {
-            data.default.voi = {
-                windowCenter: instance.metadata.x00281050,
-                windowWidth: instance.metadata.x00281051
-            };
-        }
+        data.default.voi = index_imageUtils_getVOIFromMetadata(instance.metadata);
     }
     if (renderOptions.voi !== undefined) {
         if (!data.viewport) {
@@ -224831,10 +224789,32 @@ const index_getReslicedMetadata = function (reslicedSeriesId, fromOrientation, t
         currentImageIdIndex: 0
     };
 };
-const index_getFrameSequenceMammoVOI = function (instance) {
+const index_imageUtils_getVOIFromMetadata = function (metadata, renderOptionsVoi) {
+    var _a, _b, _c;
+    if (renderOptionsVoi !== undefined) {
+        return {
+            windowCenter: renderOptionsVoi.windowCenter,
+            windowWidth: renderOptionsVoi.windowWidth
+        };
+    }
+    else if (((_a = metadata.x00080060) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === "MG") {
+        const frameSequenceMammoVOI = index_getFrameSequenceMammoVOI(metadata);
+        return {
+            windowCenter: (_b = frameSequenceMammoVOI === null || frameSequenceMammoVOI === void 0 ? void 0 : frameSequenceMammoVOI.windowCenter) !== null && _b !== void 0 ? _b : metadata.x00281050,
+            windowWidth: (_c = frameSequenceMammoVOI === null || frameSequenceMammoVOI === void 0 ? void 0 : frameSequenceMammoVOI.windowWidth) !== null && _c !== void 0 ? _c : metadata.x00281051
+        };
+    }
+    else {
+        return {
+            windowCenter: metadata.x00281050,
+            windowWidth: metadata.x00281051
+        };
+    }
+};
+const index_getFrameSequenceMammoVOI = function (metadata) {
     var _a, _b;
     try {
-        const perFrameGroups = (_a = instance.metadata.x52009230) === null || _a === void 0 ? void 0 : _a[0];
+        const perFrameGroups = (_a = metadata.x52009230) === null || _a === void 0 ? void 0 : _a[0];
         const frameVOI = (_b = perFrameGroups === null || perFrameGroups === void 0 ? void 0 : perFrameGroups.x00289132) === null || _b === void 0 ? void 0 : _b[0];
         return {
             windowCenter: frameVOI === null || frameVOI === void 0 ? void 0 : frameVOI.x00281050,

package/package.json

@@ -6,7 +6,7 @@
     "medical",
     "cornerstone"
   ],
-  "version": "4.0.0-alpha.49",
+  "version": "4.0.0-alpha.50",
   "description": "typescript library for parsing, loading, rendering and interacting with DICOM images",
   "repository": {
     "url": "https://github.com/dvisionlab/Larvitar.git",