changeset 6848:68f6931f02a8 streaming

added custom user data to IDataIdentifier
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 22 May 2026 12:17:27 +0200
parents 96731e8733c2
children f1066df74009
files OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake OrthancFramework/Sources/DataSource/DicomDataSource.cpp OrthancFramework/Sources/DataSource/DicomDataSource.h OrthancFramework/Sources/DataSource/IDataIdentifier.h OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp OrthancFramework/Sources/DataSource/StorageAreaDataSource.h OrthancFramework/Sources/DataSource/TranscoderDataSource.cpp
diffstat 7 files changed, 18 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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<const BaseIdentifier&>(obj);
+    const Identifier& id = dynamic_cast<const Identifier&>(obj);
 
     std::unique_ptr<StorageAreaDataSource::Range> range(id.ReadRange(*storageAreaReader_));
 
--- 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;
--- 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 <boost/noncopyable.hpp>
 
@@ -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;
   };
 }
--- 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_;
--- 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:
--- 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_;