@cornerstonejs/core 2.0.0-beta.1 → 2.0.0-beta.2

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 };
 }