@cornerstonejs/core 1.10.1 → 1.10.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,7 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  function generateLinearVOILUT(windowWidth, windowCenter) {
4
4
  return function (modalityLutValue) {
5
- return ((modalityLutValue - windowCenter) / windowWidth + 0.5) * 255.0;
5
+ const value = ((modalityLutValue - (windowCenter - 0.5)) / (windowWidth - 1) + 0.5) *
6
+ 255.0;
7
+ return Math.min(Math.max(value, 0), 255);
6
8
  };
7
9
  }
8
10
  function generateNonLinearVOILUT(voiLUT) {
@@ -1 +1 @@
1
- {"version":3,"file":"getVOILut.js","sourceRoot":"","sources":["../../../../../../src/RenderingEngine/helpers/cpuFallback/rendering/getVOILut.ts"],"names":[],"mappings":";;AAuBA,SAAS,oBAAoB,CAAC,WAAmB,EAAE,YAAoB;IACrE,OAAO,UAAU,gBAAgB;QAC/B,OAAO,CAAC,CAAC,gBAAgB,GAAG,YAAY,CAAC,GAAG,WAAW,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC;IACzE,CAAC,CAAC;AACJ,CAAC;AAUD,SAAS,uBAAuB,CAAC,MAAM;IAErC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAChE,MAAM,KAAK,GAAG,YAAY,GAAG,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;IACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC;IAC5D,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;IAEvE,OAAO,UAAU,gBAAgB;QAC/B,IAAI,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,EAAE;YAC9C,OAAO,QAAQ,CAAC;SACjB;aAAM,IAAI,gBAAgB,IAAI,cAAc,EAAE;YAC7C,OAAO,QAAQ,CAAC;SACjB;QAED,OAAO,MAAM,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,KAAK,CAAC;IACzE,CAAC,CAAC;AACJ,CAAC;AAaD,mBAAyB,WAAmB,EAAE,YAAoB,EAAE,MAAM;IACxE,IAAI,MAAM,EAAE;QACV,OAAO,uBAAuB,CAAC,MAAM,CAAC,CAAC;KACxC;IAED,OAAO,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;AACzD,CAAC;AAND,4BAMC"}
1
+ {"version":3,"file":"getVOILut.js","sourceRoot":"","sources":["../../../../../../src/RenderingEngine/helpers/cpuFallback/rendering/getVOILut.ts"],"names":[],"mappings":";;AA4BA,SAAS,oBAAoB,CAAC,WAAmB,EAAE,YAAoB;IACrE,OAAO,UAAU,gBAAgB;QAC/B,MAAM,KAAK,GACT,CAAC,CAAC,gBAAgB,GAAG,CAAC,YAAY,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;YACrE,KAAK,CAAC;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC;AAUD,SAAS,uBAAuB,CAAC,MAAM;IAErC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAChE,MAAM,KAAK,GAAG,YAAY,GAAG,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;IACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC;IAC5D,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;IAEvE,OAAO,UAAU,gBAAgB;QAC/B,IAAI,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,EAAE;YAC9C,OAAO,QAAQ,CAAC;SACjB;aAAM,IAAI,gBAAgB,IAAI,cAAc,EAAE;YAC7C,OAAO,QAAQ,CAAC;SACjB;QAED,OAAO,MAAM,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,KAAK,CAAC;IACzE,CAAC,CAAC;AACJ,CAAC;AAaD,mBAAyB,WAAmB,EAAE,YAAoB,EAAE,MAAM;IACxE,IAAI,MAAM,EAAE;QACV,OAAO,uBAAuB,CAAC,MAAM,CAAC,CAAC;KACxC;IAED,OAAO,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;AACzD,CAAC;AAND,4BAMC"}
@@ -32,8 +32,9 @@ function getRenderCanvas(enabledElement, image, invalidated) {
32
32
  document.createElement('canvas');
33
33
  }
34
34
  const renderCanvas = enabledElement.renderingTools.renderCanvas;
35
- if (enabledElement.viewport.voi.windowWidth === 255 &&
36
- enabledElement.viewport.voi.windowCenter === 127 &&
35
+ const { windowWidth, windowCenter } = enabledElement.viewport.voi;
36
+ if ((windowWidth === 256 || windowWidth === 255) &&
37
+ (windowCenter === 128 || windowCenter === 127) &&
37
38
  enabledElement.viewport.invert === false &&
38
39
  image.getCanvas &&
39
40
  image.getCanvas()) {
@@ -1 +1 @@
1
- {"version":3,"file":"renderColorImage.js","sourceRoot":"","sources":["../../../../../../src/RenderingEngine/helpers/cpuFallback/rendering/renderColorImage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"renderColorImage.js","sourceRoot":"","sources":["../../../../../../src/RenderingEngine/helpers/cpuFallback/rendering/renderColorImage.ts"],"names":[],"mappings":"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"}
@@ -2,14 +2,14 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.toLowHighRange = exports.toWindowLevel = void 0;
4
4
  function toWindowLevel(low, high) {
5
- const windowWidth = Math.abs(low - high);
6
- const windowCenter = low + windowWidth / 2;
5
+ const windowWidth = Math.abs(high - low) + 1;
6
+ const windowCenter = (low + high + 1) / 2;
7
7
  return { windowWidth, windowCenter };
8
8
  }
9
9
  exports.toWindowLevel = toWindowLevel;
10
10
  function toLowHighRange(windowWidth, windowCenter) {
11
- const lower = windowCenter - windowWidth / 2.0;
12
- const upper = windowCenter + windowWidth / 2.0;
11
+ const lower = windowCenter - 0.5 - (windowWidth - 1) / 2;
12
+ const upper = windowCenter - 0.5 + (windowWidth - 1) / 2;
13
13
  return { lower, upper };
14
14
  }
15
15
  exports.toLowHighRange = toLowHighRange;
@@ -1 +1 @@
1
- {"version":3,"file":"windowLevel.js","sourceRoot":"","sources":["../../../src/utilities/windowLevel.ts"],"names":[],"mappings":";;;AAMA,SAAS,aAAa,CACpB,GAAW,EACX,IAAY;IAKZ,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,GAAG,GAAG,WAAW,GAAG,CAAC,CAAC;IAE3C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AACvC,CAAC;AAqBQ,sCAAa;AAbtB,SAAS,cAAc,CACrB,WAAmB,EACnB,YAAoB;IAKpB,MAAM,KAAK,GAAG,YAAY,GAAG,WAAW,GAAG,GAAG,CAAC;IAC/C,MAAM,KAAK,GAAG,YAAY,GAAG,WAAW,GAAG,GAAG,CAAC;IAE/C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC;AAEuB,wCAAc"}
1
+ {"version":3,"file":"windowLevel.js","sourceRoot":"","sources":["../../../src/utilities/windowLevel.ts"],"names":[],"mappings":";;;AASA,SAAS,aAAa,CACpB,GAAW,EACX,IAAY;IAMZ,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IAE1C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AACvC,CAAC;AA0BQ,sCAAa;AAbtB,SAAS,cAAc,CACrB,WAAmB,EACnB,YAAoB;IAKpB,MAAM,KAAK,GAAG,YAAY,GAAG,GAAG,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,YAAY,GAAG,GAAG,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IAEzD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC;AAEuB,wCAAc"}
@@ -1,6 +1,8 @@
1
1
  function generateLinearVOILUT(windowWidth, windowCenter) {
2
2
  return function (modalityLutValue) {
3
- return ((modalityLutValue - windowCenter) / windowWidth + 0.5) * 255.0;
3
+ const value = ((modalityLutValue - (windowCenter - 0.5)) / (windowWidth - 1) + 0.5) *
4
+ 255.0;
5
+ return Math.min(Math.max(value, 0), 255);
4
6
  };
5
7
  }
6
8
  function generateNonLinearVOILUT(voiLUT) {
@@ -1 +1 @@
1
- {"version":3,"file":"getVOILut.js","sourceRoot":"","sources":["../../../../../../src/RenderingEngine/helpers/cpuFallback/rendering/getVOILut.ts"],"names":[],"mappings":"AAuBA,SAAS,oBAAoB,CAAC,WAAmB,EAAE,YAAoB;IACrE,OAAO,UAAU,gBAAgB;QAC/B,OAAO,CAAC,CAAC,gBAAgB,GAAG,YAAY,CAAC,GAAG,WAAW,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC;IACzE,CAAC,CAAC;AACJ,CAAC;AAUD,SAAS,uBAAuB,CAAC,MAAM;IAErC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAChE,MAAM,KAAK,GAAG,YAAY,GAAG,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;IACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC;IAC5D,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;IAEvE,OAAO,UAAU,gBAAgB;QAC/B,IAAI,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,EAAE;YAC9C,OAAO,QAAQ,CAAC;SACjB;aAAM,IAAI,gBAAgB,IAAI,cAAc,EAAE;YAC7C,OAAO,QAAQ,CAAC;SACjB;QAED,OAAO,MAAM,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,KAAK,CAAC;IACzE,CAAC,CAAC;AACJ,CAAC;AAaD,MAAM,CAAC,OAAO,WAAW,WAAmB,EAAE,YAAoB,EAAE,MAAM;IACxE,IAAI,MAAM,EAAE;QACV,OAAO,uBAAuB,CAAC,MAAM,CAAC,CAAC;KACxC;IAED,OAAO,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;AACzD,CAAC"}
1
+ {"version":3,"file":"getVOILut.js","sourceRoot":"","sources":["../../../../../../src/RenderingEngine/helpers/cpuFallback/rendering/getVOILut.ts"],"names":[],"mappings":"AA4BA,SAAS,oBAAoB,CAAC,WAAmB,EAAE,YAAoB;IACrE,OAAO,UAAU,gBAAgB;QAC/B,MAAM,KAAK,GACT,CAAC,CAAC,gBAAgB,GAAG,CAAC,YAAY,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;YACrE,KAAK,CAAC;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC;AAUD,SAAS,uBAAuB,CAAC,MAAM;IAErC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAChE,MAAM,KAAK,GAAG,YAAY,GAAG,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;IACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC;IAC5D,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;IAEvE,OAAO,UAAU,gBAAgB;QAC/B,IAAI,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,EAAE;YAC9C,OAAO,QAAQ,CAAC;SACjB;aAAM,IAAI,gBAAgB,IAAI,cAAc,EAAE;YAC7C,OAAO,QAAQ,CAAC;SACjB;QAED,OAAO,MAAM,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,KAAK,CAAC;IACzE,CAAC,CAAC;AACJ,CAAC;AAaD,MAAM,CAAC,OAAO,WAAW,WAAmB,EAAE,YAAoB,EAAE,MAAM;IACxE,IAAI,MAAM,EAAE;QACV,OAAO,uBAAuB,CAAC,MAAM,CAAC,CAAC;KACxC;IAED,OAAO,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;AACzD,CAAC"}
@@ -26,8 +26,9 @@ function getRenderCanvas(enabledElement, image, invalidated) {
26
26
  document.createElement('canvas');
27
27
  }
28
28
  const renderCanvas = enabledElement.renderingTools.renderCanvas;
29
- if (enabledElement.viewport.voi.windowWidth === 255 &&
30
- enabledElement.viewport.voi.windowCenter === 127 &&
29
+ const { windowWidth, windowCenter } = enabledElement.viewport.voi;
30
+ if ((windowWidth === 256 || windowWidth === 255) &&
31
+ (windowCenter === 128 || windowCenter === 127) &&
31
32
  enabledElement.viewport.invert === false &&
32
33
  image.getCanvas &&
33
34
  image.getCanvas()) {
@@ -1 +1 @@
1
- {"version":3,"file":"renderColorImage.js","sourceRoot":"","sources":["../../../../../../src/RenderingEngine/helpers/cpuFallback/rendering/renderColorImage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"renderColorImage.js","sourceRoot":"","sources":["../../../../../../src/RenderingEngine/helpers/cpuFallback/rendering/renderColorImage.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,11 @@
1
1
  function toWindowLevel(low, high) {
2
- const windowWidth = Math.abs(low - high);
3
- const windowCenter = low + windowWidth / 2;
2
+ const windowWidth = Math.abs(high - low) + 1;
3
+ const windowCenter = (low + high + 1) / 2;
4
4
  return { windowWidth, windowCenter };
5
5
  }
6
6
  function toLowHighRange(windowWidth, windowCenter) {
7
- const lower = windowCenter - windowWidth / 2.0;
8
- const upper = windowCenter + windowWidth / 2.0;
7
+ const lower = windowCenter - 0.5 - (windowWidth - 1) / 2;
8
+ const upper = windowCenter - 0.5 + (windowWidth - 1) / 2;
9
9
  return { lower, upper };
10
10
  }
11
11
  export { toWindowLevel, toLowHighRange };
@@ -1 +1 @@
1
- {"version":3,"file":"windowLevel.js","sourceRoot":"","sources":["../../../src/utilities/windowLevel.ts"],"names":[],"mappings":"AAMA,SAAS,aAAa,CACpB,GAAW,EACX,IAAY;IAKZ,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,GAAG,GAAG,WAAW,GAAG,CAAC,CAAC;IAE3C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AACvC,CAAC;AAQD,SAAS,cAAc,CACrB,WAAmB,EACnB,YAAoB;IAKpB,MAAM,KAAK,GAAG,YAAY,GAAG,WAAW,GAAG,GAAG,CAAC;IAC/C,MAAM,KAAK,GAAG,YAAY,GAAG,WAAW,GAAG,GAAG,CAAC;IAE/C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC"}
1
+ {"version":3,"file":"windowLevel.js","sourceRoot":"","sources":["../../../src/utilities/windowLevel.ts"],"names":[],"mappings":"AASA,SAAS,aAAa,CACpB,GAAW,EACX,IAAY;IAMZ,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IAE1C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AACvC,CAAC;AAaD,SAAS,cAAc,CACrB,WAAmB,EACnB,YAAoB;IAKpB,MAAM,KAAK,GAAG,YAAY,GAAG,GAAG,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,YAAY,GAAG,GAAG,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IAEzD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC"}