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

IDC-2348: Add acquisition storage sr sopclass to sr html ext #2352

Merged
merged 5 commits into from
Apr 21, 2021
Merged

IDC-2348: Add acquisition storage sr sopclass to sr html ext #2352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9d1a88
Add acquisition context storage sr sop to html ext
igoroctaviano Apr 19, 2021
261f7bb
Merge branch 'master' into idc-2348
igoroctaviano Apr 20, 2021
51c13dd
Refresh pipeline
igoroctaviano Apr 21, 2021
a124736
Merge branch 'master' of github.com:OHIF/Viewers into idc-2348
igoroctaviano Apr 21, 2021
53061ad
Merge branch 'master' of github.com:OHIF/Viewers into idc-2348
igoroctaviano Apr 21, 2021
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
1 change: 1 addition & 0 deletions extensions/dicom-html/src/OHIFDicomHtmlSopClassHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const SOP_CLASS_UIDS = {
MAMMOGRAPHY_CAD_SR: '1.2.840.10008.5.1.4.1.1.88.50',
CHEST_CAD_SR: '1.2.840.10008.5.1.4.1.1.88.65',
X_RAY_RADIATION_DOSE_SR: '1.2.840.10008.5.1.4.1.1.88.67',
ACQUISITION_CONTEXT_SR_STORAGE: '1.2.840.10008.5.1.4.1.1.88.71',
};

const sopClassUIDs = Object.values(SOP_CLASS_UIDS);
Expand Down
1 change: 0 additions & 1 deletion platform/core/src/DICOMSR/parseDicomStructuredReport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ const parseDicomStructuredReport = (part10SRArrayBuffer, displaySets) => {

/**
* Function to create imagePath with all imageData related
*
* @param {string} StudyInstanceUID
* @param {string} SeriesInstanceUID
* @param {string} SOPInstanceUID
Expand Down
9 changes: 6 additions & 3 deletions platform/viewer/src/connectedComponents/ViewerRetrieveStudyData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,6 @@ function ViewerRetrieveStudyData({
);

setStudies([...studies, study]);
setIsStudyLoaded(true);
};

/**
Expand Down Expand Up @@ -295,6 +294,9 @@ function ViewerRetrieveStudyData({
setError(error);
log.error(error);
}
})
.finally(() => {
setIsStudyLoaded(true);
});

return study;
Expand Down Expand Up @@ -323,8 +325,9 @@ function ViewerRetrieveStudyData({
const promises = Array(concurrentRequestsAllowed)
.fill(null)
.map(loadNextSeries);

return await Promise.all(promises);
const remainingPromises = await Promise.all(promises);
setIsStudyLoaded(true);
return remainingPromises;
};

const loadStudies = async () => {
Expand Down