@cornerstonejs/core 0.46.1 → 0.46.2
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.
- package/dist/cjs/utilities/renderToCanvasGPU.js +8 -1
- package/dist/cjs/utilities/renderToCanvasGPU.js.map +1 -1
- package/dist/esm/utilities/renderToCanvasGPU.js +8 -1
- package/dist/esm/utilities/renderToCanvasGPU.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +2 -2
- package/src/utilities/renderToCanvasGPU.ts +23 -1
|
@@ -20,6 +20,13 @@ function renderToCanvasGPU(canvas, image, modality = undefined, renderingEngineI
|
|
|
20
20
|
element.style.height = `${canvas.height}px`;
|
|
21
21
|
element.style.visibility = 'hidden';
|
|
22
22
|
element.style.position = 'absolute';
|
|
23
|
+
const devicePixelRatio = window.devicePixelRatio || 1;
|
|
24
|
+
const originalWidth = canvas.width;
|
|
25
|
+
const originalHeight = canvas.height;
|
|
26
|
+
canvas.width = originalWidth * devicePixelRatio;
|
|
27
|
+
canvas.height = originalHeight * devicePixelRatio;
|
|
28
|
+
canvas.style.width = `${originalWidth}px`;
|
|
29
|
+
canvas.style.height = `${originalHeight}px`;
|
|
23
30
|
document.body.appendChild(element);
|
|
24
31
|
const uniqueId = viewportId.split(':').join('-');
|
|
25
32
|
element.setAttribute('viewport-id-for-remove', uniqueId);
|
|
@@ -46,7 +53,7 @@ function renderToCanvasGPU(canvas, image, modality = undefined, renderingEngineI
|
|
|
46
53
|
}
|
|
47
54
|
const temporaryCanvas = (0, getOrCreateCanvas_1.default)(element);
|
|
48
55
|
const context = canvas.getContext('2d');
|
|
49
|
-
context.drawImage(temporaryCanvas, 0, 0);
|
|
56
|
+
context.drawImage(temporaryCanvas, 0, 0, temporaryCanvas.width, temporaryCanvas.height, 0, 0, canvas.width, canvas.height);
|
|
50
57
|
elementRendered = true;
|
|
51
58
|
element.removeEventListener(enums_1.Events.IMAGE_RENDERED, onImageRendered);
|
|
52
59
|
setTimeout(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderToCanvasGPU.js","sourceRoot":"","sources":["../../../src/utilities/renderToCanvasGPU.ts"],"names":[],"mappings":";;;;;AAAA,qGAA6E;AAC7E,oCAAgD;AAGhD,8EAA2E;AAC3E,yEAAiD;AACjD,kFAA0D;AAqB1D,SAAwB,iBAAiB,CACvC,MAAyB,EACzB,KAAa,EACb,QAAQ,GAAG,SAAS,EACpB,iBAAiB,GAAG,aAAa;IAEjC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,YAAY,iBAAiB,CAAC,EAAE;QACrD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IAED,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC;IACrC,MAAM,UAAU,GAAG,qBAAqB,cAAc,EAAE,CAAC;IACzD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC9B,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9C,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,MAAM,CAAC,KAAK,IAAI,CAAC;IAC1C,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC;IAC5C,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC;IACpC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"renderToCanvasGPU.js","sourceRoot":"","sources":["../../../src/utilities/renderToCanvasGPU.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,13 @@ export default function renderToCanvasGPU(canvas, image, modality = undefined, r
|
|
|
15
15
|
element.style.height = `${canvas.height}px`;
|
|
16
16
|
element.style.visibility = 'hidden';
|
|
17
17
|
element.style.position = 'absolute';
|
|
18
|
+
const devicePixelRatio = window.devicePixelRatio || 1;
|
|
19
|
+
const originalWidth = canvas.width;
|
|
20
|
+
const originalHeight = canvas.height;
|
|
21
|
+
canvas.width = originalWidth * devicePixelRatio;
|
|
22
|
+
canvas.height = originalHeight * devicePixelRatio;
|
|
23
|
+
canvas.style.width = `${originalWidth}px`;
|
|
24
|
+
canvas.style.height = `${originalHeight}px`;
|
|
18
25
|
document.body.appendChild(element);
|
|
19
26
|
const uniqueId = viewportId.split(':').join('-');
|
|
20
27
|
element.setAttribute('viewport-id-for-remove', uniqueId);
|
|
@@ -41,7 +48,7 @@ export default function renderToCanvasGPU(canvas, image, modality = undefined, r
|
|
|
41
48
|
}
|
|
42
49
|
const temporaryCanvas = getOrCreateCanvas(element);
|
|
43
50
|
const context = canvas.getContext('2d');
|
|
44
|
-
context.drawImage(temporaryCanvas, 0, 0);
|
|
51
|
+
context.drawImage(temporaryCanvas, 0, 0, temporaryCanvas.width, temporaryCanvas.height, 0, 0, canvas.width, canvas.height);
|
|
45
52
|
elementRendered = true;
|
|
46
53
|
element.removeEventListener(Events.IMAGE_RENDERED, onImageRendered);
|
|
47
54
|
setTimeout(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderToCanvasGPU.js","sourceRoot":"","sources":["../../../src/utilities/renderToCanvasGPU.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,8CAA8C,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,eAAe,MAAM,oBAAoB,CAAC;AACjD,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAqB1D,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,MAAyB,EACzB,KAAa,EACb,QAAQ,GAAG,SAAS,EACpB,iBAAiB,GAAG,aAAa;IAEjC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,YAAY,iBAAiB,CAAC,EAAE;QACrD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IAED,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC;IACrC,MAAM,UAAU,GAAG,qBAAqB,cAAc,EAAE,CAAC;IACzD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC9B,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9C,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,MAAM,CAAC,KAAK,IAAI,CAAC;IAC1C,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC;IAC5C,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC;IACpC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"renderToCanvasGPU.js","sourceRoot":"","sources":["../../../src/utilities/renderToCanvasGPU.ts"],"names":[],"mappings":"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"}
|