larvitar 1.2.4 → 1.2.7

package/README.md

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

@@ -27,8 +27,12 @@ import { loadMultiFrameImage } from "./loaders/multiframeLoader";
  * @property {} - see https://github.com/cornerstonejs/cornerstoneWADOImageLoader/blob/master/docs/WebWorkers.md
  */
 
+const MAX_CONCURRENCY = 6;
 const globalConfig = {
-  maxWebWorkers: navigator.hardwareConcurrency || 1,
+  maxWebWorkers: Math.max(
+    Math.min(navigator.hardwareConcurrency - 1, MAX_CONCURRENCY),
+    1
+  ),
   startWebWorkersOnDemand: true,
   webWorkerTaskPaths: [
     "https://unpkg.com/cornerstone-wado-image-loader@4.1.0/dist/610.bundle.min.worker.js",

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) {
@@ -372,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`
+    );
   }
 };
 
@@ -530,9 +532,10 @@ export const storeViewportData = function (image, elementId, viewport, data) {
   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]);
+  // 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]);
+  larvitar_store.set("maxSliceId", [elementId, data.numberOfSlices - 1]);
   larvitar_store.set("defaultViewport", [
     elementId,
     viewport.scale,
@@ -666,12 +669,11 @@ 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 =
@@ -682,14 +684,12 @@ 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

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.4",
+  "version": "1.2.7",
   "description": "javascript library for parsing, loading, rendering and interacting with DICOM images",
   "repository": {
     "url": "https://github.com/dvisionlab/Larvitar.git",