Skip to content

[WIP] Update to use beta 5.0 of CS3D #5904

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
wayfarer3130 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

[WIP] Update to use beta 5.0 of CS3D #5904

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
b6fc372
Update to use beta 5.0
wayfarer3130 Mar 17, 2026
22e6ee8
fix: unit tests
wayfarer3130 Mar 19, 2026
befcf5d
fix: Allow slow server/test rendering to still work
wayfarer3130 Mar 23, 2026
3def5a2
Update tests to use viewport grid compare
wayfarer3130 Mar 23, 2026
4a11ec0
Fix storage of stale retries actual/diff files
wayfarer3130 Mar 24, 2026
a90afd8
cs3d linking fixees
wayfarer3130 Mar 30, 2026
718f9ff
Linking for cs3d metadata
wayfarer3130 Mar 30, 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
90 changes: 45 additions & 45 deletions bun.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions extensions/cornerstone/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ module.exports = {
moduleNameMapper: {
...base.moduleNameMapper,
'@ohif/(.*)': '<rootDir>/../../platform/$1/src',
// calculate-suv has dist/ not dist/esm/ - exclude from the general mapping
'^@cornerstonejs/calculate-suv$': '<rootDir>/../../node_modules/@cornerstonejs/calculate-suv',
'^@cornerstonejs/calculate-suv/(.*)$':
'<rootDir>/../../node_modules/@cornerstonejs/calculate-suv/$1',
'^@cornerstonejs/([^/]+)/(.*)$': '<rootDir>/../../node_modules/@cornerstonejs/$1/dist/esm/$2',
'^@cornerstonejs/([^/]+)$': '<rootDir>/../../node_modules/@cornerstonejs/$1/dist/esm',
},
Expand Down
12 changes: 11 additions & 1 deletion extensions/cornerstone/src/components/ViewportDataOverlaySettingMenu/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,18 @@ export function getEnhancedDisplaySets({ viewportId, services }) {
displaySetService.getDisplaySetByUID(displaySetUID)
);

const backgroundCanBeVolume = csUtils.isValidVolume(viewportDisplaySets[0].imageIds || []);
const backgroundDisplaySet = viewportDisplaySets[0];
if (!backgroundDisplaySet) {
return {
viewportDisplaySets,
enhancedDisplaySets: otherDisplaySets.map(displaySet => ({
...displaySet,
isOverlayable: false,
})),
};
}

const backgroundCanBeVolume = csUtils.isValidVolume(backgroundDisplaySet.imageIds || []);

const enhancedDisplaySets = otherDisplaySets.map(displaySet => {
if (!backgroundDisplaySet.isReconstructable) {
Expand Down
4 changes: 4 additions & 0 deletions extensions/default/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ module.exports = {
moduleNameMapper: {
...base.moduleNameMapper,
'@ohif/(.*)': '<rootDir>/../../platform/$1/src',
// calculate-suv has dist/ not dist/esm/ - exclude from the general mapping
'^@cornerstonejs/calculate-suv$': '<rootDir>/../../node_modules/@cornerstonejs/calculate-suv',
'^@cornerstonejs/calculate-suv/(.*)$':
'<rootDir>/../../node_modules/@cornerstonejs/calculate-suv/$1',
'^@cornerstonejs/(.*)$': '<rootDir>/../../node_modules/@cornerstonejs/$1/dist/esm',
},
// rootDir: "../.."
Expand Down
4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@
"lerna:customVersion": "node version.mjs",
"link-list": "npm ls --depth=0 --link=true",
"cs3d:checkout": "cd libs/@cornerstonejs && git fetch && git checkout",
"cs3d:build": "cd libs/@cornerstonejs && yarn install && yarn run build:esm",
"cs3d:build": "cd libs/@cornerstonejs && yarn run build:esm",
"cs3d:watch": "cd libs/@cornerstonejs && yarn run build:esm:watch",
"cs3d:install": "cd libs/@cornerstonejs && yarn install && yarn run build:esm",
"cs3d:link": "node libs/@cornerstonejs/scripts/link-ohif-cornerstone-node-modules.mjs .",
"cs3d:unlink": "node libs/@cornerstonejs/scripts/unlink-ohif-cornerstone-node-modules.mjs ."
},
Expand Down
Loading
Loading