# HG changeset patch # User Sebastien Jodogne # Date 1790774030 -7200 # Node ID 1bb0f5f65063dbb2fa526e92e233c0f34c98e8c1 # Parent 13e46944d43030140c2b3d28d233630e69867d6e removed class DicomVolumeLoader::Factory diff -r 13e46944d430 -r 1bb0f5f65063 OrthancStone/Sources/Loaders/DicomVolumeLoader.cpp --- 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 DicomVolumeLoader::Factory::Create(StoneApplication::Context& context) - { - boost::shared_ptr frames = - boost::dynamic_pointer_cast(framesFactory_.Create(context)); - - boost::shared_ptr volume(new DicomVolumeLoader(frames, computeRange_)); - volume->Register(*frames, &DicomVolumeLoader::Handle); - - return volume; - } - void DicomVolumeLoader::Start(int priority, const DicomSource& source) { diff -r 13e46944d430 -r 1bb0f5f65063 OrthancStone/Sources/Loaders/DicomVolumeLoader.h --- 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 dicomDir) - { - framesFactory_.SetDicomDir(dicomDirPath, dicomDir); - } - - boost::shared_ptr Create(StoneApplication::Context& context); - }; - bool IsValid() const { return isValid_;