Mercurial > hg > orthanc

diff OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.h @ 4465:fe774d8e904b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New configuration option: "DicomScuPreferredTransferSyntax" to control transcoding in C-STORE SCU
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Jan 2021 17:08:32 +0100
parents d9473bd5ed43
children 2243f1bb909b
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.h	Wed Jan 20 17:43:15 2021 +0100
+++ b/OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.h	Thu Jan 21 17:08:32 2021 +0100
@@ -70,7 +70,7 @@
     // "ProposedOriginalClasses" keeps track of the storage classes
     // that were proposed with a single transfer syntax
     typedef std::set< std::pair<std::string, DicomTransferSyntax> > ProposedOriginalClasses;
-    
+
     DicomAssociationParameters           parameters_;
     boost::shared_ptr<DicomAssociation>  association_;  // "shared_ptr" is for PImpl
     RegisteredClasses                    registeredClasses_;
@@ -81,7 +81,9 @@
 
     // Return "false" if there is not enough room remaining in the association
     bool ProposeStorageClass(const std::string& sopClassUid,
-                             const std::set<DicomTransferSyntax>& syntaxes);
+                             const std::set<DicomTransferSyntax>& sourceSyntaxes,
+                             bool hasPreferred,
+                             DicomTransferSyntax preferred);
 
     bool LookupPresentationContext(uint8_t& presentationContextId,
                                    const std::string& sopClassUid,
@@ -89,11 +91,15 @@
     
     bool NegotiatePresentationContext(uint8_t& presentationContextId,
                                       const std::string& sopClassUid,
-                                      DicomTransferSyntax transferSyntax);
+                                      DicomTransferSyntax transferSyntax,
+                                      bool hasPreferred,
+                                      DicomTransferSyntax preferred);
 
     void LookupTranscoding(std::set<DicomTransferSyntax>& acceptedSyntaxes,
                            const std::string& sopClassUid,
-                           DicomTransferSyntax sourceSyntax);
+                           DicomTransferSyntax sourceSyntax,
+                           bool hasPreferred,
+                           DicomTransferSyntax preferred);
 
   public:
     explicit DicomStoreUserConnection(const DicomAssociationParameters& params);
@@ -140,6 +146,7 @@
                    IDicomTranscoder& transcoder,
                    const void* buffer,
                    size_t size,
+                   DicomTransferSyntax preferredTransferSyntax,
                    bool hasMoveOriginator,
                    const std::string& moveOriginatorAET,
                    uint16_t moveOriginatorID);