larvitar 1.2.2 → 1.2.5

package/README.md

@@ -6,11 +6,11 @@
 
 ## Dicom Image Toolkit for CornestoneJS
 
-### Current version: 1.2.2
+### Current version: 1.2.5
 
-### Latest Stable version: 1.2.2
+### Latest Stable version: 1.2.5
 
-### Latest Published Release: 1.2.2
+### Latest Published Release: 1.2.5
 
 This library provides common DICOM functionalities to be used in web-applications: it's wrapper that simplifies the use of cornestone-js environment.
 Orthogonal multiplanar reformat is included as well as custom loader/exporter for nrrd files and [Vuex](https://vuex.vuejs.org/) custom integration.

package/imaging/imageParsing.js

@@ -278,6 +278,7 @@ let parseFile = function (file) {
               imageObject.metadata.frameTime = metadata["x00181063"];
               imageObject.metadata.frameDelay = metadata["x00181066"];
             }
+            imageObject.metadata.isMultiframe = isMultiframe;
             imageObject.metadata.windowCenter = metadata["x00281050"];
             imageObject.metadata.windowWidth = metadata["x00281051"];
             imageObject.metadata.minPixelValue = metadata["x00280106"];

package/imaging/imageRendering.js

@@ -253,7 +253,6 @@ export const resizeViewport = function (elementId) {
  */
 export const renderImage = function (seriesStack, elementId, defaultProps) {
   let t0 = performance.now();
-
   // get element and enable it
   let element = isElement(elementId)
     ? elementId
@@ -266,9 +265,6 @@ export const renderImage = function (seriesStack, elementId, defaultProps) {
 
   let series = { ...seriesStack };
 
-  // default to 0 if multiframe and frameId is null
-  // let frameId = series.isMultiframe ? 1 : null;
-
   larvitar_store.set("renderingStatus", [elementId, false]);
   let data = getSeriesData(series, defaultProps);
   if (!data.imageId) {
@@ -328,20 +324,7 @@ export const renderImage = function (seriesStack, elementId, defaultProps) {
       }
 
       let storedViewport = cornerstone.getViewport(element);
-      storeViewportData(
-        image,
-        elementId,
-        data.imageIndex,
-        data.numberOfSlices,
-        data.rows,
-        data.cols,
-        data.spacing_x,
-        data.spacing_y,
-        data.thickness,
-        storedViewport,
-        data.defaultWW,
-        data.defaultWC
-      );
+      storeViewportData(image, elementId, storedViewport, data);
       larvitar_store.set("renderingStatus", [elementId, true]);
       let t1 = performance.now();
       console.log(`Call to renderImage took ${t1 - t0} milliseconds.`);
@@ -385,17 +368,23 @@ export const updateImage = function (
     console.log("not element");
     return;
   }
-  let index = imageIndex == 0 ? imageIndex : imageIndex - 1;
-  if (cacheImage) {
-    cornerstone
-      .loadAndCacheImage(series.imageIds[index])
-      .then(function (image) {
+  let imageId = series.imageIds[imageIndex];
+  if (imageId) {
+    if (cacheImage) {
+      cornerstone.loadAndCacheImage(imageId).then(function (image) {
         cornerstone.displayImage(element, image);
+        larvitar_store.set("sliceId", [elementId, imageIndex]);
       });
+    } else {
+      cornerstone.loadImage(imageId).then(function (image) {
+        cornerstone.displayImage(element, image);
+        larvitar_store.set("sliceId", [elementId, imageIndex]);
+      });
+    }
   } else {
-    cornerstone.loadImage(series.imageIds[index]).then(function (image) {
-      cornerstone.displayImage(element, image);
-    });
+    console.warn(
+      `Error: wrong image index ${imageIndex}, no imageId available`
+    );
   }
 };
 
@@ -534,47 +523,27 @@ export const updateViewportData = function (
  * @function storeViewportData
  * @param {Object} image - The cornerstone image frame
  * @param {String} elementId - The html div id used for rendering
- * @param {Number} imageIndex - The index of the image
- * @param {Number} numberOfSlices - The number of slices of the series
- * @param {Number} rows - The number of rows of the image
- * @param {Number} cols - The number of columns of the image
- * @param {Number} spacing_x - The spacing value for x axis
- * @param {Number} spacing_y - The spacing value for y direction
- * @param {Number} thickness - The thickness value between slices
  * @param {String} viewport - The viewport tag name
- * @param {Number} defaultWW - The default WW value
- * @param {Number} defaultWC - The default WC value
+ * @param {Object} data - The viewport data object
  */
-export const storeViewportData = function (
-  image,
-  elementId,
-  imageIndex,
-  numberOfSlices,
-  rows,
-  cols,
-  spacing_x,
-  spacing_y,
-  thickness,
-  viewport,
-  defaultWW,
-  defaultWC
-) {
-  larvitar_store.set("dimensions", [elementId, rows, cols]);
-  larvitar_store.set("spacing", [elementId, spacing_x, spacing_y]);
-  larvitar_store.set("thickness", [elementId, thickness]);
+export const storeViewportData = function (image, elementId, viewport, data) {
+  larvitar_store.set("dimensions", [elementId, data.rows, data.cols]);
+  larvitar_store.set("spacing", [elementId, data.spacing_x, data.spacing_y]);
+  larvitar_store.set("thickness", [elementId, data.thickness]);
   larvitar_store.set("minPixelValue", [elementId, image.minPixelValue]);
   larvitar_store.set("maxPixelValue", [elementId, image.maxPixelValue]);
-  larvitar_store.set("minSliceId", [elementId, 1]);
-  larvitar_store.set("sliceId", [elementId, imageIndex]);
-  larvitar_store.set("maxSliceId", [elementId, numberOfSlices]);
+  // slice id from 0 to n - 1
+  larvitar_store.set("minSliceId", [elementId, 0]);
+  larvitar_store.set("sliceId", [elementId, data.imageIndex]);
+  larvitar_store.set("maxSliceId", [elementId, data.numberOfSlices - 1]);
   larvitar_store.set("defaultViewport", [
     elementId,
     viewport.scale,
     viewport.rotation,
     viewport.translation.x,
     viewport.translation.y,
-    defaultWW,
-    defaultWC
+    data.defaultWW,
+    data.defaultWC
   ]);
   larvitar_store.set("scale", [elementId, viewport.scale]);
   larvitar_store.set("rotation", [elementId, viewport.rotation]);
@@ -588,6 +557,9 @@ export const storeViewportData = function (
     viewport.voi.windowWidth,
     viewport.voi.windowCenter
   ]);
+  larvitar_store.set("isColor", [elementId, data.isColor]);
+  larvitar_store.set("isMultiframe", [elementId, data.isMultiframe]);
+  larvitar_store.set("isTimeserie", [elementId, data.isTimeserie]);
 };
 
 /**
@@ -697,12 +669,13 @@ export const rotateImageRight = function (elementId) {
  */
 let getSeriesData = function (series, defaultProps) {
   let data = {};
-  // image index
   if (series.isMultiframe) {
+    data.isMultiframe = true;
     data.numberOfSlices = series.imageIds.length;
-    data.imageIndex = 1;
-    data.imageId = series.imageIds[0];
+    data.imageIndex = 0;
+    data.imageId = series.imageIds[data.imageIndex];
   } else {
+    data.isMultiframe = false;
     data.numberOfSlices =
       defaultProps && has(defaultProps, "numberOfSlices")
         ? defaultProps["numberOfSlices"]
@@ -711,15 +684,15 @@ let getSeriesData = function (series, defaultProps) {
     data.imageIndex =
       defaultProps &&
       has(defaultProps, "sliceNumber") &&
-      defaultProps["sliceNumber"] <= data.numberOfSlices
+      defaultProps["sliceNumber"] >= 0 && // slice number between 0 and n-1
+      defaultProps["sliceNumber"] < data.numberOfSlices
         ? defaultProps["sliceNumber"]
         : Math.floor(data.numberOfSlices / 2);
 
-    data.imageId =
-      data.imageIndex > 0
-        ? series.imageIds[data.imageIndex - 1]
-        : series.imageIds[0];
+    data.imageId = series.imageIds[data.imageIndex];
   }
+  data.isColor = series.color;
+  data.isTimeserie = false; // TODO 4D
 
   // rows, cols and x y z spacing
   data.rows = series.instances[series.imageIds[0]].metadata["x00280010"];

package/imaging/imageStore.js

@@ -22,6 +22,9 @@ const DEFAULT_VIEWPORT = {
   thickness: 0.0,
   minPixelValue: 0,
   maxPixelValue: 0,
+  isColor: false,
+  isMultiframe: false,
+  isTimeserie: false,
   viewport: {
     scale: 0.0,
     rotation: 0.0,
@@ -66,7 +69,6 @@ class Larvitar_Store {
     this.vuex_store = vuex_store;
     this.vuex_module = vuex_module;
     this.state = {
-      manager: null,
       series: {}, // seriesUID: {imageIds:[], progress:value}
       leftActiveTool: "Wwwc",
       rightActiveTool: "Zoom",
@@ -230,6 +232,12 @@ class Larvitar_Store {
         this.state["viewports"][data[0]]["maxSliceId"] = data[1];
       } else if (field == "sliceId") {
         this.state["viewports"][data[0]]["sliceId"] = data[1];
+      } else if (field == "isColor") {
+        this.state["viewports"][data[0]]["isColor"] = data[1];
+      } else if (field == "isMultiframe") {
+        this.state["viewports"][data[0]]["isMultiframe"] = data[1];
+      } else if (field == "isTimeserie") {
+        this.state["viewports"][data[0]]["isTimeserie"] = data[1];
       } else if (field == "defaultViewport") {
         this.state["viewports"][data[0]]["default"]["scale"] = data[1];
         this.state["viewports"][data[0]]["default"]["rotation"] = data[2];
@@ -243,8 +251,6 @@ class Larvitar_Store {
           data[6];
       } else if (field == "progress") {
         this.state.series[data[0]]["progress"] = data[1];
-      } else if (field == "manager") {
-        this.state.manager = data;
       } else {
         if (Array.isArray(data)) {
           this.state[field][data[0]] = data[1];

package/imaging/loaders/commonLoader.js

@@ -38,10 +38,14 @@ export const updateLarvitarManager = function (imageObject, customId) {
   if (larvitarManager === null) {
     larvitarManager = {};
   }
+
   let seriesId = customId || imageObject.seriesUID;
   let data = { ...imageObject };
-  if (data.isMultiframe) {
-    buildMultiFrameImage(seriesId, data);
+
+  if (data.metadata.isMultiframe) {
+    seriesId = customId || imageObject.metadata.seriesUID;
+    updateLoadedStack(data, larvitarManager, customId);
+    buildMultiFrameImage(seriesId, larvitarManager[seriesId]);
   } else {
     updateLoadedStack(data, larvitarManager, customId);
   }

package/modules/vuex/larvitar.js

@@ -15,6 +15,9 @@ const DEFAULT_VIEWPORT = {
   thickness: 0.0,
   minPixelValue: 0,
   maxPixelValue: 0,
+  isColor: false,
+  isMultiframe: false,
+  isTimeserie: false,
   viewport: {
     scale: 0.0,
     rotation: 0.0,
@@ -46,7 +49,6 @@ export default {
     colormapId: "gray",
     leftActiveTool: "Wwwc",
     rightActiveTool: "Wwwc",
-    manager: null,
     series: {}, // seriesUID: {imageIds:[], progress:value}
     viewports: {}
   },
@@ -90,7 +92,6 @@ export default {
     },
     deleteViewport: ({ state }, viewportId) =>
       Vue.delete(state.viewports, viewportId),
-    setManager: ({ state }, value) => (state.manager = value),
     setLeftActiveTool: ({ commit }, value) => {
       commit("leftActiveTool", { d: { value } });
     },
@@ -127,6 +128,12 @@ export default {
       commit("viewport", { id, d: { maxSliceId } }),
     setSliceId: ({ commit }, [id, sliceId]) =>
       commit("viewport", { id, d: { sliceId } }),
+    setIsColor: ({ commit }, [id, isColor]) =>
+      commit("viewport", { id, d: { isColor } }),
+    setIsMultiframe: ({ commit }, [id, isMultiframe]) =>
+      commit("viewport", { id, d: { isMultiframe } }),
+    setIsTimeserie: ({ commit }, [id, isTimeserie]) =>
+      commit("viewport", { id, d: { isTimeserie } }),
     setDefaultViewport: (
       { commit },
       [id, scale, rotation, x, y, windowWidth, windowCenter]

package/package.json

@@ -6,7 +6,7 @@
     "medical",
     "cornerstone"
   ],
-  "version": "1.2.2",
+  "version": "1.2.5",
   "description": "javascript library for parsing, loading, rendering and interacting with DICOM images",
   "repository": {
     "url": "https://github.com/dvisionlab/Larvitar.git",
@@ -29,11 +29,11 @@
     "cornerstone-core": "^2.6.1",
     "cornerstone-file-image-loader": "^0.3.0",
     "cornerstone-tools": "^6.0.6",
-    "cornerstone-wado-image-loader": "^4.0.1",
+    "cornerstone-wado-image-loader": "^4.1.2",
     "cornerstone-web-image-loader": "^2.1.1",
     "crypto-js": "^4.1.1",
     "dicom-character-set": "^1.0.3",
-    "dicom-parser": "^1.8.11",
+    "dicom-parser": "^1.8.13",
     "docdash": "^1.2.0",
     "hammerjs": "^2.0.8",
     "keycode-js": "^3.1.0",