larvitar 1.2.6 → 1.2.9

package/README.md

@@ -6,11 +6,11 @@
 
 ## Dicom Image Toolkit for CornestoneJS
 
-### Current version: 1.2.6
+### Current version: 1.2.9
 
-### Latest Stable version: 1.2.6
+### Latest Stable version: 1.2.9
 
-### Latest Published Release: 1.2.6
+### Latest Published Release: 1.2.9
 
 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/imageIo.js

@@ -122,18 +122,25 @@ export const buildData = function (series, useSeriesData) {
         data.set(sliceData, offsetData);
         offsetData += sliceData.length;
       });
+      let t1 = performance.now();
+      console.log(`Call to buildData took ${t1 - t0} milliseconds.`);
+      return data;
     } else {
       larvitar_store.addSeriesIds(series.seriesUID, series.imageIds);
+      let image_counter = 0;
       forEach(series.imageIds, function (imageId) {
         getCachedPixelData(imageId).then(sliceData => {
           data.set(sliceData, offsetData);
           offsetData += sliceData.length;
+          image_counter += 1;
+          if (image_counter == series.imageIds.length) {
+            let t1 = performance.now();
+            console.log(`Call to buildData took ${t1 - t0} milliseconds.`);
+            return data;
+          }
         });
       });
     }
-    let t1 = performance.now();
-    console.log(`Call to buildData took ${t1 - t0} milliseconds.`);
-    return data;
   } else {
     throw new Error("Data has not been builded: not enough memory");
   }

package/imaging/imageLoading.js

@@ -139,6 +139,9 @@ export const updateLoadedStack = function (
   let ssid = seriesData.metadata.studyUID;
   let iid = seriesData.metadata.instanceUID;
   let seriesDescription = seriesData.metadata.seriesDescription;
+  let numberOfSlices = seriesData.metadata["x00540081"]
+    ? seriesData.metadata["x00540081"]
+    : seriesData.metadata["x00201002"];
   let numberOfFrames = seriesData.metadata["x00280008"];
   let modality = seriesData.metadata["x00080060"];
   let isMultiframe = numberOfFrames > 1 ? true : false;
@@ -158,6 +161,7 @@ export const updateLoadedStack = function (
       seriesUID: sid,
       studyUID: ssid,
       numberOfImages: 0,
+      numberOfSlices: numberOfSlices,
       numberOfFrames: numberOfFrames,
       isMultiframe: isMultiframe,
       modality: modality,

package/imaging/tools/segmentation.js

@@ -13,6 +13,8 @@ const { getters, setters } = segModule;
 // internal libraries
 import { setToolActive, setToolDisabled } from "./main";
 import { isElement } from "../imageUtils";
+import { larvitar_store } from "../imageStore";
+import { updateStackToolState } from "../imageTools";
 
 // custom code
 import { setLabelmap3DForElement } from "./setLabelMap3D";
@@ -199,6 +201,19 @@ export function addSegmentationMask(props, data, elementId) {
     // bind labelmap to colorLUT
     let labelmap3d = getters.labelmap3D(element, props.labelId);
     setters.colorLUTIndexForLabelmap3D(labelmap3d, props.labelId);
+
+    // set current imageIdIndex in tool state
+    let currentImageIdIndex = larvitar_store.get(
+      "viewports",
+      elementId,
+      "sliceId"
+    );
+    if (currentImageIdIndex !== "error" && currentImageIdIndex >= 0) {
+      updateStackToolState(elementId, currentImageIdIndex);
+    } else {
+      console.error("Cannot get currentImageIdIndex");
+    }
+
     resolve();
   });
   return promise;

package/index.js

@@ -142,7 +142,9 @@ import {
   setActiveSegment,
   undoLastStroke,
   redoLastStroke,
-  setBrushProps
+  setBrushProps,
+  hexToRgb,
+  rgbToHex
 } from "./imaging/tools/segmentation";
 
 import {
@@ -365,5 +367,7 @@ export {
   setActiveSegment,
   undoLastStroke,
   redoLastStroke,
-  setBrushProps
+  setBrushProps,
+  hexToRgb,
+  rgbToHex
 };

package/package.json

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