Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Toolbox/DicomStructuredReport.h @ 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 |
comparison
equal
deleted
inserted
replaced
2091:35de56fb6f89 | 2092:b7d4d288459a |
---|---|
95 bool hasProbabilityOfCancer, | 95 bool hasProbabilityOfCancer, |
96 float probabilityOfCancer); | 96 float probabilityOfCancer); |
97 | 97 |
98 std::string studyInstanceUid_; | 98 std::string studyInstanceUid_; |
99 std::string seriesInstanceUid_; | 99 std::string seriesInstanceUid_; |
100 std::string sopInstanceUid_; | |
100 std::map<std::string, ReferencedInstance*> instancesInformation_; | 101 std::map<std::string, ReferencedInstance*> instancesInformation_; |
101 std::vector<std::string> orderedInstances_; | 102 std::vector<std::string> orderedInstances_; |
102 std::list<Structure*> structures_; | 103 std::list<Structure*> structures_; |
103 | 104 |
104 public: | 105 public: |
105 class Frame | 106 class ReferencedFrame |
106 { | 107 { |
107 private: | 108 private: |
108 std::string studyInstanceUid_; | 109 std::string studyInstanceUid_; |
109 std::string seriesInstanceUid_; | 110 std::string seriesInstanceUid_; |
110 std::string sopInstanceUid_; | 111 std::string sopInstanceUid_; |
111 std::string sopClassUid_; | 112 std::string sopClassUid_; |
112 unsigned int frameNumber_; | 113 unsigned int frameNumber_; |
113 | 114 |
114 public: | 115 public: |
115 Frame(const std::string& studyInstanceUid, | 116 ReferencedFrame(const std::string& studyInstanceUid, |
116 const std::string& seriesInstanceUid, | 117 const std::string& seriesInstanceUid, |
117 const std::string& sopInstanceUid, | 118 const std::string& sopInstanceUid, |
118 const std::string& sopClassUid, | 119 const std::string& sopClassUid, |
119 unsigned int frameNumber) : | 120 unsigned int frameNumber) : |
120 studyInstanceUid_(studyInstanceUid), | 121 studyInstanceUid_(studyInstanceUid), |
121 seriesInstanceUid_(seriesInstanceUid), | 122 seriesInstanceUid_(seriesInstanceUid), |
122 sopInstanceUid_(sopInstanceUid), | 123 sopInstanceUid_(sopInstanceUid), |
123 sopClassUid_(sopClassUid), | 124 sopClassUid_(sopClassUid), |
124 frameNumber_(frameNumber) | 125 frameNumber_(frameNumber) |
163 const std::string& GetSeriesInstanceUid() const | 164 const std::string& GetSeriesInstanceUid() const |
164 { | 165 { |
165 return seriesInstanceUid_; | 166 return seriesInstanceUid_; |
166 } | 167 } |
167 | 168 |
169 const std::string& GetSopInstanceUid() const | |
170 { | |
171 return sopInstanceUid_; | |
172 } | |
173 | |
168 size_t GetReferencedInstancesCount() const | 174 size_t GetReferencedInstancesCount() const |
169 { | 175 { |
170 return orderedInstances_.size(); | 176 return orderedInstances_.size(); |
171 } | 177 } |
172 | 178 |
174 std::string& seriesInstanceUid, | 180 std::string& seriesInstanceUid, |
175 std::string& sopInstanceUid, | 181 std::string& sopInstanceUid, |
176 std::string& sopClassUid, | 182 std::string& sopClassUid, |
177 size_t i) const; | 183 size_t i) const; |
178 | 184 |
179 void ExportOrderedFrames(std::list<Frame>& frames) const; | 185 void ExportReferencedFrames(std::list<ReferencedFrame>& frames) const; |
180 }; | 186 }; |
181 } | 187 } |