Mercurial > hg > orthanc

comparison OrthancServer/ServerContext.cpp @ 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
comparison
equal deleted inserted replaced
3910:1f71c2f20e16 3911:0ef7f4528be2
266 266
267 // New configuration option in Orthanc 1.6.0 267 // New configuration option in Orthanc 1.6.0
268 storageCommitmentReports_.reset(new StorageCommitmentReports(lock.GetConfiguration().GetUnsignedIntegerParameter("StorageCommitmentReportsSize", 100))); 268 storageCommitmentReports_.reset(new StorageCommitmentReports(lock.GetConfiguration().GetUnsignedIntegerParameter("StorageCommitmentReportsSize", 100)));
269 269
270 // New option in Orthanc 1.7.0 270 // New option in Orthanc 1.7.0
271 transcodingEnabled_ = lock.GetConfiguration().GetBooleanParameter("TranscodingEnabled", true); 271 transcodeDicomProtocol_ = lock.GetConfiguration().GetBooleanParameter("TranscodeDicomProtocol", true);
272 } 272 }
273 273
274 jobsEngine_.SetThreadSleep(unitTesting ? 20 : 200); 274 jobsEngine_.SetThreadSleep(unitTesting ? 20 : 200);
275 275
276 listeners_.push_back(ServerListener(luaListener_, "Lua")); 276 listeners_.push_back(ServerListener(luaListener_, "Lua"));
1123 const std::string& moveOriginatorAet, 1123 const std::string& moveOriginatorAet,
1124 uint16_t moveOriginatorId) 1124 uint16_t moveOriginatorId)
1125 { 1125 {
1126 const void* data = dicom.empty() ? NULL : dicom.c_str(); 1126 const void* data = dicom.empty() ? NULL : dicom.c_str();
1127 1127
1128 if (!transcodingEnabled_ || 1128 if (!transcodeDicomProtocol_ ||
1129 !connection.GetParameters().GetRemoteModality().IsTranscodingAllowed()) 1129 !connection.GetParameters().GetRemoteModality().IsTranscodingAllowed())
1130 { 1130 {
1131 connection.Store(sopClassUid, sopInstanceUid, data, dicom.size(), 1131 connection.Store(sopClassUid, sopInstanceUid, data, dicom.size(),
1132 hasMoveOriginator, moveOriginatorAet, moveOriginatorId); 1132 hasMoveOriginator, moveOriginatorAet, moveOriginatorId);
1133 } 1133 }