Mercurial > hg > orthanc

changeset 3911:0ef7f4528be2 transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed option TranscodingEnabled to TranscodeDicomProtocol
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 08 May 2020 12:10:04 +0200
parents 1f71c2f20e16
children 7610af1532c3
files OrthancServer/ServerContext.cpp OrthancServer/ServerContext.h Resources/Configuration.json
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/ServerContext.cpp	Fri May 08 12:03:26 2020 +0200
+++ b/OrthancServer/ServerContext.cpp	Fri May 08 12:10:04 2020 +0200
@@ -268,7 +268,7 @@
       storageCommitmentReports_.reset(new StorageCommitmentReports(lock.GetConfiguration().GetUnsignedIntegerParameter("StorageCommitmentReportsSize", 100)));
 
       // New option in Orthanc 1.7.0
-      transcodingEnabled_ = lock.GetConfiguration().GetBooleanParameter("TranscodingEnabled", true);
+      transcodeDicomProtocol_ = lock.GetConfiguration().GetBooleanParameter("TranscodeDicomProtocol", true);
     }
 
     jobsEngine_.SetThreadSleep(unitTesting ? 20 : 200);
@@ -1125,7 +1125,7 @@
   {
     const void* data = dicom.empty() ? NULL : dicom.c_str();
     
-    if (!transcodingEnabled_ ||
+    if (!transcodeDicomProtocol_ ||
         !connection.GetParameters().GetRemoteModality().IsTranscodingAllowed())
     {
       connection.Store(sopClassUid, sopInstanceUid, data, dicom.size(),
--- a/OrthancServer/ServerContext.h	Fri May 08 12:03:26 2020 +0200
+++ b/OrthancServer/ServerContext.h	Fri May 08 12:10:04 2020 +0200
@@ -226,7 +226,7 @@
 
     std::unique_ptr<StorageCommitmentReports>  storageCommitmentReports_;
 
-    bool transcodingEnabled_;
+    bool transcodeDicomProtocol_;
     std::unique_ptr<IDicomTranscoder>  dcmtkTranscoder_;
 
   public:
@@ -464,7 +464,7 @@
                               uint16_t moveOriginatorId);
 
     // This method can be used even if the global option
-    // "TranscodingEnabled" is set to "false"
+    // "TranscodeDicomProtocol" is set to "false"
     bool Transcode(std::string& target /* out */,
                    DicomTransferSyntax& sourceSyntax /* out */,
                    bool& hasSopInstanceUidChanged /* out */,
--- a/Resources/Configuration.json	Fri May 08 12:03:26 2020 +0200
+++ b/Resources/Configuration.json	Fri May 08 12:10:04 2020 +0200
@@ -544,7 +544,7 @@
   "StorageCommitmentReportsSize" : 100,
 
   // Whether Orthanc transcodes DICOM files to an uncompressed
-  // transfer syntax, if remote modalities do not support compressed
-  // transfer syntaxes (new in Orthanc 1.7.0).
-  "TranscodingEnabled" : true
+  // transfer syntax over the DICOM protocol, if the remote modality
+  // does not support compressed transfer syntaxes (new in Orthanc 1.7.0).
+  "TranscodeDicomProtocol" : true
 }