# HG changeset patch # User Sebastien Jodogne # Date 1779445047 -7200 # Node ID 68f6931f02a8ba74f8bb5dfe549a17e78fc200cf # Parent 96731e8733c2d36abd83dfec0a5946d32aaba38e added custom user data to IDataIdentifier diff -r 96731e8733c2 -r 68f6931f02a8 OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake --- a/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake Fri May 22 11:20:36 2026 +0200 +++ b/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake Fri May 22 12:17:27 2026 +0200 @@ -657,6 +657,7 @@ list(APPEND ORTHANC_CORE_SOURCES_INTERNAL ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Cache/MemoryStringCache.cpp ${CMAKE_CURRENT_LIST_DIR}/../../Sources/Cache/SharedArchive.cpp + ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/BaseDataIdentifier.cpp ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/DataSourceAnswer.cpp ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/DataSourceMemoryBudget.cpp ${CMAKE_CURRENT_LIST_DIR}/../../Sources/DataSource/DataSourceReader.cpp diff -r 96731e8733c2 -r 68f6931f02a8 OrthancFramework/Sources/DataSource/DicomDataSource.cpp --- a/OrthancFramework/Sources/DataSource/DicomDataSource.cpp Fri May 22 11:20:36 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DicomDataSource.cpp Fri May 22 12:17:27 2026 +0200 @@ -27,6 +27,7 @@ #include "../DicomParsing/ParsedDicomFile.h" #include "../OrthancException.h" +#include "BaseDataIdentifier.h" #include "DataSourceReader.h" #include "StorageAreaDataSource.h" @@ -35,14 +36,14 @@ namespace Orthanc { - class DicomDataSource::BaseIdentifier : public IDataIdentifier + class DicomDataSource::Identifier : public BaseDataIdentifier { public: virtual StorageAreaDataSource::Range* ReadRange(DataSourceReader& reader) const = 0; }; - class DicomDataSource::WholeIdentifier : public DicomDataSource::BaseIdentifier + class DicomDataSource::WholeIdentifier : public DicomDataSource::Identifier { private: FileInfo attachment_; @@ -73,7 +74,7 @@ }; - class DicomDataSource::BeginningIdentifier : public DicomDataSource::BaseIdentifier + class DicomDataSource::BeginningIdentifier : public DicomDataSource::Identifier { private: FileInfo attachment_; @@ -152,7 +153,7 @@ IDynamicObject* DicomDataSource::Load(const IDataIdentifier& obj) { - const BaseIdentifier& id = dynamic_cast(obj); + const Identifier& id = dynamic_cast(obj); std::unique_ptr range(id.ReadRange(*storageAreaReader_)); diff -r 96731e8733c2 -r 68f6931f02a8 OrthancFramework/Sources/DataSource/DicomDataSource.h --- a/OrthancFramework/Sources/DataSource/DicomDataSource.h Fri May 22 11:20:36 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DicomDataSource.h Fri May 22 12:17:27 2026 +0200 @@ -49,7 +49,7 @@ class DicomDataSource : public IDataSource { private: - class BaseIdentifier; + class Identifier; class WholeIdentifier; class BeginningIdentifier; class Value; diff -r 96731e8733c2 -r 68f6931f02a8 OrthancFramework/Sources/DataSource/IDataIdentifier.h --- a/OrthancFramework/Sources/DataSource/IDataIdentifier.h Fri May 22 11:20:36 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/IDataIdentifier.h Fri May 22 12:17:27 2026 +0200 @@ -24,7 +24,7 @@ #pragma once -#include "../OrthancFramework.h" +#include "../IDynamicObject.h" #include @@ -42,5 +42,9 @@ virtual bool GetCacheKey(std::string& key) const = 0; virtual bool EstimateValueSize(size_t& target) const = 0; + + virtual bool HasUserData() const = 0; + + virtual IDynamicObject& GetUserData() const = 0; }; } diff -r 96731e8733c2 -r 68f6931f02a8 OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp --- a/OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp Fri May 22 11:20:36 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp Fri May 22 12:17:27 2026 +0200 @@ -28,6 +28,7 @@ #include "../OrthancException.h" #include "../StringMemoryBuffer.h" #include "../Toolbox.h" +#include "BaseDataIdentifier.h" #include "DataSourceReader.h" #if ORTHANC_ENABLE_ZLIB == 1 @@ -86,7 +87,7 @@ }; - class StorageAreaDataSource::Identifier : public IDataIdentifier + class StorageAreaDataSource::Identifier : public BaseDataIdentifier { private: std::string uuid_; diff -r 96731e8733c2 -r 68f6931f02a8 OrthancFramework/Sources/DataSource/StorageAreaDataSource.h --- a/OrthancFramework/Sources/DataSource/StorageAreaDataSource.h Fri May 22 11:20:36 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/StorageAreaDataSource.h Fri May 22 12:17:27 2026 +0200 @@ -106,6 +106,8 @@ const StorageRange& range, bool uncompress); + + // TODO-Streaming: Probably to be removed class MultipleReader : public boost::noncopyable { private: diff -r 96731e8733c2 -r 68f6931f02a8 OrthancFramework/Sources/DataSource/TranscoderDataSource.cpp --- a/OrthancFramework/Sources/DataSource/TranscoderDataSource.cpp Fri May 22 11:20:36 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/TranscoderDataSource.cpp Fri May 22 12:17:27 2026 +0200 @@ -26,6 +26,7 @@ #include "../DicomParsing/ParsedDicomFile.h" #include "../OrthancException.h" +#include "BaseDataIdentifier.h" #include "DataSourceReader.h" #include "StorageAreaDataSource.h" @@ -128,7 +129,7 @@ }; - class TranscoderDataSource::Identifier : public IDataIdentifier + class TranscoderDataSource::Identifier : public BaseDataIdentifier { private: FileInfo attachment_;