fix: Use the image loader for dicom-seg to allow compressed images#2611
fix: Use the image loader for dicom-seg to allow compressed images#2611wayfarer3130 wants to merge 106 commits into
Conversation
* fix(security): Update lodash to 4.17.23 using a resolution to address CVE-2025-13465. * Removed lodash from the dev dependencies since it is in the resolutions now. * Update lodash to 4.17.23 in the docs package. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com>
* refactor: replace string literals with OrientationAxis enums for better type safety and clarity in BaseVolumeViewport and getCameraVectors * feat(rendering): Add function to calculate acquisition plane reformat orientation based on image orientation patient values * feat: enhance reformat orientation handling in VolumeViewport and BaseVolumeViewport, allowing for specific axial, sagittal, and coronal reformats while maintaining base orientation references * feat: add buttons for setting viewport orientations to non-reformat, reformat, and acquisition types, enhancing user control over viewport display * fix: suppress events during camera reset in VolumeViewport to prevent premature rendering * fix(getCameraVectors): import OrientationVectors type * fix(tests): update button text in MPR Reformat visual tests * fix(tests): update MPR Reformat screenshots for Chromium and WebKit --------- Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
--------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com>
* refactor the solution given * fix fetch color tables * important refactors to optimize worker functionality * refactor fetch palette data * fix clearly wrong test values * refactor as reviewer suggestions * fix: Convert 16 bit declared as 8 palette color data * fix: or condition on setting 16 bit palette data --------- Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
…eehandROI open U-shape contours (#2615) * feat(tools): implement orthogonalT and lineSegment modes for PlanarFreehandROI open U-shape contours Add two new rendering modes for the open U-shaped contour T-overlay: - 'orthogonalT': computes the T-line endpoint as the perpendicular ray-contour intersection from the chord midpoint, instead of the farthest point. Useful for LA cardiac workflows where the T must be perpendicular to the chord. - 'lineSegment': draws only the dashed chord connecting endpoints without any T-line, closing the contour visually. Also adds optional shaded fill for the enclosed region (contour + chord) when fillOpacity > 0, and centralizes variant dispatch into a single resolveVectorToPeak function to eliminate duplicated branching across drawLoop, openContourEditLoop, and renderMethods. * fix(tools): address PR review for PlanarFreehandROI U-shape modes - Use vec2.sub instead of create+set for chord vector - Replace double-loop ray intersection with single-pass dot-product approach for orthogonalT peak finding - Return null with console.warn instead of falling back to farthestT when no orthogonal intersection is found - Add 'none' option to U-shape dropdown to remove U-shape rendering - Auto-apply U-shape mode on dropdown change, remove separate button - Apply configured U-shape mode to newly drawn open contours - Add fill opacity dropdown using tool configuration - Read fillOpacity from tool config in renderMethods * refactor(tools): use vec2.dot for orthogonal T dot product calculation * Move open u shaped to utils helper --------- Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
* fix(security): Various dependency updates as a result of CVE-2026-26996. Ultimately the vulnerability was ignored because it is only exposed in itk-wasm via CLI and it is limited to build/dev environments.
* refactor: update getTextBoxCoordsCanvas function to accept element and textLines parameters for improved textbox placement across multiple annotation tools * fix: correct bounding box calculations in _drawTextGroup function to accurately reflect text box position and size * feat: implement text box overlap management with registry for improved placement accuracy - Added a text box overlap registry to track rendered text box positions. - Integrated overlap avoidance logic in getTextBoxCoordsCanvas to prevent occlusion of existing text boxes. - Updated draw and drawTextBox functions to clear and register text boxes during rendering. * refactor: enhance overlap detection in getTextBoxCoordsCanvas using AABB intersection - Replaced the previous rectangle overlap logic with a more accurate AABB intersection method. - Introduced a new utility function to convert text box rectangles to AABB format, allowing for better handling of overlap checks. - Updated the overlap detection functions to utilize the new intersection logic for improved accuracy in text box placement. * test: add unit tests for getTextBoxCoordsCanvas to validate positioning logic - Introduced a new test suite for getTextBoxCoordsCanvas to ensure correct coordinate calculations for text boxes. - Added tests for default positioning, overlap handling, and fallback mechanisms when space is limited. - Utilized a mock viewport element to simulate various scenarios for accurate testing. * style: format getTextBoxCoordsCanvas test cases for improved readability - Reformatted the test cases in getTextBoxCoordsCanvas.spec.ts to enhance code clarity. - Adjusted the indentation and line breaks for better visual structure without altering functionality. * refactor: update type assertions in getTextBoxCoordsCanvas tests for better type safety - Changed type assertions from any to unknown in getTextBoxCoordsCanvas test cases to enhance type safety and maintain code quality. - Ensured consistency in type handling across the test suite without altering existing functionality. * refactor: remove unnecessary type assertions in getTextBoxCoordsCanvas tests - Updated test cases in getTextBoxCoordsCanvas.spec.ts to eliminate type assertions from unknown to the actual type for annotationPoints and related variables. - Improved code clarity and type safety without changing the existing functionality of the tests. * chore: update tsconfig.json to exclude test files from compilation - Added an "exclude" property to tsconfig.json to prevent test files from being included in the TypeScript compilation process. - This change helps streamline the build process by omitting unnecessary test files. * refactor: integrate getTextBoxCoordsCanvas into ArrowAnnotateTool for improved text box positioning - Replaced direct canvas coordinate assignment with a call to getTextBoxCoordsCanvas to enhance the accuracy of text box placement. - This change ensures that text box coordinates are calculated based on the current canvas state and element, improving overall annotation functionality. * refactor: streamline text box rendering across annotation tools - Replaced direct text box rendering logic with a unified renderLinkedTextBoxAnnotation method in multiple annotation tools. - This change enhances code maintainability and consistency in text box visibility and positioning logic. - Improved handling of text box state and coordinates, ensuring better integration with existing annotation functionalities. --------- Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
* fix: Continuous flicker on viewer redraw * fix: Comment on size 0
…kfile changes. (#2629) Disabled all dependabot pull requests for bun and npm version updates.
…or-seg Resolve packages/metadata conflict: take main's @cornerstonejs/utils 5.0.8 (matches the rest of the monorepo) and keep dcmjs 0.52.0. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
- Rename createFromDICOMSegBuffer -> createFromDicomSegImageId. The 2nd arg is a SEG instance imageId, not a Part 10 ArrayBuffer; renaming turns a silent contract break into an obvious one (no same-name/different-contract trap). Update the example to use the buffer-path createLabelmapsFromDICOMBuffer. Documented in the 5.x migration guide. - getReferencedSourceImageSequenceItem: derive ReferencedFrameNumber via the metadata provider's frame extraction (falling back to utilities.FrameRange) instead of a one-off /[?&]frame=/ regex that silently dropped the wadors /frames/N form, so multi-frame source references are preserved. - normalizeDecodedPixelData: collapse the duplicated Uint16Array ternary and document that non-16-bit frames are promoted by VALUE (segment indices), not byte-reinterpreted. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Used the new metadata module to get this
This was correct as a value copy |
…or-seg # Conflicts: # packages/metadata/package.json # pnpm-lock.yaml
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
packages/adapters/src/adapters/Cornerstone3D/Segmentation/labelmapImagesFromBuffer.ts (1)
1013-1017:⚠️ Potential issue | 🟡 MinorInconsistent
ImageOrientationPatientvalidation between bitmap and labelmap paths creates potential for silent data corruption.
processChunk(line 837) throws an error whenImageOrientationPatientis missing, butprocessLabelmapChunk(line 1013) silently falls back tovalidOrientations[0](the reference image's orientation). If a frame's actual orientation differs from this fallback, pixel data will be aligned incorrectly and written to wrong positions in the labelmap.Although
alignPixelDataWithSourceDatavalidates the orientation after the fallback is applied, it checks against the reference series' 8 possible orientations. If the missing frame's true orientation coincidentally matches one of them (but isn't the correct one), the mismatch goes undetected.For consistency and safety, apply the same fail-fast validation as the bitmap path:
🛠️ Suggested fix
const ImageOrientationPatientI = sharedPlaneOrientation || PerFrameFunctionalGroups?.PlaneOrientationSequence - ?.ImageOrientationPatient || - validOrientations[0]; + ?.ImageOrientationPatient; + + if (!ImageOrientationPatientI) { + throw new Error( + `Labelmap SEG frame ${i + 1} is missing ImageOrientationPatient in per-frame and shared functional groups.` + ); + }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@packages/adapters/src/adapters/Cornerstone3D/Segmentation/labelmapImagesFromBuffer.ts` around lines 1013 - 1017, The ImageOrientationPatientI variable assignment in processLabelmapChunk silently falls back to validOrientations[0] when ImageOrientationPatient is missing, while processChunk throws an error for the same condition. This inconsistency can cause silent data corruption if the frame's actual orientation differs from the fallback. Replace the fallback logic for ImageOrientationPatientI with explicit error validation that matches the approach used in processChunk, ensuring that a missing ImageOrientationPatient throws an error instead of silently using the reference image's orientation.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In
`@packages/adapters/src/adapters/Cornerstone3D/Segmentation/labelmapImagesFromBuffer.ts`:
- Around line 1013-1017: The ImageOrientationPatientI variable assignment in
processLabelmapChunk silently falls back to validOrientations[0] when
ImageOrientationPatient is missing, while processChunk throws an error for the
same condition. This inconsistency can cause silent data corruption if the
frame's actual orientation differs from the fallback. Replace the fallback logic
for ImageOrientationPatientI with explicit error validation that matches the
approach used in processChunk, ensuring that a missing ImageOrientationPatient
throws an error instead of silently using the reference image's orientation.
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: f3353ddd-f799-4262-bd94-320351a78895
⛔ Files ignored due to path filters (1)
pnpm-lock.yamlis excluded by!**/pnpm-lock.yaml
📒 Files selected for processing (10)
packages/adapters/examples/segmentationVolume/utils.tspackages/adapters/package.jsonpackages/adapters/src/adapters/Cornerstone3D/Segmentation/generateSegmentation.tspackages/adapters/src/adapters/Cornerstone3D/Segmentation/generateToolState.tspackages/adapters/src/adapters/Cornerstone3D/Segmentation/index.tspackages/adapters/src/adapters/Cornerstone3D/Segmentation/labelmapImagesFromBuffer.tspackages/ai/package.jsonpackages/docs/docs/migration-guides/5x/1-migration-notes.mdpackages/metadata/package.jsonpackages/utils/package.json
✅ Files skipped from review due to trivial changes (1)
- packages/docs/docs/migration-guides/5x/1-migration-notes.md
🚧 Files skipped from review as they are similar to previous changes (5)
- packages/adapters/package.json
- packages/ai/package.json
- packages/metadata/package.json
- packages/utils/package.json
- packages/adapters/src/adapters/Cornerstone3D/Segmentation/generateSegmentation.ts
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
packages/dicomImageLoader/src/shared/decoders/decodeRLE.ts (1)
191-199:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winRemove unused variable
pixelsPerPlane.The variable
pixelsPerPlaneis declared on line 192 but never used. TheunpackOneBitPlanarfunction accessesimageFrame.rowsandimageFrame.columnsdirectly.🧹 Proposed fix
if (isOneBit) { - const pixelsPerPlane = imageFrame.rows * imageFrame.columns; - imageFrame.pixelData = unpackOneBitPlanar( imageFrame.pixelData as Uint8Array, imageFrame, frameSize ); }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@packages/dicomImageLoader/src/shared/decoders/decodeRLE.ts` around lines 191 - 199, Remove the unused variable `pixelsPerPlane` that is declared in the isOneBit conditional block within the decodeRLE function. This variable is assigned the value of imageFrame.rows multiplied by imageFrame.columns but is never referenced afterwards. The unpackOneBitPlanar function already accesses imageFrame.rows and imageFrame.columns directly, so the intermediate variable is not needed. Simply delete the line declaring pixelsPerPlane.
🧹 Nitpick comments (1)
packages/adapters/test/encodePixelData.jest.js (1)
97-158: 💤 Low valueConsider adding a 16-bit bitmap frame test.
The
getBitmapFramesFromDatasetimplementation (per context snippet 3) supports 16-bit layouts withUint16Array, but there's no test coverage for that path. Adding a test would ensure the 16-bit branch works correctly when needed.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@packages/adapters/test/encodePixelData.jest.js` around lines 97 - 158, The test suite for getBitmapFramesFromDataset covers 1-bit and 8-bit layouts but lacks coverage for 16-bit bitmap frames. Add a new test case similar to the existing ones that validates getBitmapFramesFromDataset correctly processes a 16-bit layout with BitsAllocated set to 16 and PixelData as a Uint16Array. The test should verify that the function properly extracts frames and returns the correct bitsAllocated value of 16 while maintaining the expected frame data structure.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In `@packages/dicomImageLoader/src/shared/decoders/decodeRLE.ts`:
- Around line 191-199: Remove the unused variable `pixelsPerPlane` that is
declared in the isOneBit conditional block within the decodeRLE function. This
variable is assigned the value of imageFrame.rows multiplied by
imageFrame.columns but is never referenced afterwards. The unpackOneBitPlanar
function already accesses imageFrame.rows and imageFrame.columns directly, so
the intermediate variable is not needed. Simply delete the line declaring
pixelsPerPlane.
---
Nitpick comments:
In `@packages/adapters/test/encodePixelData.jest.js`:
- Around line 97-158: The test suite for getBitmapFramesFromDataset covers 1-bit
and 8-bit layouts but lacks coverage for 16-bit bitmap frames. Add a new test
case similar to the existing ones that validates getBitmapFramesFromDataset
correctly processes a 16-bit layout with BitsAllocated set to 16 and PixelData
as a Uint16Array. The test should verify that the function properly extracts
frames and returns the correct bitsAllocated value of 16 while maintaining the
expected frame data structure.
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: ad88ca0c-e6dd-43c7-8bb7-276a0840d0f4
📒 Files selected for processing (8)
packages/adapters/examples/segmentationVolume/utils.tspackages/adapters/src/adapters/Cornerstone/Segmentation_4X.jspackages/adapters/src/adapters/Cornerstone3D/Segmentation/generateSegmentation.tspackages/adapters/src/adapters/Cornerstone3D/Segmentation/perFrameFunctionalGroups.jspackages/adapters/src/adapters/Cornerstone3D/encodePixelData.tspackages/adapters/test/encodePixelData.jest.jspackages/adapters/test/perFrameFunctionalGroups.jest.jspackages/dicomImageLoader/src/shared/decoders/decodeRLE.ts
🚧 Files skipped from review as they are similar to previous changes (3)
- packages/adapters/src/adapters/Cornerstone3D/Segmentation/generateSegmentation.ts
- packages/adapters/src/adapters/Cornerstone3D/encodePixelData.ts
- packages/adapters/src/adapters/Cornerstone/Segmentation_4X.js
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/adapters/test/fillSegmentationFrames.jest.js`:
- Around line 39-42: The makeMetadata.get function currently returns
SOPInstanceUID data regardless of the _module parameter, allowing tests to pass
even if fillSegmentation queries the wrong module. Add a condition that
validates the _module parameter matches the expected module name (likely
'dicomweb' or similar based on context) before returning the instance data; only
return the object with SOPInstanceUID when both the imageId exists in
sopByImageId AND the _module matches the expected value, otherwise return an
empty object to keep the test meaningful and prevent false positives.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: 234374a9-3379-4696-a4ff-f7c96c95205c
📒 Files selected for processing (7)
packages/adapters/src/adapters/Cornerstone/Segmentation_4X.jspackages/adapters/src/adapters/Cornerstone3D/Segmentation/generateSegmentation.tspackages/adapters/src/adapters/Cornerstone3D/encodePixelData.tspackages/adapters/test/fillSegmentationFrames.jest.jspackages/metadata/src/enums/TransferSyntaxes.tspackages/metadata/src/enums/index.tspackages/metadata/src/utilities/isVideoTransferSyntax.ts
✅ Files skipped from review due to trivial changes (1)
- packages/metadata/src/enums/TransferSyntaxes.ts
🚧 Files skipped from review as they are similar to previous changes (3)
- packages/adapters/src/adapters/Cornerstone3D/Segmentation/generateSegmentation.ts
- packages/adapters/src/adapters/Cornerstone/Segmentation_4X.js
- packages/adapters/src/adapters/Cornerstone3D/encodePixelData.ts
…or-seg Resolve packages/metadata/package.json: keep dcmjs 0.52.0 (required by this branch) and take @cornerstonejs/utils 5.0.11 from the version bump on main, matching every other package in the workspace. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
sedghi
left a comment
There was a problem hiding this comment.
Looks great, but i would like to try it first with OHIF before merging
|
@sedghi - as requested, I added the previous API back in as a compatibility layer, and also updated the descriptions on the frameImageIds parameter. |
|
Hi there if you have a demo link with this change I would like to try it too. I have some images in which loading segmentation make OHIF hangs a lot, I think there are so refresh on display or calculation made that freeze the viewer each time you interact with the segmentation |
Loading a multiframe SEG awaited each frame's fetch/decode before issuing the next, so only one request was ever in flight. For 800+ frame SEGs this serialized hundreds of round trips and made the imageLoader-based load slow. Decode frames through a bounded-concurrency worker pool (default N=16), preserving frame order and fail-fast behavior. Concurrency is configurable via the new `concurrency` option on createLabelmapsFromSegImageIds. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
sedghi
left a comment
There was a problem hiding this comment.
putting this as request changes until we figure out the regresssions
createFromDicomSegImageId dropped the concurrency option, so callers could not control SEG frame fetch/decode parallelism. Thread it through to createLabelmapsFromSegImageIds (defaults to the loader's own default when omitted). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…or-seg # Conflicts: # packages/metadata/package.json # pnpm-lock.yaml
Context
The previous segmentation loader claimed labelmap + RLE support but neither actually worked, and it loaded SEG by retrieving the entire DICOM object. This PR makes SEG load through the image loader (per-frame imageIds, so standard back ends' SEG frame retrieve is used and compressed frames are supported), and fixes/extends storage to write labelmap or bitmap with correct RLE.
Faster loading from back ends that support frame retrieve, and significantly smaller storage since RLE compresses segmentation images extremely well.
OHIF_REF:
feat/load-seg-images(OHIF/Viewers#5806)Changes & Results
SEG load via image loader (adapters)
createFromDicomSegImageId/createLabelmapsFromSegImageIdsbuild labelmaps from per-frame imageIds + a decode callback (defaults to the image loader), replacing the whole-object decode path. Legacy buffer path retained.decodeSegPixelDataFromFrameIdsfetches/decodes frames with bounded concurrency (default 16, configurable viaconcurrency) so per-frame requests overlap; order preserved, fail-fast unchanged.encodePixelDataplusperFrameFunctionalGroupsnormalization; broadSegmentation_4X/generateToolState/generateSegmentationupdates.RLE encoder / decoder fix
Full-instance Part 10 prefetch (single uniform frame registry)
prefetchPart10Instanceregisters a fetched Part 10 instance into the@cornerstonejs/metadataNATURALIZED /COMPRESSED_FRAME_DATAframework (parsed by the dcmjs async reader).loadImagenow consults that registry first (wadors/loadImageFromRegistry.ts) and falls through to the normal/frames/Nrequest when nothing is registered — so WADO-RS and WADO-URI share one registry and one decode path.Metadata / transfer syntaxes
TransferSyntaxesenum andisVideoTransferSyntaxupdates.Stack-labelmap rendering fix
viewportReferencesSegmentationImagesguardssyncStackLabelmapActorsso a labelmap is only mounted on viewports that actually display its source images. It resolves the labelmap's referenced source imageIds from each labelmap image'sreferencedImageIdin cache (not the labelmap's own imageIds), which fixes the previously failing stack-segmentation render unit tests while still excluding unrelated series that merely share a frame of reference.Tests & docs
encodePixelData,fillSegmentationFrames,perFrameFunctionalGroups,resolveFrameImageIds,segBufferMetadataRoundTrip; migration notes added.Testing