Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated the CLUT lookup: rgba #615

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+35 −10
Open

Updated the CLUT lookup: rgba #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53d5f0c
feat: Updated the CLUT lookup: rgba
David2k13 Mar 3, 2023
fcd4211
perf: drawImageSyncHandler
David2k13 Jan 16, 2024
4c4ee60
fix: renderColorImage with @Cornerstonejs/dicom-image-loader
David2k13 Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/webpack/webpack-base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ module.exports = {
devtool: 'source-map',
externals: {},
module: {
rules: [{
rules: [/* {
enforce: 'pre',
test: /\.js$/,
exclude: /(node_modules)/,
loader: 'eslint-loader',
options: {
failOnError: false
}
}, {
},*/{
test: /\.js|ts$/,
exclude: /(node_modules)/,
use: [{
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "cornerstone-core",
"version": "0.0.0-semantically-released",
"description": "HTML5 Medical Image Viewer Component",
"main": "./dist/cornerstone.js",
"main": "./src/index.js",
"keywords": [
"DICOM",
"medical",
Expand All @@ -11,7 +11,7 @@
"author": "Chris Hafey",
"homepage": "https://github.com/cornerstonejs/cornerstone",
"license": "MIT",
"module": "./dist/cornerstone.js",
"module": "./src/index.js",
"repository": {
"type": "git",
"url": "https://github.com/cornerstonejs/cornerstone.git"
Expand Down Expand Up @@ -56,7 +56,7 @@
"cz-conventional-changelog": "^3.3.0",
"docdash": "^1.0.0",
"documentation": "^13.2.5",
"eslint": "^5.5.0",
"eslint": "^6.8.0",
"eslint-loader": "^2.1.0",
"eslint-plugin-import": "^2.14.0",
"gitbook-plugin-edit-link": "^2.0.2",
Expand Down
5 changes: 4 additions & 1 deletion src/internal/drawImageSync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import EVENTS from '../events.js';
* @returns {void}
* @memberof Internal
*/
export default function (enabledElement, invalidated) {
export default async function (enabledElement, invalidated) {
const image = enabledElement.image;
const element = enabledElement.element;
const layers = enabledElement.layers || [];
Expand Down Expand Up @@ -53,6 +53,7 @@ export default function (enabledElement, invalidated) {
} else {
render = renderGrayscaleImage;
}
image._render = render
}

render(enabledElement, invalidated);
Expand All @@ -77,5 +78,7 @@ export default function (enabledElement, invalidated) {
enabledElement.invalid = false;
enabledElement.needsRedraw = false;

await globalThis.drawImageSyncHandler?.(eventData)

triggerEvent(element, EVENTS.IMAGE_RENDERED, eventData);
}
26 changes: 24 additions & 2 deletions src/internal/storedPixelDataToCanvasImageDataPseudocolorLUT.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,31 @@ function storedPixelDataToCanvasImageDataPseudocolorLUT (image, grayscaleLut, co
clut = colorLut;
}

if (minPixelValue < 0) {
if (image.color === true || image.rgba === true) { /* Updated the CLUT lookup: rgba */
if (minPixelValue < 0) {
while (storedPixelDataIndex < numPixels) {
grayscale = grayscaleLut[pixelData[storedPixelDataIndex] + -minPixelValue];
storedPixelDataIndex += 4;
rgba = clut[grayscale];
canvasImageDataData[canvasImageDataIndex++] = rgba[0];
canvasImageDataData[canvasImageDataIndex++] = rgba[1];
canvasImageDataData[canvasImageDataIndex++] = rgba[2];
canvasImageDataData[canvasImageDataIndex++] = rgba[3];
}
} else {
while (storedPixelDataIndex < numPixels) {
grayscale = grayscaleLut[pixelData[storedPixelDataIndex]];
storedPixelDataIndex += 4;
rgba = clut[grayscale];
canvasImageDataData[canvasImageDataIndex++] = rgba[0];
canvasImageDataData[canvasImageDataIndex++] = rgba[1];
canvasImageDataData[canvasImageDataIndex++] = rgba[2];
canvasImageDataData[canvasImageDataIndex++] = rgba[3];
}
}
} else if (minPixelValue < 0) {
while (storedPixelDataIndex < numPixels) {
grayscale = grayscaleLut[pixelData[storedPixelDataIndex++] + (-minPixelValue)];
grayscale = grayscaleLut[pixelData[storedPixelDataIndex++] + -minPixelValue];
rgba = clut[grayscale];
canvasImageDataData[canvasImageDataIndex++] = rgba[0];
canvasImageDataData[canvasImageDataIndex++] = rgba[1];
Expand Down
4 changes: 2 additions & 2 deletions src/rendering/renderColorImage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ function getRenderCanvas (enabledElement, image, invalidated) {

// The ww/wc is identity and not inverted - get a canvas with the image rendered into it for
// Fast drawing
if (enabledElement.viewport.voi.windowWidth === 255 &&
enabledElement.viewport.voi.windowCenter === 128 &&
if ((enabledElement.viewport.voi.windowWidth === 255 || enabledElement.viewport.voi.windowWidth === 256) &&
(enabledElement.viewport.voi.windowCenter === 127 || enabledElement.viewport.voi.windowCenter === 128) &&
enabledElement.viewport.invert === false &&
image.getCanvas &&
image.getCanvas()
Expand Down