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

fix(sr): dcm4chee requires the patient name for an SR to match what is in the original study #3739

Merged
merged 3 commits into from
Oct 24, 2023
Merged

fix(sr): dcm4chee requires the patient name for an SR to match what is in the original study #3739

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
988e539
fix(measurements): Format the patient name of a measurement report as…
Oct 20, 2023
add2faa
Fix for PatientName when exporting SR imported from dcmjs. Added docs…
Oct 24, 2023
8bc4345
Merge remote-tracking branch 'upstream/master' into fix/saving-report…
Oct 24, 2023
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
2 changes: 1 addition & 1 deletion extensions/cornerstone-dicom-sr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@ohif/extension-cornerstone": "3.8.0-beta.4",
"@ohif/extension-measurement-tracking": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4",
"dcmjs": "^0.29.5",
"dcmjs": "^0.29.11",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
"prop-types": "^15.6.2",
Expand Down
2 changes: 1 addition & 1 deletion extensions/cornerstone-dicom-sr/src/viewports/OHIFCornerstoneSRViewport.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ function OHIFCornerstoneSRViewport(props) {
patientSex: PatientSex || '',
patientAge: PatientAge || '',
MRN: PatientID || '',
thickness: SliceThickness ? `${SliceThickness.toFixed(2)}mm` : '',
thickness: SliceThickness ? `${parseFloat(SliceThickness).toFixed(2)}mm` : '',
spacing:
SpacingBetweenSlices !== undefined ? `${SpacingBetweenSlices.toFixed(2)}mm` : '',
scanner: ManufacturerModelName || '',
Expand Down
2 changes: 1 addition & 1 deletion extensions/cornerstone/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@cornerstonejs/dicom-image-loader": "^1.20.3",
"@ohif/core": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4",
"dcmjs": "^0.29.6",
"dcmjs": "^0.29.11",
"dicom-parser": "^1.8.21",
"hammerjs": "^2.0.8",
"prop-types": "^15.6.2",
Expand Down
2 changes: 1 addition & 1 deletion extensions/default/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"peerDependencies": {
"@ohif/core": "3.8.0-beta.4",
"@ohif/i18n": "3.8.0-beta.4",
"dcmjs": "^0.29.5",
"dcmjs": "^0.29.11",
"dicomweb-client": "^0.10.2",
"prop-types": "^15.6.2",
"react": "^17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion extensions/dicom-pdf/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"peerDependencies": {
"@ohif/core": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4",
"dcmjs": "^0.29.5",
"dcmjs": "^0.29.11",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
"prop-types": "^15.6.2",
Expand Down
2 changes: 1 addition & 1 deletion extensions/dicom-video/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"peerDependencies": {
"@ohif/core": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4",
"dcmjs": "^0.29.5",
"dcmjs": "^0.29.11",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
"prop-types": "^15.6.2",
Expand Down
2 changes: 1 addition & 1 deletion extensions/measurement-tracking/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@ohif/extension-cornerstone-dicom-sr": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4",
"classnames": "^2.3.2",
"dcmjs": "^0.29.5",
"dcmjs": "^0.29.11",
"lodash.debounce": "^4.17.21",
"prop-types": "^15.6.2",
"react": "^17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion extensions/test-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"peerDependencies": {
"@ohif/core": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4",
"dcmjs": "0.29.4",
"dcmjs": "0.29.11",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
"prop-types": "^15.6.2",
Expand Down
2 changes: 1 addition & 1 deletion extensions/tmtv/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"peerDependencies": {
"@ohif/core": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4",
"dcmjs": "^0.29.5",
"dcmjs": "^0.29.11",
"dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8",
"prop-types": "^15.6.2",
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 @@ -72,7 +72,7 @@
"classnames": "^2.3.2",
"core-js": "^3.16.1",
"cornerstone-math": "^0.1.9",
"dcmjs": "^0.29.5",
"dcmjs": "^0.29.11",
"detect-gpu": "^4.0.16",
"dicom-parser": "^1.8.9",
"dotenv-webpack": "^1.7.0",
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 @@ -42,7 +42,7 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
"dcmjs": "^0.29.5",
"dcmjs": "^0.29.11",
"dicomweb-client": "^0.10.2",
"gl-matrix": "^3.4.3",
"isomorphic-base64": "^1.0.2",
Expand Down
12 changes: 12 additions & 0 deletions platform/docs/docs/configuration/dataSources/dicom-json.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,18 @@ Your public folder should look like this:

![](../../assets/img/dicom-json-public.png)

:::tip
It is important to URL encode the `url` query parameter especially if the `url`
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added these docs for DICOM JSON for an unrelated issue that I recently closed.

parameter itself also contains query parameters. So for example,

`http://localhost:3000/viewer/dicomjson?url=http://localhost:3000/LIDC-IDRI-0001.json?key0=val0&key1=val1`

should be...

`http://localhost:3000/viewer/dicomjson?url=http://localhost:3000/LIDC-IDRI-0001.json?key0=val0%26key1=val1`

Notice the ampersand (`&`) is encoded as `%26`.
:::

:::note
When hosting the DICOM JSON files, it is important to be aware that certain providers
Expand Down
15 changes: 14 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8436,7 +8436,20 @@ dcmjs@^0.27:
loglevelnext "^3.0.1"
ndarray "^1.0.19"

dcmjs@^0.29.5, dcmjs@^0.29.8:
dcmjs@^0.29.11:
version "0.29.11"
resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.29.11.tgz#82e19d7c5212218c3225f8022ce97b0102ed3cc8"
integrity sha512-B5fO5D+USzfnuUG7ephnaKMluqBOP4qcckV2LgROXvn0hmWc53Gs2YzlokjcYcDeBAXNfssOOhDekUc+AduwkQ==
dependencies:
"@babel/runtime-corejs3" "^7.22.5"
adm-zip "^0.5.10"
gl-matrix "^3.1.0"
lodash.clonedeep "^4.5.0"
loglevelnext "^3.0.1"
ndarray "^1.0.19"
pako "^2.0.4"

dcmjs@^0.29.8:
version "0.29.8"
resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.29.8.tgz#3daa5224f8e75b2e5b069590bef26a272741fa44"
integrity sha512-Y0/KZAmT1siVo7eH3KK4ZflEbNi61soUpD0N7lsXMVVJQ6IZkHlaSzb9DtqnEpMs7RJDfvZGr1uXpv1vBBIypQ==
Expand Down