Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Toolbox/SortedFrames.h @ 1644:4796fb60999e
removing methods from SortedFrames to simplify api
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 10 Nov 2020 18:08:16 +0100 |
parents | 882e2253a90e |
children | bc7bd8ee13f8 |
comparison
equal
deleted
inserted
replaced
1643:882e2253a90e | 1644:4796fb60999e |
---|---|
66 std::vector<Frame> frames_; | 66 std::vector<Frame> frames_; |
67 bool sorted_; | 67 bool sorted_; |
68 InstancesIndex instancesIndex_; | 68 InstancesIndex instancesIndex_; |
69 FramesIndex framesIndex_; | 69 FramesIndex framesIndex_; |
70 | 70 |
71 const DicomInstanceParameters& GetInstance(size_t instanceIndex) const; | |
72 | |
73 const Frame& GetFrame(size_t frameIndex) const; | 71 const Frame& GetFrame(size_t frameIndex) const; |
74 | 72 |
75 void AddFramesOfInstance(std::set<size_t>& remainingInstances, | 73 void AddFramesOfInstance(std::set<size_t>& remainingInstances, |
76 size_t instanceIndex); | 74 size_t instanceIndex); |
77 | 75 |
110 size_t GetInstancesCount() const | 108 size_t GetInstancesCount() const |
111 { | 109 { |
112 return instances_.size(); | 110 return instances_.size(); |
113 } | 111 } |
114 | 112 |
115 const Orthanc::DicomMap& GetInstanceTags(size_t instanceIndex) const | 113 // TODO - REMOVE THIS DANGEROUS FUNCTION (might be taken for GetInstanceOfFrame()) |
116 { | 114 const DicomInstanceParameters& GetInstance(size_t instanceIndex) const; |
117 return GetInstance(instanceIndex).GetTags(); | |
118 } | |
119 | |
120 const std::string& GetSopInstanceUid(size_t instanceIndex) const | |
121 { | |
122 return GetInstance(instanceIndex).GetSopInstanceUid(); | |
123 } | |
124 | |
125 const CoordinateSystem3D& GetInstanceGeometry(size_t instanceIndex) const | |
126 { | |
127 return GetInstance(instanceIndex).GetGeometry(); | |
128 } | |
129 | 115 |
130 bool LookupSopInstanceUid(size_t& instanceIndex, | 116 bool LookupSopInstanceUid(size_t& instanceIndex, |
131 const std::string& sopInstanceUid) const; | 117 const std::string& sopInstanceUid) const; |
132 | 118 |
133 bool IsSorted() const | 119 bool IsSorted() const |
135 return sorted_; | 121 return sorted_; |
136 } | 122 } |
137 | 123 |
138 size_t GetFramesCount() const; | 124 size_t GetFramesCount() const; |
139 | 125 |
140 const Orthanc::DicomMap& GetFrameTags(size_t frameIndex) const | 126 const DicomInstanceParameters& GetInstanceOfFrame(size_t frameIndex) const |
141 { | 127 { |
142 return GetFrame(frameIndex).GetInstance().GetTags(); | 128 return GetFrame(frameIndex).GetInstance(); |
143 } | |
144 | |
145 const std::string& GetFrameSopInstanceUid(size_t frameIndex) const | |
146 { | |
147 return GetFrame(frameIndex).GetInstance().GetSopInstanceUid(); | |
148 } | |
149 | |
150 unsigned int GetFrameSiblingsCount(size_t frameIndex) const | |
151 { | |
152 return GetFrame(frameIndex).GetInstance().GetNumberOfFrames(); | |
153 } | 129 } |
154 | 130 |
155 unsigned int GetFrameNumberInInstance(size_t frameIndex) const | 131 unsigned int GetFrameNumberInInstance(size_t frameIndex) const |
156 { | 132 { |
157 return GetFrame(frameIndex).GetFrameNumberInInstance(); | 133 return GetFrame(frameIndex).GetFrameNumberInInstance(); |
158 } | |
159 | |
160 bool IsFrameMonochrome1(size_t frameIndex) const // TODO - REMOVE | |
161 { | |
162 return GetFrame(frameIndex).GetInstance().GetImageInformation().GetPhotometricInterpretation() == | |
163 Orthanc::PhotometricInterpretation_Monochrome1; | |
164 } | 134 } |
165 | 135 |
166 CoordinateSystem3D GetFrameGeometry(size_t frameIndex) const; | 136 CoordinateSystem3D GetFrameGeometry(size_t frameIndex) const; |
167 | 137 |
168 bool LookupFrame(size_t& frameIndex, | 138 bool LookupFrame(size_t& frameIndex, |