Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp @ 2092:b7d4d288459a dicom-sr
refactoring
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 08 Nov 2023 10:32:16 +0100 |
| parents | 35de56fb6f89 |
| children | 79e984a89a38 |
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp Wed Nov 08 10:11:21 2023 +0100 +++ b/OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp Wed Nov 08 10:32:16 2023 +0100 @@ -341,6 +341,7 @@ studyInstanceUid_ = GetStringValue(dataset, DCM_StudyInstanceUID); seriesInstanceUid_ = GetStringValue(dataset, DCM_SeriesInstanceUID); + sopInstanceUid_ = GetStringValue(dataset, DCM_SOPInstanceUID); CheckStringValue(dataset, DCM_Modality, "SR"); CheckStringValue(dataset, DCM_SOPClassUID, "1.2.840.10008.5.1.4.1.1.88.33"); // Comprehensive SR IOD @@ -573,7 +574,7 @@ } - void DicomStructuredReport::ExportOrderedFrames(std::list<Frame>& frames) const + void DicomStructuredReport::ExportReferencedFrames(std::list<ReferencedFrame>& frames) const { frames.clear(); @@ -590,10 +591,10 @@ for (std::set<unsigned int>::const_iterator frame = found->second->GetFrames().begin(); frame != found->second->GetFrames().end(); ++frame) { - frames.push_back(Frame(found->second->GetStudyInstanceUid(), - found->second->GetSeriesInstanceUid(), - orderedInstances_[i], - found->second->GetSopClassUid(), *frame)); + frames.push_back(ReferencedFrame(found->second->GetStudyInstanceUid(), + found->second->GetSeriesInstanceUid(), + orderedInstances_[i], + found->second->GetSopClassUid(), *frame)); } } }