Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.h @ 1640:52b8b96cb55f
cleaning namespaces
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 10 Nov 2020 16:55:22 +0100 |
parents | 8563ea5d8ae4 |
children | 9ac2a65d4172 |
line wrap: on
line diff
--- a/OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.h Tue Nov 10 16:41:11 2020 +0100 +++ b/OrthancStone/Sources/Loaders/OrthancMultiframeVolumeLoader.h Tue Nov 10 16:55:22 2020 +0100 @@ -32,7 +32,7 @@ { class OrthancMultiframeVolumeLoader : public LoaderStateMachine, - public OrthancStone::IObservable, + public IObservable, public IGeometryProvider { private: @@ -41,7 +41,7 @@ class LoadTransferSyntax; class LoadUncompressedPixelData; - boost::shared_ptr<OrthancStone::DicomVolumeImage> volume_; + boost::shared_ptr<DicomVolumeImage> volume_; std::string instanceId_; std::string transferSyntaxUid_; bool pixelDataLoaded_; @@ -80,34 +80,31 @@ /** Service method for CopyPixelDataAndComputeMinMax*/ template <typename T> - void CopyPixelDataAndComputeDistribution( - const std::string& pixelData, - std::map<T, uint64_t>& distribution); + void CopyPixelDataAndComputeDistribution(const std::string& pixelData, + std::map<T, uint64_t>& distribution); /** Service method for CopyPixelDataAndComputeMinMax*/ template <typename T> - void ComputeMinMaxWithOutlierRejection( - const std::map<T, uint64_t>& distribution); + void ComputeMinMaxWithOutlierRejection(const std::map<T, uint64_t>& distribution); void SetUncompressedPixelData(const std::string& pixelData); protected: - OrthancMultiframeVolumeLoader( - OrthancStone::ILoadersContext& loadersContext, - boost::shared_ptr<OrthancStone::DicomVolumeImage> volume, - float outliersHalfRejectionRate); + OrthancMultiframeVolumeLoader(ILoadersContext& loadersContext, + boost::shared_ptr<DicomVolumeImage> volume, + float outliersHalfRejectionRate); + public: - static boost::shared_ptr<OrthancMultiframeVolumeLoader> Create( - OrthancStone::ILoadersContext& loadersContext, - boost::shared_ptr<OrthancStone::DicomVolumeImage> volume, + ILoadersContext& loadersContext, + boost::shared_ptr<DicomVolumeImage> volume, float outliersHalfRejectionRate = 0.0005); virtual ~OrthancMultiframeVolumeLoader(); bool HasGeometry() const ORTHANC_OVERRIDE; - virtual const OrthancStone::VolumeImageGeometry& GetImageGeometry() const ORTHANC_OVERRIDE; + virtual const VolumeImageGeometry& GetImageGeometry() const ORTHANC_OVERRIDE; bool IsPixelDataLoaded() const {