Skip to content

feature: support OPM with palette color LUT #5522

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

Open
tunglt1810 wants to merge 7 commits into
base: master
Choose a base branch
from
+21 −8
Open

feature: support OPM with palette color LUT #5522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b246a48
support OPM with palette color LUT
tunglt1810 Oct 24, 2025
4c4980c
Merge branch 'master' into master
tunglt1810 Oct 25, 2025
658177e
Merge branch 'master' into master
sedghi Oct 28, 2025
f20abde
Merge branch 'master' into master
tunglt1810 Oct 30, 2025
8163ffa
Merge branch 'OHIF:master' into master
tunglt1810 Nov 12, 2025
961b21b
Merge branch 'master' into master
tunglt1810 Nov 20, 2025
5758d8c
Merge branch 'OHIF:master' into master
tunglt1810 Jan 6, 2026
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
1 change: 1 addition & 0 deletions extensions/default/src/getSopClassHandlerModule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ const sopClassUids = [
sopClassDictionary.RTImageStorage,
sopClassDictionary.EnhancedUSVolumeStorage,
sopClassDictionary.RTDoseStorage,
sopClassDictionary.CornealTopographyMapStorage
];

function getSopClassHandlerModule(appContextParam) {
Expand Down
28 changes: 20 additions & 8 deletions platform/core/src/utils/metadataProvider/fetchPaletteColorLookupTableData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,28 @@ function _getPaletteColor(paletteColorLookupTableData, lutDescriptor) {
return undefined;
}

const arrayBufferToPaletteColorLUT = arraybuffer => {
const arrayBufferToPaletteColorLUT = (arraybuffer) => {
// Handle both ArrayBuffer and TypedArray inputs
const buffer = arraybuffer.buffer || arraybuffer;
const data = bits === 16 ? new Uint16Array(buffer) : new Uint8Array(buffer);
const lut = [];
// const data = bits === 16 ? new Uint16Array(buffer) : new Uint8Array(buffer);

const view = new DataView(buffer);
const offsetBits = bits - 8;
Copy link
Contributor

@wayfarer3130 wayfarer3130 Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest isTwoByte = bits > 8


const lut = new Uint8Array(numLutEntries);

// Extract LUT values (always read as 16-bit)
for (let i = 0; i < numLutEntries; i++) {
lut[i] = data[i];
// Read 16-bit value (LUT is always 16-bit)
const lutValue16 = view.getUint16(i * 2, true);
Copy link
Contributor

@wayfarer3130 wayfarer3130 Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to PS3.3 C.8.17.14.1.6 Bits Allocated, Bits Stored, and High Bit
you can have either 8 or 16 bit data. Please ensure that 8 bit data is handled.


// Apply Orthanc shift logic
Copy link
Contributor

@wayfarer3130 wayfarer3130 Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not be orthanc specific - either reference the DICOM standard or specify that this is the format for sop class ...

if (offsetBits >= 0) {
lut[i] = (lutValue16 >> offsetBits) & 0xff;
} else {
// If bitsPerEntry < 8, shift left
lut[i] = (lutValue16 << Math.abs(offsetBits)) & 0xff;
Copy link
Contributor

@wayfarer3130 wayfarer3130 Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is a shift needed? offsetBits will be 0 for this case, so
lut[i] = lutValue16 && 0xff;
should be sufficient.

}
Copy link

@cursor cursor bot Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Palette Color Retrieval Breaks 8-bit Compatibility

The _getPaletteColor function now always reads palette data as 16-bit values, assuming the buffer is sized accordingly. This differs from the previous logic that handled both 8-bit and 16-bit data based on the bits parameter. For 8-bit palette data, this can cause buffer overruns and incorrect interpretation, impacting backward compatibility.

Fix in Cursor Fix in Web

Copy link
Member

@sedghi sedghi Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tunglt1810 please check this

Copy link
Contributor Author

@tunglt1810 tunglt1810 Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @IbrahimCSAE ,
If you have another testcase, can you share it. So I can test this logic.

}

return lut;
Expand All @@ -48,9 +62,7 @@ function _getPaletteColor(paletteColorLookupTableData, lutDescriptor) {

if (paletteColorLookupTableData.InlineBinary) {
try {
const uint8Array = Uint8Array.from(atob(paletteColorLookupTableData.InlineBinary), c =>
c.charCodeAt(0)
);
const uint8Array = Uint8Array.from(atob(paletteColorLookupTableData.InlineBinary), (c) => c.charCodeAt(0));
return (paletteColorLookupTableData.palette = arrayBufferToPaletteColorLUT(uint8Array));
} catch (e) {
console.log("Couldn't decode", paletteColorLookupTableData.InlineBinary, e);
Expand All @@ -61,7 +73,7 @@ function _getPaletteColor(paletteColorLookupTableData, lutDescriptor) {
if (paletteColorLookupTableData.retrieveBulkData) {
return paletteColorLookupTableData
.retrieveBulkData()
.then(val => (paletteColorLookupTableData.palette = arrayBufferToPaletteColorLUT(val)));
.then((val) => (paletteColorLookupTableData.palette = arrayBufferToPaletteColorLUT(val)));
}

console.error(`No data found for ${paletteColorLookupTableData} palette`);
Expand Down