# HG changeset patch # User Sebastien Jodogne # Date 1779824207 -7200 # Node ID e48f923cdab8d2c42b17b1191c21739f9863a531 # Parent 874a093dd254e598d40b2734cfa73284c62131a6 propagation of user data until DicomSequentialReader diff -r 874a093dd254 -r e48f923cdab8 OrthancFramework/Sources/DataSource/BaseDataIdentifier.cpp --- a/OrthancFramework/Sources/DataSource/BaseDataIdentifier.cpp Tue May 26 18:41:02 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/BaseDataIdentifier.cpp Tue May 26 21:36:47 2026 +0200 @@ -62,4 +62,17 @@ throw OrthancException(ErrorCode_BadSequenceOfCalls); } } + + + IDynamicObject* BaseDataIdentifier::ReleaseUserData() + { + if (userData_.get() != NULL) + { + return userData_.release(); + } + else + { + throw OrthancException(ErrorCode_BadSequenceOfCalls); + } + } } diff -r 874a093dd254 -r e48f923cdab8 OrthancFramework/Sources/DataSource/BaseDataIdentifier.h --- a/OrthancFramework/Sources/DataSource/BaseDataIdentifier.h Tue May 26 18:41:02 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/BaseDataIdentifier.h Tue May 26 21:36:47 2026 +0200 @@ -41,5 +41,7 @@ virtual bool HasUserData() const ORTHANC_OVERRIDE; virtual const IDynamicObject& GetUserData() const ORTHANC_OVERRIDE; + + virtual IDynamicObject* ReleaseUserData() ORTHANC_OVERRIDE; }; } diff -r 874a093dd254 -r e48f923cdab8 OrthancFramework/Sources/DataSource/DataSourceAnswer.cpp --- a/OrthancFramework/Sources/DataSource/DataSourceAnswer.cpp Tue May 26 18:41:02 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DataSourceAnswer.cpp Tue May 26 21:36:47 2026 +0200 @@ -103,19 +103,6 @@ } - IDataIdentifier* DataSourceAnswer::Item::ReleaseIdentifier() - { - if (id_.get() == NULL) - { - throw OrthancException(ErrorCode_BadSequenceOfCalls); - } - else - { - return id_.release(); - } - } - - void DataSourceAnswer::EnqueueInternal(Item* item) { std::unique_ptr protection(item); diff -r 874a093dd254 -r e48f923cdab8 OrthancFramework/Sources/DataSource/DataSourceAnswer.h --- a/OrthancFramework/Sources/DataSource/DataSourceAnswer.h Tue May 26 18:41:02 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DataSourceAnswer.h Tue May 26 21:36:47 2026 +0200 @@ -76,7 +76,15 @@ const boost::shared_ptr& GetValue() const; - IDataIdentifier* ReleaseIdentifier(); + bool HasUserData() const + { + return id_->HasUserData(); + } + + IDynamicObject* ReleaseUserData() + { + return id_->ReleaseUserData(); + } }; private: diff -r 874a093dd254 -r e48f923cdab8 OrthancFramework/Sources/DataSource/DataSourceSequentialReader.cpp --- a/OrthancFramework/Sources/DataSource/DataSourceSequentialReader.cpp Tue May 26 18:41:02 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DataSourceSequentialReader.cpp Tue May 26 21:36:47 2026 +0200 @@ -30,38 +30,22 @@ namespace Orthanc { - DataSourceSequentialReader::Item::Item(IDataIdentifier* id, - IDynamicObject* value, + DataSourceSequentialReader::Item::Item(IDynamicObject* value, size_t estimatedSize) : - id_(id), value_(value), estimatedSize_(estimatedSize) { - if (id == NULL || - value == NULL) + if (value == NULL) { throw OrthancException(ErrorCode_NullPointer); } } - DataSourceSequentialReader::Item::Item(IDataIdentifier* id, - const OrthancException& error) : - id_(id), + DataSourceSequentialReader::Item::Item(const OrthancException& error) : error_(new OrthancException(error)), estimatedSize_(0) { - if (id == NULL) - { - throw OrthancException(ErrorCode_NullPointer); - } - } - - - const IDataIdentifier& DataSourceSequentialReader::Item::GetIdentifier() const - { - assert(id_.get() != NULL); - return *id_; } @@ -83,6 +67,32 @@ } + void DataSourceSequentialReader::Item::SetUserData(IDynamicObject* userData) + { + if (userData == NULL) + { + throw OrthancException(ErrorCode_NullPointer); + } + else + { + userData_.reset(userData); + } + } + + + const IDynamicObject& DataSourceSequentialReader::Item::GetUserData() const + { + if (userData_.get() == NULL) + { + throw OrthancException(ErrorCode_BadSequenceOfCalls); + } + else + { + return *userData_; + } + } + + IDynamicObject* DataSourceSequentialReader::Item::ReleaseValue() { if (value_.get() != NULL) @@ -101,6 +111,19 @@ } + IDynamicObject* DataSourceSequentialReader::Item::ReleaseUserData() + { + if (userData_.get() == NULL) + { + throw OrthancException(ErrorCode_BadSequenceOfCalls); + } + else + { + return userData_.release(); + } + } + + class DataSourceSequentialReader::Callable : public ICallable { private: @@ -131,18 +154,40 @@ { std::unique_ptr answer(reader_->ReadSingle(request_.release())); + std::unique_ptr userData; + + if (answer->HasUserData()) + { + userData.reset(answer->ReleaseUserData()); + } + + std::unique_ptr item; + try { - return new Item(answer->ReleaseIdentifier(), disconnector_->Apply(answer.release()), estimatedSize_); + std::unique_ptr detached(disconnector_->Apply(answer.release())); + if (detached.get() == NULL) + { + throw OrthancException(ErrorCode_NullPointer); + } + + item.reset(new Item(detached.release(), estimatedSize_)); } catch (OrthancException& e) { - return new Item(answer->ReleaseIdentifier(), e); + item.reset(new Item(e)); } catch (...) { - return new Item(answer->ReleaseIdentifier(), OrthancException(ErrorCode_InternalError)); + item.reset(new Item(OrthancException(ErrorCode_InternalError))); } + + if (userData.get() != NULL) + { + item->SetUserData(userData.release()); + } + + return item.release(); } }; diff -r 874a093dd254 -r e48f923cdab8 OrthancFramework/Sources/DataSource/DataSourceSequentialReader.h --- a/OrthancFramework/Sources/DataSource/DataSourceSequentialReader.h Tue May 26 18:41:02 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DataSourceSequentialReader.h Tue May 26 21:36:47 2026 +0200 @@ -54,29 +54,36 @@ class Item : public IDynamicObject { private: - std::unique_ptr id_; std::unique_ptr value_; std::unique_ptr error_; + std::unique_ptr userData_; size_t estimatedSize_; public: - Item(IDataIdentifier* id, - IDynamicObject* value, + Item(IDynamicObject* value, size_t estimatedSize); - Item(IDataIdentifier* id, - const OrthancException& error); - - const IDataIdentifier& GetIdentifier() const; + Item(const OrthancException& error); const IDynamicObject& GetValue() const; + void SetUserData(IDynamicObject* userData); + + bool HasUserData() const + { + return userData_.get() != NULL; + } + + const IDynamicObject& GetUserData() const; + size_t GetEstimatedSize() const { return estimatedSize_; } IDynamicObject* ReleaseValue(); + + IDynamicObject* ReleaseUserData(); }; @@ -92,6 +99,7 @@ { } + // Note that "source" will never contain user data, those are handled at the level above virtual IDynamicObject* Apply(DataSourceAnswer::Item* source) = 0; }; diff -r 874a093dd254 -r e48f923cdab8 OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp --- a/OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp Tue May 26 18:41:02 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DicomSequentialReader.cpp Tue May 26 21:36:47 2026 +0200 @@ -108,6 +108,32 @@ } + void DicomSequentialReader::Item::SetUserData(IDynamicObject* userData /* takes ownership */) + { + if (userData == NULL) + { + throw OrthancException(ErrorCode_NullPointer); + } + else + { + userData_.reset(userData); + } + } + + + const IDynamicObject& DicomSequentialReader::Item::GetUserData() const + { + if (userData_.get() == NULL) + { + throw OrthancException(ErrorCode_BadSequenceOfCalls); + } + else + { + return *userData_; + } + } + + class DicomSequentialReader::Disconnector : public DataSourceSequentialReader::IValueDisconnector { private: @@ -119,7 +145,7 @@ { } - virtual IDynamicObject* Apply(DataSourceAnswer::Item* source) + virtual IDynamicObject* Apply(DataSourceAnswer::Item* source) ORTHANC_OVERRIDE { std::unique_ptr protection(source); @@ -205,19 +231,35 @@ DicomSequentialReader* DicomSequentialReader::CreateForOriginal(const boost::shared_ptr& executor, + ExpectedAnswer expectedAnswer, const boost::shared_ptr& dicomReader, unsigned int windowSize, uint64_t windowCapacity) { - return new DicomSequentialReader( - SourceType_Dicom, executor, - DicomTransferSyntax_LittleEndianImplicit, TranscodingSopInstanceUidMode_AllowNew, - false /* no lossy */, 0 /* unused lossy quality */, - dicomReader, windowSize, windowCapacity); + switch (expectedAnswer) + { + case ExpectedAnswer_ParsedDicomFile: + return new DicomSequentialReader( + SourceType_Dicom, executor, + DicomTransferSyntax_LittleEndianImplicit, TranscodingSopInstanceUidMode_AllowNew, /* dummy values */ + false /* no lossy */, 0 /* unused lossy quality */, + dicomReader, windowSize, windowCapacity); + + case ExpectedAnswer_RawMemoryBuffer: + return new DicomSequentialReader( + SourceType_StorageArea, executor, + DicomTransferSyntax_LittleEndianImplicit, TranscodingSopInstanceUidMode_AllowNew, /* dummy values */ + false /* no lossy */, 0 /* unused lossy quality */, + dicomReader, windowSize, windowCapacity); + + default: + throw OrthancException(ErrorCode_NotImplemented); + } } DicomSequentialReader* DicomSequentialReader::CreateForTranscoded(const boost::shared_ptr& executor, + ExpectedAnswer expectedAnswer, DicomTransferSyntax targetSyntax, TranscodingSopInstanceUidMode mode, bool hasLossyQuality, @@ -226,10 +268,20 @@ unsigned int windowSize, uint64_t windowCapacity) { - return new DicomSequentialReader( - SourceType_Transcoder, executor, - targetSyntax, mode, hasLossyQuality, lossyQuality, - transcoderReader, windowSize, windowCapacity); + switch (expectedAnswer) + { + case ExpectedAnswer_RawMemoryBuffer: + // TODO + + case ExpectedAnswer_ParsedDicomFile: + return new DicomSequentialReader( + SourceType_Transcoder, executor, + targetSyntax, mode, hasLossyQuality, lossyQuality, + transcoderReader, windowSize, windowCapacity); + + default: + throw OrthancException(ErrorCode_NotImplemented); + } } @@ -265,7 +317,15 @@ DicomSequentialReader::Item* DicomSequentialReader::Next() { - std::unique_ptr item(reader_.Next()); - return dynamic_cast(item->ReleaseValue()); + std::unique_ptr source(reader_.Next()); + + std::unique_ptr target(dynamic_cast(source->ReleaseValue())); + + if (source->HasUserData()) + { + target->SetUserData(source->ReleaseUserData()); + } + + return target.release(); } } diff -r 874a093dd254 -r e48f923cdab8 OrthancFramework/Sources/DataSource/DicomSequentialReader.h --- a/OrthancFramework/Sources/DataSource/DicomSequentialReader.h Tue May 26 18:41:02 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DicomSequentialReader.h Tue May 26 21:36:47 2026 +0200 @@ -37,25 +37,39 @@ class ORTHANC_PUBLIC DicomSequentialReader : public boost::noncopyable { public: + enum ExpectedAnswer + { + ExpectedAnswer_ParsedDicomFile, + ExpectedAnswer_RawMemoryBuffer + }; + class ORTHANC_PUBLIC Item : public IDynamicObject { private: std::unique_ptr parsed_; boost::shared_ptr raw_; + std::unique_ptr userData_; public: explicit Item(ParsedDicomFile* parsed /* takes ownership */); explicit Item(const boost::shared_ptr& raw); - private: Item(ParsedDicomFile* parsed /* takes ownership */, IMemoryBuffer* raw /* takes ownership */); - public: ParsedDicomFile& GetParsedDicomFile(); const IMemoryBuffer& GetRawMemoryBuffer(); + + void SetUserData(IDynamicObject* userData /* takes ownership */); + + bool HasUserData() const + { + return userData_.get() != NULL; + } + + const IDynamicObject& GetUserData() const; }; private: @@ -90,11 +104,13 @@ public: static DicomSequentialReader* CreateForOriginal(const boost::shared_ptr& executor, + ExpectedAnswer expectedAnswer, const boost::shared_ptr& dicomReader, unsigned int windowSize, uint64_t windowCapacity); static DicomSequentialReader* CreateForTranscoded(const boost::shared_ptr& executor, + ExpectedAnswer expectedAnswer, DicomTransferSyntax targetSyntax, TranscodingSopInstanceUidMode mode, bool hasLossyQuality, diff -r 874a093dd254 -r e48f923cdab8 OrthancFramework/Sources/DataSource/IDataIdentifier.h --- a/OrthancFramework/Sources/DataSource/IDataIdentifier.h Tue May 26 18:41:02 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/IDataIdentifier.h Tue May 26 21:36:47 2026 +0200 @@ -46,5 +46,7 @@ virtual bool HasUserData() const = 0; virtual const IDynamicObject& GetUserData() const = 0; + + virtual IDynamicObject* ReleaseUserData() = 0; }; } diff -r 874a093dd254 -r e48f923cdab8 OrthancServer/Sources/OrthancGetRequestHandler.cpp --- a/OrthancServer/Sources/OrthancGetRequestHandler.cpp Tue May 26 18:41:02 2026 +0200 +++ b/OrthancServer/Sources/OrthancGetRequestHandler.cpp Tue May 26 21:36:47 2026 +0200 @@ -588,7 +588,7 @@ } - instancesLoader_.reset(context_.CreateDicomSequentialReader()); + instancesLoader_.reset(context_.CreateDicomSequentialReader(true /* we want ParsedDicomFile */)); for (size_t i = 0; i < instancesIds_.size(); ++i) { diff -r 874a093dd254 -r e48f923cdab8 OrthancServer/Sources/ServerContext.cpp --- a/OrthancServer/Sources/ServerContext.cpp Tue May 26 18:41:02 2026 +0200 +++ b/OrthancServer/Sources/ServerContext.cpp Tue May 26 21:36:47 2026 +0200 @@ -2172,22 +2172,38 @@ } - DicomSequentialReader* ServerContext::CreateDicomSequentialReader() + static DicomSequentialReader::ExpectedAnswer ConvertToExpectedAnswer(bool asParsedDicomFile) + { + if (asParsedDicomFile) + { + return DicomSequentialReader::ExpectedAnswer_ParsedDicomFile; + } + else + { + return DicomSequentialReader::ExpectedAnswer_RawMemoryBuffer; + } + } + + + DicomSequentialReader* ServerContext::CreateDicomSequentialReader(bool asParsedDicomFile) { return DicomSequentialReader::CreateForOriginal( - sequentialReaderThreadPool_, dicomReader_, + sequentialReaderThreadPool_, ConvertToExpectedAnswer(asParsedDicomFile), + asParsedDicomFile ? dicomReader_ : storageAreaReader_, 4 /* TODO-Streaming: Parameter */, 0 /* TODO-Streaming: Parameter */); } - DicomSequentialReader* ServerContext::CreateTranscodedSequentialReader(DicomTransferSyntax targetSyntax, + DicomSequentialReader* ServerContext::CreateTranscodedSequentialReader(bool asParsedDicomFile, + DicomTransferSyntax targetSyntax, TranscodingSopInstanceUidMode mode, bool hasLossyQuality, unsigned int lossyQuality) { return DicomSequentialReader::CreateForTranscoded( - sequentialReaderThreadPool_, targetSyntax, mode, hasLossyQuality, lossyQuality, transcoderReader_, + sequentialReaderThreadPool_, ConvertToExpectedAnswer(asParsedDicomFile), + targetSyntax, mode, hasLossyQuality, lossyQuality, transcoderReader_, 4 /* TODO-Streaming: Parameter */, 0 /* TODO-Streaming: Parameter */); } diff -r 874a093dd254 -r e48f923cdab8 OrthancServer/Sources/ServerContext.h --- a/OrthancServer/Sources/ServerContext.h Tue May 26 18:41:02 2026 +0200 +++ b/OrthancServer/Sources/ServerContext.h Tue May 26 21:36:47 2026 +0200 @@ -593,9 +593,16 @@ Future* SubmitTranscodingRequest(TranscodingCallable* callable); - DicomSequentialReader* CreateDicomSequentialReader(); + /** + * If "asParsedDicomFile" is "false", the reader will prioritize + * the downloading of the raw DICOM files (and avoid parsing if + * possible). If it is "true", the reader will prioritize the + * parsing of the DICOM files. + **/ + DicomSequentialReader* CreateDicomSequentialReader(bool asParsedDicomFile); - DicomSequentialReader* CreateTranscodedSequentialReader(DicomTransferSyntax targetSyntax, + DicomSequentialReader* CreateTranscodedSequentialReader(bool asParsedDicomFile, + DicomTransferSyntax targetSyntax, TranscodingSopInstanceUidMode mode, bool hasLossyQuality, unsigned int lossyQuality); diff -r 874a093dd254 -r e48f923cdab8 OrthancServer/Sources/ServerJobs/ArchiveJob.cpp --- a/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp Tue May 26 18:41:02 2026 +0200 +++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp Tue May 26 21:36:47 2026 +0200 @@ -1204,11 +1204,12 @@ if (transcode_) { instancesLoader_.reset(context_.CreateTranscodedSequentialReader( - transferSyntax_, TranscodingSopInstanceUidMode_AllowNew, hasLossyQuality_, lossyQuality_)); + false /* prioritize raw DICOM files */, transferSyntax_, + TranscodingSopInstanceUidMode_AllowNew, hasLossyQuality_, lossyQuality_)); } else { - instancesLoader_.reset(context_.CreateDicomSequentialReader()); + instancesLoader_.reset(context_.CreateDicomSequentialReader(false /* prioritize raw DICOM files */)); } writer_->PreloadAllCommands(*instancesLoader_);