Mercurial > hg > orthanc-stone
changeset 2319:1bb0f5f65063 refactoring
removed class DicomVolumeLoader::Factory
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 30 Sep 2026 15:13:50 +0200 |
| parents | 13e46944d430 |
| children | c03b0c89c458 |
| files | OrthancStone/Sources/Loaders/DicomVolumeLoader.cpp OrthancStone/Sources/Loaders/DicomVolumeLoader.h |
| diffstat | 2 files changed, 0 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancStone/Sources/Loaders/DicomVolumeLoader.cpp Wed Sep 30 14:25:54 2026 +0200 +++ b/OrthancStone/Sources/Loaders/DicomVolumeLoader.cpp Wed Sep 30 15:13:50 2026 +0200 @@ -138,31 +138,6 @@ } - DicomVolumeLoader::Factory::Factory(LoadedDicomResources& instances) : - framesFactory_(instances), - computeRange_(false) - { - } - - DicomVolumeLoader::Factory::Factory(const SeriesMetadataLoader::SuccessMessage& metadata) : - framesFactory_(metadata.GetInstances()), - computeRange_(false) - { - SetDicomDir(metadata.GetDicomDirPath(), metadata.GetDicomDir()); // Only useful for DICOMDIR sources - } - - - boost::shared_ptr<IObserver> DicomVolumeLoader::Factory::Create(StoneApplication::Context& context) - { - boost::shared_ptr<SeriesFramesLoader> frames = - boost::dynamic_pointer_cast<SeriesFramesLoader>(framesFactory_.Create(context)); - - boost::shared_ptr<DicomVolumeLoader> volume(new DicomVolumeLoader(frames, computeRange_)); - volume->Register<SeriesFramesLoader::FrameLoadedMessage>(*frames, &DicomVolumeLoader::Handle); - - return volume; - } - void DicomVolumeLoader::Start(int priority, const DicomSource& source) {
--- a/OrthancStone/Sources/Loaders/DicomVolumeLoader.h Wed Sep 30 14:25:54 2026 +0200 +++ b/OrthancStone/Sources/Loaders/DicomVolumeLoader.h Wed Sep 30 15:13:50 2026 +0200 @@ -92,31 +92,6 @@ }; - class Factory : public boost::noncopyable // TODO Refactoring - Remove this? - { - private: - SeriesFramesLoader::Factory framesFactory_; - bool computeRange_; - - public: - explicit Factory(LoadedDicomResources& instances); - - explicit Factory(const SeriesMetadataLoader::SuccessMessage& metadata); - - void SetComputeRange(bool computeRange) - { - computeRange_ = computeRange; - } - - void SetDicomDir(const std::string& dicomDirPath, - boost::shared_ptr<LoadedDicomResources> dicomDir) - { - framesFactory_.SetDicomDir(dicomDirPath, dicomDir); - } - - boost::shared_ptr<IObserver> Create(StoneApplication::Context& context); - }; - bool IsValid() const { return isValid_;
