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: 2965 Correct Parsing Logic for Qualitative Instance Level SR #2972

Merged
merged 3 commits into from
Oct 25, 2022
Merged

fix: 2965 Correct Parsing Logic for Qualitative Instance Level SR #2972

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0c1947
fix: 2965 Correct Parsing Logic for Qualitative Instance Level SR
GitanjaliChhetri Oct 4, 2022
7f9014e
fix: 2965 Correct Parsing Logic for Qualitative Instance Level SR
GitanjaliChhetri Oct 4, 2022
a368453
fix: 2965 Correct Parsing Logic for Qualitative Instance Level SR
GitanjaliChhetri Oct 6, 2022
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: 0 additions & 2 deletions platform/core/src/DICOMSR/SCOORD3D/parseSCOORD3D.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { ImageSet } from '../../classes';
import getMeasurements from './utils/getMeasurements';
import getReferencedImagesList from './utils/getReferencedImagesList';
import isRehydratable from './utils/isRehydratable';
import addMeasurement from './utils/addMeasurement';

Expand All @@ -27,7 +26,6 @@ const parseSCOORD3D = ({ servicesManager, displaySets }) => {

const { ContentSequence } = firstInstance;

srDisplaySet.referencedImages = getReferencedImagesList(ContentSequence);
srDisplaySet.measurements = getMeasurements(ContentSequence);
const mappings = MeasurementService.getSourceMappings(
'CornerstoneTools',
Expand Down
14 changes: 3 additions & 11 deletions platform/core/src/DICOMSR/SCOORD3D/utils/getReferencedImagesList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ const getReferencedImagesList = ImagingMeasurementReportContentSequence => {
const ImageLibrary = ImagingMeasurementReportContentSequence.find(
item =>
item.ConceptNameCodeSequence.CodeValue ===
CodeNameCodeSequenceValues.ImageLibrary ||
item.ConceptNameCodeSequence.CodeValue ===
CodeNameCodeSequenceValues.ImagingMeasurements
CodeNameCodeSequenceValues.ImageLibrary
);

if (!ImageLibrary || !ImageLibrary.ContentSequence) {
if (!ImageLibrary.ContentSequence) {
return referencedImages;
}

Expand All @@ -21,15 +19,9 @@ const getReferencedImagesList = ImagingMeasurementReportContentSequence => {
).find(
item =>
item.ConceptNameCodeSequence.CodeValue ===
CodeNameCodeSequenceValues.ImageLibraryGroup ||
item.ConceptNameCodeSequence.CodeValue ===
CodeNameCodeSequenceValues.MeasurementGroup
CodeNameCodeSequenceValues.ImageLibraryGroup
);

if (!ImageLibraryGroup || !ImageLibraryGroup.ContentSequence) {
return referencedImages;
}

getSequenceAsArray(ImageLibraryGroup.ContentSequence).forEach(item => {
const { ReferencedSOPSequence } = item;
if (ReferencedSOPSequence) {
Expand Down