Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Toolbox/DicomInstanceParameters.cpp @ 1846:2789b4b0e0a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DicomInstanceParameters::HasNumberOfFrames() and DicomInstanceParameters::GetInstanceNumber()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 25 Jun 2021 09:57:32 +0200
parents 0489fe25ce48
children 3889ae96d2e9
comparison
equal deleted inserted replaced
1845:ca85b6d60bca 1846:2789b4b0e0a8
89 } 89 }
90 90
91 uint32_t n; 91 uint32_t n;
92 if (dicom.ParseUnsignedInteger32(n, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES)) 92 if (dicom.ParseUnsignedInteger32(n, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES))
93 { 93 {
94 hasNumberOfFrames_ = true;
94 numberOfFrames_ = n; 95 numberOfFrames_ = n;
95 } 96 }
96 else 97 else
97 { 98 {
99 hasNumberOfFrames_ = false;
98 numberOfFrames_ = 1; 100 numberOfFrames_ = 1;
99 } 101 }
100 102
101 if (!dicom.HasTag(Orthanc::DICOM_TAG_COLUMNS) || 103 if (!dicom.HasTag(Orthanc::DICOM_TAG_COLUMNS) ||
102 !dicom.GetValue(Orthanc::DICOM_TAG_COLUMNS).ParseFirstUnsignedInteger(width_)) 104 !dicom.GetValue(Orthanc::DICOM_TAG_COLUMNS).ParseFirstUnsignedInteger(width_))
260 if (!dicom.LookupStringValue( 262 if (!dicom.LookupStringValue(
261 frameOfReferenceUid_, Orthanc::DICOM_TAG_FRAME_OF_REFERENCE_UID, false)) 263 frameOfReferenceUid_, Orthanc::DICOM_TAG_FRAME_OF_REFERENCE_UID, false))
262 { 264 {
263 frameOfReferenceUid_.clear(); 265 frameOfReferenceUid_.clear();
264 } 266 }
267
268 if (!dicom.HasTag(Orthanc::DICOM_TAG_INSTANCE_NUMBER) ||
269 !dicom.GetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER).ParseInteger32(instanceNumber_))
270 {
271 instanceNumber_ = 0;
272 }
265 } 273 }
266 274
267 275
268 const Orthanc::DicomImageInformation& DicomInstanceParameters::GetImageInformation() const 276 const Orthanc::DicomImageInformation& DicomInstanceParameters::GetImageInformation() const
269 { 277 {