Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Toolbox/SortedFrames.h @ 1645:bc7bd8ee13f8
making private two potentially dangerous methods in SortedFrames
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 10 Nov 2020 21:07:05 +0100 |
| parents | 4796fb60999e |
| children | 4a43106bc122 |
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/SortedFrames.h Tue Nov 10 18:08:16 2020 +0100 +++ b/OrthancStone/Sources/Toolbox/SortedFrames.h Tue Nov 10 21:07:05 2020 +0100 @@ -30,6 +30,14 @@ { class SortedFrames : public boost::noncopyable { +#if defined(FRIEND_TEST) + // We're compiling the unit tests + FRIEND_TEST(SortedFrames, Basic); + FRIEND_TEST(SortedFrames, SortSopInstanceUid); + FRIEND_TEST(SortedFrames, SortInstanceNumber); + FRIEND_TEST(SortedFrames, SortInstanceNumberAndImageIndex); +#endif + private: struct Frame { @@ -68,6 +76,11 @@ InstancesIndex instancesIndex_; FramesIndex framesIndex_; + const DicomInstanceParameters& GetInstance(size_t instanceIndex) const; + + bool LookupSopInstanceUid(size_t& instanceIndex, + const std::string& sopInstanceUid) const; + const Frame& GetFrame(size_t frameIndex) const; void AddFramesOfInstance(std::set<size_t>& remainingInstances, @@ -110,12 +123,6 @@ return instances_.size(); } - // TODO - REMOVE THIS DANGEROUS FUNCTION (might be taken for GetInstanceOfFrame()) - const DicomInstanceParameters& GetInstance(size_t instanceIndex) const; - - bool LookupSopInstanceUid(size_t& instanceIndex, - const std::string& sopInstanceUid) const; - bool IsSorted() const { return sorted_;