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(dicom): Update multiframe DICOM JSON parsing for correct image ID generation #4307

Merged
merged 2 commits into from
Jul 26, 2024
Merged

fix(dicom): Update multiframe DICOM JSON parsing for correct image ID generation #4307

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
996ed26
Use json instances if present for multiframe
igoroctaviano Jul 24, 2024
dd78da4
chore: Update DICOM JSON generator to support optional scheme parameter
sedghi Jul 26, 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
17 changes: 12 additions & 5 deletions extensions/default/src/DicomJSONDataSource/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ const findStudies = (key, value) => {
};

function createDicomJSONApi(dicomJsonConfig) {
const { wadoRoot } = dicomJsonConfig;

const implementation = {
initialize: async ({ query, url }) => {
if (!url) {
Expand Down Expand Up @@ -89,7 +87,8 @@ function createDicomJSONApi(dicomJsonConfig) {
SeriesInstanceUID = series.SeriesInstanceUID;

series.instances.forEach(instance => {
const { url: imageId, metadata: naturalizedDicom } = instance;
const { metadata: naturalizedDicom } = instance;
const imageId = getImageId({ instance, config: dicomJsonConfig });

// Add imageId specific mapping to this data as the URL isn't necessarliy WADO-URI.
metadataProvider.addImageIdToUIDs(imageId, {
Expand Down Expand Up @@ -228,7 +227,7 @@ function createDicomJSONApi(dicomJsonConfig) {
const obj = {
...modifiedMetadata,
url: instance.url,
imageId: instance.url,
imageId: getImageId({ instance, config: dicomJsonConfig }),
...series,
...study,
};
Expand Down Expand Up @@ -257,7 +256,15 @@ function createDicomJSONApi(dicomJsonConfig) {
return imageIds;
}

displaySet.images.forEach(instance => {
const { StudyInstanceUID, SeriesInstanceUID } = displaySet;
const study = findStudies('StudyInstanceUID', StudyInstanceUID)[0];
const series = study.series.find(s => s.SeriesInstanceUID === SeriesInstanceUID);
let instances = displaySet.images;
if (series.instances.length > displaySet.images.length) {
instances = series.instances;
}

instances.forEach(instance => {
const NumberOfFrames = instance.NumberOfFrames;

if (NumberOfFrames > 1) {
Expand Down