Mercurial > hg > orthanc-stone
diff 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 |
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/SortedFrames.h Tue Nov 10 17:35:32 2020 +0100 +++ b/OrthancStone/Sources/Toolbox/SortedFrames.h Tue Nov 10 18:08:16 2020 +0100 @@ -68,8 +68,6 @@ InstancesIndex instancesIndex_; FramesIndex framesIndex_; - const DicomInstanceParameters& GetInstance(size_t instanceIndex) const; - const Frame& GetFrame(size_t frameIndex) const; void AddFramesOfInstance(std::set<size_t>& remainingInstances, @@ -112,20 +110,8 @@ return instances_.size(); } - const Orthanc::DicomMap& GetInstanceTags(size_t instanceIndex) const - { - return GetInstance(instanceIndex).GetTags(); - } - - const std::string& GetSopInstanceUid(size_t instanceIndex) const - { - return GetInstance(instanceIndex).GetSopInstanceUid(); - } - - const CoordinateSystem3D& GetInstanceGeometry(size_t instanceIndex) const - { - return GetInstance(instanceIndex).GetGeometry(); - } + // 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; @@ -137,19 +123,9 @@ size_t GetFramesCount() const; - const Orthanc::DicomMap& GetFrameTags(size_t frameIndex) const - { - return GetFrame(frameIndex).GetInstance().GetTags(); - } - - const std::string& GetFrameSopInstanceUid(size_t frameIndex) const + const DicomInstanceParameters& GetInstanceOfFrame(size_t frameIndex) const { - return GetFrame(frameIndex).GetInstance().GetSopInstanceUid(); - } - - unsigned int GetFrameSiblingsCount(size_t frameIndex) const - { - return GetFrame(frameIndex).GetInstance().GetNumberOfFrames(); + return GetFrame(frameIndex).GetInstance(); } unsigned int GetFrameNumberInInstance(size_t frameIndex) const @@ -157,12 +133,6 @@ return GetFrame(frameIndex).GetFrameNumberInInstance(); } - bool IsFrameMonochrome1(size_t frameIndex) const // TODO - REMOVE - { - return GetFrame(frameIndex).GetInstance().GetImageInformation().GetPhotometricInterpretation() == - Orthanc::PhotometricInterpretation_Monochrome1; - } - CoordinateSystem3D GetFrameGeometry(size_t frameIndex) const; bool LookupFrame(size_t& frameIndex,