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

fix(segmentation): Address issue where segmentation creation failed on layout change #4153

Merged
merged 7 commits into from
May 21, 2024
Merged

fix(segmentation): Address issue where segmentation creation failed on layout change #4153

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
012bcae
fix stack viewport invalidation
sedghi May 17, 2024
524dd9f
Merge branch 'master' of github.com:OHIF/Viewers into fix/layout-stuff
sedghi May 21, 2024
5201ba5
chore: Update dependencies to latest versions
sedghi May 21, 2024
6435d19
Merge branch 'master' of github.com:OHIF/Viewers into fix/layout-stuff
sedghi May 21, 2024
4bdc57f
update cs3d
sedghi May 21, 2024
a41482b
Merge branch 'master' of github.com:OHIF/Viewers into fix/layout-stuff
sedghi May 21, 2024
83321db
yarn lock
sedghi May 21, 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 extensions/cornerstone-dicom-seg/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
"@cornerstonejs/adapters": "^1.71.2",
"@cornerstonejs/core": "^1.71.2",
"@cornerstonejs/adapters": "^1.74.3",
"@cornerstonejs/core": "^1.74.3",
"@kitware/vtk.js": "30.4.1",
"react-color": "^2.19.3"
}
Expand Down
6 changes: 3 additions & 3 deletions extensions/cornerstone-dicom-sr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
"@cornerstonejs/adapters": "^1.71.2",
"@cornerstonejs/core": "^1.71.2",
"@cornerstonejs/tools": "^1.71.2",
"@cornerstonejs/adapters": "^1.74.3",
"@cornerstonejs/core": "^1.74.3",
"@cornerstonejs/tools": "^1.74.3",
"classnames": "^2.3.2"
}
}
6 changes: 3 additions & 3 deletions extensions/cornerstone-dynamic-volume/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
"@cornerstonejs/core": "^1.71.2",
"@cornerstonejs/streaming-image-volume-loader": "^1.71.2",
"@cornerstonejs/tools": "^1.71.2",
"@cornerstonejs/core": "^1.74.3",
"@cornerstonejs/streaming-image-volume-loader": "^1.74.3",
"@cornerstonejs/tools": "^1.74.3",
"classnames": "^2.3.2"
}
}
10 changes: 5 additions & 5 deletions extensions/cornerstone/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.2",
"@cornerstonejs/codec-openjph": "^2.4.2",
"@cornerstonejs/dicom-image-loader": "^1.71.2",
"@cornerstonejs/dicom-image-loader": "^1.74.3",
"@icr/polyseg-wasm": "^0.4.0",
"@ohif/core": "3.9.0-beta.10",
"@ohif/ui": "3.9.0-beta.10",
Expand All @@ -55,10 +55,10 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
"@cornerstonejs/adapters": "^1.71.2",
"@cornerstonejs/core": "^1.71.2",
"@cornerstonejs/streaming-image-volume-loader": "^1.71.2",
"@cornerstonejs/tools": "^1.71.2",
"@cornerstonejs/adapters": "^1.74.3",
"@cornerstonejs/core": "^1.74.3",
"@cornerstonejs/streaming-image-volume-loader": "^1.74.3",
"@cornerstonejs/tools": "^1.74.3",
"@icr/polyseg-wasm": "^0.4.0",
"@kitware/vtk.js": "30.4.1",
"html2canvas": "^1.4.1",
Expand Down
2 changes: 2 additions & 0 deletions extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,6 +1015,8 @@ class SegmentationService extends PubSubService {
): Promise<void> => {
const segmentation = this.getSegmentation(segmentationId);

toolGroupId = toolGroupId || this._getApplicableToolGroupId();

if (!segmentation) {
throw new Error(`Segmentation with segmentationId ${segmentationId} not found.`);
}
Expand Down
4 changes: 2 additions & 2 deletions extensions/measurement-tracking/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@cornerstonejs/core": "^1.71.2",
"@cornerstonejs/tools": "^1.71.2",
"@cornerstonejs/core": "^1.74.3",
"@cornerstonejs/tools": "^1.74.3",
"@ohif/core": "3.9.0-beta.10",
"@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.10",
"@ohif/ui": "3.9.0-beta.10",
Expand Down
2 changes: 1 addition & 1 deletion platform/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.2",
"@cornerstonejs/codec-openjph": "^2.4.5",
"@cornerstonejs/dicom-image-loader": "^1.71.2",
"@cornerstonejs/dicom-image-loader": "^1.74.3",
"@emotion/serialize": "^1.1.3",
"@ohif/core": "3.9.0-beta.10",
"@ohif/extension-cornerstone": "3.9.0-beta.10",
Expand Down
2 changes: 1 addition & 1 deletion platform/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.2",
"@cornerstonejs/codec-openjph": "^2.4.2",
"@cornerstonejs/dicom-image-loader": "^1.71.2",
"@cornerstonejs/dicom-image-loader": "^1.74.3",
"@ohif/ui": "3.9.0-beta.10",
"cornerstone-math": "0.1.9",
"dicom-parser": "^1.8.21"
Expand Down
49 changes: 24 additions & 25 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1497,13 +1497,13 @@
resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==

"@cornerstonejs/adapters@^1.71.2":
version "1.71.2"
resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.71.2.tgz#9efe3a7bffc2eb8d3efaf59cf13d28e39c779733"
integrity sha512-x8gHKQLCBN/B+HRPFih9TsxUa9ouyCGW87cdDAaMDCsZ8sesP67iDbpSasxErI+rBo0CLWnO91Ee5GRmP6YOhQ==
"@cornerstonejs/adapters@^1.74.3":
version "1.74.3"
resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.74.3.tgz#c0147e6547dbfaa2c50332614c90d4a4ddff5d44"
integrity sha512-7tpNsneMcYoJkxYEvIxNmyAGFOKVz/SUBTBj68UJP1zm7CQhnEkmaFf2j+CvGvmgeNJuyZ3M7Ws8F1EPa8L2iA==
dependencies:
"@babel/runtime-corejs2" "^7.17.8"
"@cornerstonejs/tools" "^1.71.2"
"@cornerstonejs/tools" "^1.74.3"
buffer "^6.0.3"
dcmjs "^0.29.8"
gl-matrix "^3.4.3"
Expand Down Expand Up @@ -1550,46 +1550,45 @@
resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.5.tgz#8690b61a86fa53ef38a70eee9d665a79229517c0"
integrity sha512-MZCUy8VG0VG5Nl1l58+g+kH3LujAzLYTfJqkwpWI2gjSrGXnP6lgwyy4GmPRZWVoS40/B1LDNALK905cNWm+sg==

"@cornerstonejs/core@^1.71.2":
version "1.71.2"
resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.71.2.tgz#76f50efa8b5efa74b36fec8c10f4adc5f57269b0"
integrity sha512-JkmovK4xePFraXyAu3DsYRvANVFvd65yXpKTPjDVLQUJ4ti2EAdOOewsEulHvFgaiXuLT2zSckeknyqcg9N8vg==
"@cornerstonejs/core@^1.74.3":
version "1.74.3"
resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.74.3.tgz#f148a298596a8e75723a816017d7b3fc0dcd1c68"
integrity sha512-jVVVdmHuuPS//3j/e+JoNIpz5yxgJRJbZebGq4Ird4L2A/OLYauo8IRv8DcPju0Tq15RmdnHkG4/wAtYOa4whg==
dependencies:
"@kitware/vtk.js" "30.4.1"
comlink "^4.4.1"
detect-gpu "^5.0.22"
gl-matrix "^3.4.3"
lodash.clonedeep "4.5.0"

"@cornerstonejs/dicom-image-loader@^1.71.2":
version "1.71.2"
resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.71.2.tgz#9dc75241328759bce7d362d0280a8ae8fddcb310"
integrity sha512-y970GVQucbSc5kqQugIX0a2/XS02JTHZzMEi6QsxBpApyPpBp9D8eAs4LBU1stkwah98Lr4N0bz8S2w1mx6T4A==
"@cornerstonejs/dicom-image-loader@^1.74.3":
version "1.74.3"
resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.74.3.tgz#d28dd8e6e81627cccaeaf32ca4b37c6616816550"
integrity sha512-af6pAWWSiHxpn++i56kjJ3jLFtdFWcTbMfpUlDRaBEfH4RILkBV3p9E+rr0aokBE0sOhzFt+ogqPhOQA6ZKmYQ==
dependencies:
"@cornerstonejs/codec-charls" "^1.2.3"
"@cornerstonejs/codec-libjpeg-turbo-8bit" "^1.2.2"
"@cornerstonejs/codec-openjpeg" "^1.2.2"
"@cornerstonejs/codec-openjph" "^2.4.5"
"@cornerstonejs/core" "^1.71.2"
"@cornerstonejs/core" "^1.74.3"
dicom-parser "^1.8.9"
pako "^2.0.4"
uuid "^9.0.0"


"@cornerstonejs/streaming-image-volume-loader@^1.71.2":
version "1.71.2"
resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.71.2.tgz#64b92c71f1550000edaa79f10259ebec05092748"
integrity sha512-sCP9oYwtb0+eL23a1/1pWuJy9PadAOxOzeIMEsBQhl174pjbyMi290NerAr6uOpQL9tP8CC0uTEDwtsHGr5faA==
"@cornerstonejs/streaming-image-volume-loader@^1.74.3":
version "1.74.3"
resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.74.3.tgz#3dbbfca5a4ab4d49efb947d513bf10b71c13b4c3"
integrity sha512-TYhfiNfyJyulJXNjsDtPqXXPRzXSaezzq2oVeeuuz4gziBC5AjhQqBqa35acvuOtVMNMunZ35VuCXUSNd3nwWg==
dependencies:
"@cornerstonejs/core" "^1.71.2"
"@cornerstonejs/core" "^1.74.3"
comlink "^4.4.1"

"@cornerstonejs/tools@^1.71.2":
version "1.71.2"
resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.71.2.tgz#fe426e63a11f960555d3f3875a3a6a763e0feae5"
integrity sha512-9LxDGx6arzD7mM5e1SkoXUpagpNQUEE9OgiRW3LFWxpgfg8Mbgy82RJkGcYb6DZNOVW6YsvF5Mu4kKqlRCnD3Q==
"@cornerstonejs/tools@^1.74.3":
version "1.74.3"
resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.74.3.tgz#1fe6ad6124ec6288df83ba5764032c7d9e0c00db"
integrity sha512-A5YdLKhbnkQRUZxRvmTPDtmapkCe0dAsBPd6zQaJpzoLjCj4pjg5icI9XJrHY5IXA/XweXXIxuKPX8EoiYFT/Q==
dependencies:
"@cornerstonejs/core" "^1.71.2"
"@cornerstonejs/core" "^1.74.3"
"@icr/polyseg-wasm" "0.4.0"
"@types/offscreencanvas" "2019.7.3"
comlink "^4.4.1"
Expand Down
Loading