larvitar 2.0.12 → 2.0.14

package/README.md

@@ -8,8 +8,8 @@
 
 ## Dicom Image Toolkit for CornerstoneJS
 
-### Current version: 2.0.12
-### Latest Published Release: 2.0.12
+### Current version: 2.0.14
+### Latest Published Release: 2.0.14
 
 This library provides common DICOM functionalities to be used in web-applications: it's wrapper that simplifies the use of cornerstone-js environment.
 

package/dist/imaging/imageUtils.d.ts

@@ -148,9 +148,10 @@ export declare const getDistanceBetweenSlices: (seriesData: Series, sliceIndex1:
  * @function getImageMetadata
  * @param {String} seriesId - The seriesUID
  * @param {String} instanceUID - The SOPInstanceUID
+ * @param {number} frameId - Optional FrameId
  * @return {Array} - List of metadata objects: tag, name and value
  */
-export declare const getImageMetadata: (seriesId: string, instanceUID: string) => ({
+export declare const getImageMetadata: (seriesId: string, instanceUID: string, frameId?: number) => ({
     tag: string;
     name: string;
     value: string | number | number[] | MetaDataTypes[] | null | undefined;

package/dist/imaging/loaders/commonLoader.d.ts

@@ -19,11 +19,11 @@ export declare const updateLarvitarManager: (imageObject: ImageObject, customId?
  * This function can be called in order to populate the Larvitar manager
  * @instance
  * @function populateLarvitarManager
- * @param {String} seriesId The Id of the series
+ * @param {String} larvitarSeriesInstanceUID The Id of the manager stack
  * @param {Object} seriesData The series data
  * @returns {manager} the Larvitar manager
  */
-export declare const populateLarvitarManager: (seriesId: string, seriesData: Series) => {
+export declare const populateLarvitarManager: (larvitarSeriesInstanceUID: string, seriesData: Series) => {
     [key: string]: Series | import("../types").NrrdSeries;
 };
 /**

package/dist/imaging/loaders/multiframeLoader.d.ts

@@ -19,7 +19,7 @@ export declare const loadMultiFrameImage: (imageId: string) => {
  * @param {String} seriesId - SeriesId tag
  * @param {Object} serie - parsed serie object
  */
-export declare const buildMultiFrameImage: (seriesId: string, serie: Series) => void;
+export declare const buildMultiFrameImage: (larvitarSeriesInstanceUID: string, serie: Series) => void;
 /**
  * Get the custom imageId from custom loader
  * @instance

package/dist/larvitar.js

@@ -83803,15 +83803,19 @@ exports.getDistanceBetweenSlices = getDistanceBetweenSlices;
  * @function getImageMetadata
  * @param {String} seriesId - The seriesUID
  * @param {String} instanceUID - The SOPInstanceUID
+ * @param {number} frameId - Optional FrameId
  * @return {Array} - List of metadata objects: tag, name and value
  */
-const getImageMetadata = function (seriesId, instanceUID) {
+const getImageMetadata = function (seriesId, instanceUID, frameId) {
     const seriesData = (0, commonLoader_1.getSeriesDataFromLarvitarManager)(seriesId);
     if (seriesData === undefined || seriesData === null) {
         console.log(`Invalid Series ID: ${seriesId}`);
         return [];
     }
-    const imageId = seriesData.instanceUIDs[instanceUID];
+    // manage imageID if the image is a multiframe stack
+    const imageId = seriesData.isMultiframe
+        ? seriesData.instanceUIDs[instanceUID] + "?frame=" + frameId
+        : seriesData.instanceUIDs[instanceUID];
     if (imageId === undefined) {
         console.log(`Invalid InstanceUID ID: ${instanceUID}`);
         return [];
@@ -84227,20 +84231,20 @@ exports.updateLarvitarManager = updateLarvitarManager;
  * This function can be called in order to populate the Larvitar manager
  * @instance
  * @function populateLarvitarManager
- * @param {String} seriesId The Id of the series
+ * @param {String} larvitarSeriesInstanceUID The Id of the manager stack
  * @param {Object} seriesData The series data
  * @returns {manager} the Larvitar manager
  */
-const populateLarvitarManager = function (seriesId, seriesData) {
+const populateLarvitarManager = function (larvitarSeriesInstanceUID, seriesData) {
     if (larvitarManager === null) {
         larvitarManager = {};
     }
     let data = Object.assign({}, seriesData);
     if (data.isMultiframe) {
-        (0, multiframeLoader_1.buildMultiFrameImage)(seriesId, data);
+        (0, multiframeLoader_1.buildMultiFrameImage)(larvitarSeriesInstanceUID, data);
     }
     else {
-        larvitarManager[seriesId] = data;
+        larvitarManager[larvitarSeriesInstanceUID] = data;
     }
     return larvitarManager;
 };
@@ -84644,7 +84648,7 @@ exports.loadMultiFrameImage = loadMultiFrameImage;
  * @param {String} seriesId - SeriesId tag
  * @param {Object} serie - parsed serie object
  */
-const buildMultiFrameImage = function (seriesId, serie) {
+const buildMultiFrameImage = function (larvitarSeriesInstanceUID, serie) {
     let t0 = performance.now();
     let manager = (0, commonLoader_1.getLarvitarManager)();
     let imageTracker = (0, commonLoader_1.getLarvitarImageTracker)();
@@ -84655,12 +84659,12 @@ const buildMultiFrameImage = function (seriesId, serie) {
     let sopInstanceUID = serie.metadata["x00080018"];
     let dataSet = serie.dataSet;
     let imageId = (0, exports.getMultiFrameImageId)("multiFrameLoader");
-    imageTracker[imageId] = seriesId;
+    imageTracker[imageId] = larvitarSeriesInstanceUID;
     // check if manager exists for this seriesId
-    if (!manager[seriesId]) {
-        manager[seriesId] = serie;
-        manager[seriesId].imageIds = [];
-        manager[seriesId].instances = {};
+    if (!manager[larvitarSeriesInstanceUID]) {
+        manager[larvitarSeriesInstanceUID] = serie;
+        manager[larvitarSeriesInstanceUID].imageIds = [];
+        manager[larvitarSeriesInstanceUID].instances = {};
     }
     (0, lodash_1.each)((0, lodash_1.range)(numberOfFrames), function (frameNumber) {
         let frameImageId = imageId + "?frame=" + frameNumber;
@@ -84670,10 +84674,9 @@ const buildMultiFrameImage = function (seriesId, serie) {
             tags: ["x52009230"],
             frameId: frameNumber
         });
-        // TODO-ts REMOVE "AS" WHEN METADATA VALUES ARE TYPED
         // store file references
-        const managerSeriesId = manager[seriesId];
-        managerSeriesId.seriesUID = seriesId;
+        const managerSeriesId = manager[larvitarSeriesInstanceUID];
+        managerSeriesId.seriesUID = serie.metadata["x0020000e"];
         managerSeriesId.studyUID = serie.metadata["x0020000d"];
         managerSeriesId.modality = serie.metadata["x00080060"];
         managerSeriesId.color = cornerstone_wado_image_loader_1.default.isColorImage(serie.metadata["x00280004"]);
@@ -88978,7 +88981,7 @@ module.exports = JSON.parse('{"x00000000":{"tag":"x00000000","vr":"UL","vm":"1",
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"larvitar","keywords":["DICOM","imaging","medical","cornerstone"],"version":"2.0.12","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"],"scripts":{"coverage":"typescript-coverage-report","generate-docs":"node_modules/.bin/jsdoc -c jsdoc.json","build":"webpack --config ./bundler/webpack.prod.js && cp ./dist/larvitar.js ./docs/examples/larvitar.js","dev":"webpack --progress --config ./bundler/webpack.dev.js && cp ./dist/larvitar.js ./docs/examples/larvitar.js","dev-wip":"webpack serve --config ./bundler/webpack.dev-wip.js"},"author":"Simone Manini <simone.manini@dvisionlab.com> (https://www.dvisionlab.com)","contributors":["Mattia Ronzoni <mattia.ronzoni@dvisionlab.com> (https://www.dvisionlab.com)","Sara Zanchi <sara.zanchi@dvisionlab.com> (https://www.dvisionlab.com)","Ale Re <ale.re@dvisionlab.com> (https://www.dvisionlab.com)","Laura Borghesi Re <laura.borghesi@dvisionlab.com> (https://www.dvisionlab.com)"],"license":"MIT","dependencies":{"@rollup/plugin-commonjs":"^17.1.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","dicom-character-set":"^1.0.3","dicom-parser":"^1.8.13","docdash":"^1.2.0","hammerjs":"^2.0.8","jpeg-lossless-decoder-js":"^2.0.7","keycode-js":"^3.1.0","lodash":"^4.17.15","pako":"^1.0.10","papaparse":"^5.3.0","plotly.js-dist-min":"^2.27.1","uuid":"^8.3.2"},"devDependencies":{"@babel/core":"^7.21.8","@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","babel-loader":"^9.1.2","clean-webpack-plugin":"^4.0.0","copy-webpack-plugin":"^11.0.0","fs":"^0.0.1-security","html-loader":"^4.2.0","html-webpack-plugin":"^5.5.0","ip":"^1.1.8","jsdoc":"^3.6.4","portfinder-sync":"^0.0.2","ts-loader":"^9.4.2","typescript":"^5.0.2","typescript-coverage-report":"^0.7.0","webpack":"^5.76.3","webpack-bundle-analyzer":"^4.8.0","webpack-cli":"^5.0.1","webpack-dev-server":"^4.13.1"}}');
+module.exports = JSON.parse('{"name":"larvitar","keywords":["DICOM","imaging","medical","cornerstone"],"version":"2.0.14","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"],"scripts":{"coverage":"typescript-coverage-report","generate-docs":"node_modules/.bin/jsdoc -c jsdoc.json","build":"webpack --config ./bundler/webpack.prod.js && cp ./dist/larvitar.js ./docs/examples/larvitar.js","dev":"webpack --progress --config ./bundler/webpack.dev.js && cp ./dist/larvitar.js ./docs/examples/larvitar.js","dev-wip":"webpack serve --config ./bundler/webpack.dev-wip.js"},"author":"Simone Manini <simone.manini@dvisionlab.com> (https://www.dvisionlab.com)","contributors":["Mattia Ronzoni <mattia.ronzoni@dvisionlab.com> (https://www.dvisionlab.com)","Sara Zanchi <sara.zanchi@dvisionlab.com> (https://www.dvisionlab.com)","Ale Re <ale.re@dvisionlab.com> (https://www.dvisionlab.com)","Laura Borghesi Re <laura.borghesi@dvisionlab.com> (https://www.dvisionlab.com)"],"license":"MIT","dependencies":{"@rollup/plugin-commonjs":"^17.1.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","dicom-character-set":"^1.0.3","dicom-parser":"^1.8.13","docdash":"^1.2.0","hammerjs":"^2.0.8","jpeg-lossless-decoder-js":"^2.0.7","keycode-js":"^3.1.0","lodash":"^4.17.15","pako":"^1.0.10","papaparse":"^5.3.0","plotly.js-dist-min":"^2.27.1","uuid":"^8.3.2"},"devDependencies":{"@babel/core":"^7.21.8","@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","babel-loader":"^9.1.2","clean-webpack-plugin":"^4.0.0","copy-webpack-plugin":"^11.0.0","fs":"^0.0.1-security","html-loader":"^4.2.0","html-webpack-plugin":"^5.5.0","ip":"^1.1.8","jsdoc":"^3.6.4","portfinder-sync":"^0.0.2","ts-loader":"^9.4.2","typescript":"^5.0.2","typescript-coverage-report":"^0.7.0","webpack":"^5.76.3","webpack-bundle-analyzer":"^4.8.0","webpack-cli":"^5.0.1","webpack-dev-server":"^4.13.1"}}');
 
 /***/ })