Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp @ 2091:35de56fb6f89 dicom-sr
support of referenced instances
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 08 Nov 2023 10:11:21 +0100 |
parents | 63d77859edee |
children | b7d4d288459a |
comparison
equal
deleted
inserted
replaced
2090:c2dfc253bd04 | 2091:35de56fb6f89 |
---|---|
124 { | 124 { |
125 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | 125 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
126 } | 126 } |
127 else | 127 else |
128 { | 128 { |
129 frames_.insert(frame); | 129 frames_.insert(frame - 1); |
130 } | 130 } |
131 } | 131 } |
132 | 132 |
133 | 133 |
134 class DicomStructuredReport::Structure : public boost::noncopyable | 134 class DicomStructuredReport::Structure : public boost::noncopyable |
159 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | 159 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
160 } | 160 } |
161 else | 161 else |
162 { | 162 { |
163 hasFrameNumber_ = true; | 163 hasFrameNumber_ = true; |
164 frameNumber_ = frame; | 164 frameNumber_ = frame - 1; |
165 } | 165 } |
166 } | 166 } |
167 | 167 |
168 void SetProbabilityOfCancer(float probability) | 168 void SetProbabilityOfCancer(float probability) |
169 { | 169 { |
336 | 336 |
337 | 337 |
338 DicomStructuredReport::DicomStructuredReport(Orthanc::ParsedDicomFile& dicom) | 338 DicomStructuredReport::DicomStructuredReport(Orthanc::ParsedDicomFile& dicom) |
339 { | 339 { |
340 DcmDataset& dataset = *dicom.GetDcmtkObject().getDataset(); | 340 DcmDataset& dataset = *dicom.GetDcmtkObject().getDataset(); |
341 | |
342 studyInstanceUid_ = GetStringValue(dataset, DCM_StudyInstanceUID); | |
343 seriesInstanceUid_ = GetStringValue(dataset, DCM_SeriesInstanceUID); | |
341 | 344 |
342 CheckStringValue(dataset, DCM_Modality, "SR"); | 345 CheckStringValue(dataset, DCM_Modality, "SR"); |
343 CheckStringValue(dataset, DCM_SOPClassUID, "1.2.840.10008.5.1.4.1.1.88.33"); // Comprehensive SR IOD | 346 CheckStringValue(dataset, DCM_SOPClassUID, "1.2.840.10008.5.1.4.1.1.88.33"); // Comprehensive SR IOD |
344 CheckStringValue(dataset, DCM_ValueType, "CONTAINER"); | 347 CheckStringValue(dataset, DCM_ValueType, "CONTAINER"); |
345 | 348 |