@cornerstonejs/core 1.10.2 → 1.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "description": "",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -46,5 +46,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "7700f91b8d72db5808a68056645792d184bf5436"
+  "gitHead": "0468aa978beba2b216674c2876d4bc4d1a9938a0"
 }

package/src/RenderingEngine/helpers/cpuFallback/rendering/getVOILut.ts

@@ -15,6 +15,11 @@
  */
 
 /**
+ * Generates the linear VOI LUT function.
+ * From the DICOM standard:
+ * https://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.11.2.1.2.1
+ * ((x - (c - 0.5)) / (w-1) + 0.5) * (ymax- ymin) + ymin
+ * clipped to the ymin...ymax range
  *
  * @param {Number} windowWidth Window Width
  * @param {Number} windowCenter Window Center
@@ -23,7 +28,10 @@
  */
 function generateLinearVOILUT(windowWidth: number, windowCenter: number) {
   return function (modalityLutValue) {
-    return ((modalityLutValue - windowCenter) / windowWidth + 0.5) * 255.0;
+    const value =
+      ((modalityLutValue - (windowCenter - 0.5)) / (windowWidth - 1) + 0.5) *
+      255.0;
+    return Math.min(Math.max(value, 0), 255);
   };
 }
 

package/src/RenderingEngine/helpers/cpuFallback/rendering/renderColorImage.ts

@@ -72,10 +72,12 @@ function getRenderCanvas(
   const renderCanvas = enabledElement.renderingTools.renderCanvas;
 
   // The ww/wc is identity and not inverted - get a canvas with the image rendered into it for
-  // Fast drawing
+  // Fast drawing.  Note that this is 256/128, and NOT 255/127, per the DICOM
+  // standard, but allow either.
+  const { windowWidth, windowCenter } = enabledElement.viewport.voi;
   if (
-    enabledElement.viewport.voi.windowWidth === 255 &&
-    enabledElement.viewport.voi.windowCenter === 127 &&
+    (windowWidth === 256 || windowWidth === 255) &&
+    (windowCenter === 128 || windowCenter === 127) &&
     enabledElement.viewport.invert === false &&
     image.getCanvas &&
     image.getCanvas()

package/src/requestPool/requestPoolManager.ts

@@ -307,7 +307,7 @@ class RequestPoolManager {
     const priorities = Object.keys(this.requestPool[type])
       .map(Number)
       .filter((priority) => this.requestPool[type][priority].length)
-      .sort();
+      .sort((a, b) => a - b);
     return priorities;
   }
 

package/src/utilities/windowLevel.ts

@@ -1,5 +1,8 @@
 /**
  * Given a low and high window level, return the window width and window center
+ * Formulas from note 4 in
+ * https://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.11.2.1.2.1
+ * extended to allow for low/high swapping
  * @param low - The low window level.
  * @param high - The high window level.
  * @returns a JavaScript object with two properties: windowWidth and windowCenter.
@@ -11,14 +14,20 @@ function toWindowLevel(
   windowWidth: number;
   windowCenter: number;
 } {
-  const windowWidth = Math.abs(low - high);
-  const windowCenter = low + windowWidth / 2;
+  // Allow for swapping high/low
+  const windowWidth = Math.abs(high - low) + 1;
+  const windowCenter = (low + high + 1) / 2;
 
   return { windowWidth, windowCenter };
 }
 
 /**
  * Given a window width and center, return the lower and upper bounds of the window
+ * The formulas for the calculation are specified in
+ * https://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.11.2.1.2.1
+ * if (x <= c - 0.5 - (w-1) /2), then y = ymin
+ * else if (x > c - 0.5 + (w-1) /2), then y = ymax
+ * else y = ((x - (c - 0.5)) / (w-1) + 0.5) * (ymax- ymin) + ymin
  * @param windowWidth - the width of the window in HU
  * @param windowCenter - The center of the window.
  * @returns a JavaScript object with two properties: lower and upper.
@@ -30,8 +39,8 @@ function toLowHighRange(
   lower: number;
   upper: number;
 } {
-  const lower = windowCenter - windowWidth / 2.0;
-  const upper = windowCenter + windowWidth / 2.0;
+  const lower = windowCenter - 0.5 - (windowWidth - 1) / 2;
+  const upper = windowCenter - 0.5 + (windowWidth - 1) / 2;
 
   return { lower, upper };
 }