Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp @ 2092:b7d4d288459a dicom-sr

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 08 Nov 2023 10:32:16 +0100
parents 35de56fb6f89
children 79e984a89a38
comparison
equal deleted inserted replaced
2091:35de56fb6f89 2092:b7d4d288459a
339 { 339 {
340 DcmDataset& dataset = *dicom.GetDcmtkObject().getDataset(); 340 DcmDataset& dataset = *dicom.GetDcmtkObject().getDataset();
341 341
342 studyInstanceUid_ = GetStringValue(dataset, DCM_StudyInstanceUID); 342 studyInstanceUid_ = GetStringValue(dataset, DCM_StudyInstanceUID);
343 seriesInstanceUid_ = GetStringValue(dataset, DCM_SeriesInstanceUID); 343 seriesInstanceUid_ = GetStringValue(dataset, DCM_SeriesInstanceUID);
344 sopInstanceUid_ = GetStringValue(dataset, DCM_SOPInstanceUID);
344 345
345 CheckStringValue(dataset, DCM_Modality, "SR"); 346 CheckStringValue(dataset, DCM_Modality, "SR");
346 CheckStringValue(dataset, DCM_SOPClassUID, "1.2.840.10008.5.1.4.1.1.88.33"); // Comprehensive SR IOD 347 CheckStringValue(dataset, DCM_SOPClassUID, "1.2.840.10008.5.1.4.1.1.88.33"); // Comprehensive SR IOD
347 CheckStringValue(dataset, DCM_ValueType, "CONTAINER"); 348 CheckStringValue(dataset, DCM_ValueType, "CONTAINER");
348 349
571 seriesInstanceUid = found->second->GetSeriesInstanceUid(); 572 seriesInstanceUid = found->second->GetSeriesInstanceUid();
572 sopClassUid = found->second->GetSopClassUid(); 573 sopClassUid = found->second->GetSopClassUid();
573 } 574 }
574 575
575 576
576 void DicomStructuredReport::ExportOrderedFrames(std::list<Frame>& frames) const 577 void DicomStructuredReport::ExportReferencedFrames(std::list<ReferencedFrame>& frames) const
577 { 578 {
578 frames.clear(); 579 frames.clear();
579 580
580 for (size_t i = 0; i < orderedInstances_.size(); i++) 581 for (size_t i = 0; i < orderedInstances_.size(); i++)
581 { 582 {
588 assert(found->second != NULL); 589 assert(found->second != NULL);
589 590
590 for (std::set<unsigned int>::const_iterator frame = found->second->GetFrames().begin(); 591 for (std::set<unsigned int>::const_iterator frame = found->second->GetFrames().begin();
591 frame != found->second->GetFrames().end(); ++frame) 592 frame != found->second->GetFrames().end(); ++frame)
592 { 593 {
593 frames.push_back(Frame(found->second->GetStudyInstanceUid(), 594 frames.push_back(ReferencedFrame(found->second->GetStudyInstanceUid(),
594 found->second->GetSeriesInstanceUid(), 595 found->second->GetSeriesInstanceUid(),
595 orderedInstances_[i], 596 orderedInstances_[i],
596 found->second->GetSopClassUid(), *frame)); 597 found->second->GetSopClassUid(), *frame));
597 } 598 }
598 } 599 }
599 } 600 }
600 } 601 }