comparison OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp @ 2152:f68f9a8d0d63 dicom-sr tip

integration mainline->dicom-sr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 31 Aug 2024 08:40:01 +0200
parents 9d77c935f2c3 acc9c70bc25a
children
comparison
equal deleted inserted replaced
2148:82b8f1a3dafd 2152:f68f9a8d0d63
133 133
134 134
135 DicomStructuredReport::Structure::Structure(const std::string& sopInstanceUid) : 135 DicomStructuredReport::Structure::Structure(const std::string& sopInstanceUid) :
136 sopInstanceUid_(sopInstanceUid), 136 sopInstanceUid_(sopInstanceUid),
137 hasFrameNumber_(false), 137 hasFrameNumber_(false),
138 hasProbabilityOfCancer_(false) 138 frameNumber_(0), // dummy initialization
139 hasProbabilityOfCancer_(false),
140 probabilityOfCancer_(0) // dummy initialization
139 { 141 {
140 } 142 }
141 143
142 144
143 void DicomStructuredReport::Structure::SetFrameNumber(unsigned int frame) 145 void DicomStructuredReport::Structure::SetFrameNumber(unsigned int frame)
476 478
477 for (size_t m = 0; m < tokens.size(); m++) 479 for (size_t m = 0; m < tokens.size(); m++)
478 { 480 {
479 uint32_t frame; 481 uint32_t frame;
480 if (!Orthanc::SerializationToolbox::ParseUnsignedInteger32(frame, tokens[m]) || 482 if (!Orthanc::SerializationToolbox::ParseUnsignedInteger32(frame, tokens[m]) ||
481 frame <= 0) 483 frame == 0)
482 { 484 {
483 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); 485 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
484 } 486 }
485 else 487 else
486 { 488 {