Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Toolbox/SortedFrames.h @ 1600:b253b79906fa
clarifying variable names: frameIndex vs numberIndex
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 28 Oct 2020 15:23:26 +0100 |
parents | 73cd85d7da6a |
children | b2941196cabf |
comparison
equal
deleted
inserted
replaced
1599:73cd85d7da6a | 1600:b253b79906fa |
---|---|
75 | 75 |
76 struct Frame | 76 struct Frame |
77 { | 77 { |
78 private: | 78 private: |
79 const Instance* instance_; | 79 const Instance* instance_; |
80 unsigned int frameIndex_; | 80 unsigned int frameNumber_; |
81 | 81 |
82 public: | 82 public: |
83 Frame(const Instance& instance, | 83 Frame(const Instance& instance, |
84 unsigned int frameIndex); | 84 unsigned int frameNumber); |
85 | 85 |
86 const Instance& GetInstance() const | 86 const Instance& GetInstance() const |
87 { | 87 { |
88 return *instance_; | 88 return *instance_; |
89 } | 89 } |
90 | 90 |
91 unsigned int GetFrameIndex() const | 91 unsigned int GetFrameNumberInInstance() const |
92 { | 92 { |
93 return frameIndex_; | 93 return frameNumber_; |
94 } | 94 } |
95 }; | 95 }; |
96 | 96 |
97 | 97 |
98 // Maps "SOPInstanceUID" to an index in "instances_" | 98 // Maps "SOPInstanceUID" to an index in "instances_" |
103 std::vector<Instance*> instances_; | 103 std::vector<Instance*> instances_; |
104 std::vector<Frame> frames_; | 104 std::vector<Frame> frames_; |
105 bool sorted_; | 105 bool sorted_; |
106 InstancesIndex instancesIndex_; | 106 InstancesIndex instancesIndex_; |
107 | 107 |
108 const Instance& GetInstance(size_t index) const; | 108 const Instance& GetInstance(size_t instanceIndex) const; |
109 | 109 |
110 const Frame& GetFrame(size_t index) const; | 110 const Frame& GetFrame(size_t frameIndex) const; |
111 | 111 |
112 void AddFramesOfInstance(std::set<size_t>& remainingInstances, | 112 void AddFramesOfInstance(std::set<size_t>& remainingInstances, |
113 size_t index); | 113 size_t instanceIndex); |
114 | 114 |
115 void SortUsingIntegerTag(std::set<size_t>& remainingInstances, | 115 void SortUsingIntegerTag(std::set<size_t>& remainingInstances, |
116 const Orthanc::DicomTag& tag); | 116 const Orthanc::DicomTag& tag); |
117 | 117 |
118 void SortUsingSopInstanceUid(std::set<size_t>& remainingInstances); | 118 void SortUsingSopInstanceUid(std::set<size_t>& remainingInstances); |
147 size_t GetInstancesCount() const | 147 size_t GetInstancesCount() const |
148 { | 148 { |
149 return instances_.size(); | 149 return instances_.size(); |
150 } | 150 } |
151 | 151 |
152 const Orthanc::DicomMap& GetInstanceTags(size_t index) const | 152 const Orthanc::DicomMap& GetInstanceTags(size_t instanceIndex) const |
153 { | 153 { |
154 return GetInstance(index).GetTags(); | 154 return GetInstance(instanceIndex).GetTags(); |
155 } | 155 } |
156 | 156 |
157 const std::string& GetSopInstanceUid(size_t index) const | 157 const std::string& GetSopInstanceUid(size_t instanceIndex) const |
158 { | 158 { |
159 return GetInstance(index).GetSopInstanceUid(); | 159 return GetInstance(instanceIndex).GetSopInstanceUid(); |
160 } | 160 } |
161 | 161 |
162 bool LookupSopInstanceUid(size_t& instanceIndex, | 162 bool LookupSopInstanceUid(size_t& instanceIndex, |
163 const std::string& sopInstanceUid) const; | 163 const std::string& sopInstanceUid) const; |
164 | 164 |
167 return sorted_; | 167 return sorted_; |
168 } | 168 } |
169 | 169 |
170 size_t GetFramesCount() const; | 170 size_t GetFramesCount() const; |
171 | 171 |
172 const Orthanc::DicomMap& GetFrameTags(size_t index) const | 172 const Orthanc::DicomMap& GetFrameTags(size_t frameIndex) const |
173 { | 173 { |
174 return GetFrame(index).GetInstance().GetTags(); | 174 return GetFrame(frameIndex).GetInstance().GetTags(); |
175 } | 175 } |
176 | 176 |
177 const std::string& GetFrameSopInstanceUid(size_t index) const | 177 const std::string& GetFrameSopInstanceUid(size_t frameIndex) const |
178 { | 178 { |
179 return GetFrame(index).GetInstance().GetSopInstanceUid(); | 179 return GetFrame(frameIndex).GetInstance().GetSopInstanceUid(); |
180 } | 180 } |
181 | 181 |
182 unsigned int GetFrameSiblingsCount(size_t index) const | 182 unsigned int GetFrameSiblingsCount(size_t frameIndex) const |
183 { | 183 { |
184 return GetFrame(index).GetInstance().GetNumberOfFrames(); | 184 return GetFrame(frameIndex).GetInstance().GetNumberOfFrames(); |
185 } | 185 } |
186 | 186 |
187 unsigned int GetFrameIndex(size_t index) const | 187 unsigned int GetFrameNumberInInstance(size_t frameIndex) const |
188 { | 188 { |
189 return GetFrame(index).GetFrameIndex(); | 189 return GetFrame(frameIndex).GetFrameNumberInInstance(); |
190 } | 190 } |
191 | 191 |
192 bool IsFrameMonochrome1(size_t index) const | 192 bool IsFrameMonochrome1(size_t frameIndex) const |
193 { | 193 { |
194 return GetFrame(index).GetInstance().IsMonochrome1(); | 194 return GetFrame(frameIndex).GetInstance().IsMonochrome1(); |
195 } | 195 } |
196 | 196 |
197 void Sort(); | 197 void Sort(); |
198 }; | 198 }; |
199 } | 199 } |