Mercurial > hg > orthanc

comparison OrthancServer/ServerJobs/DicomMoveScuJob.cpp @ 3875:ea1d32861cfc transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moving timeout from DicomAssocation to DicomAssociationParameters
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 04 May 2020 14:49:31 +0200
parents 2effa961f67f
children 4b4f387c6bb8
comparison
equal deleted inserted replaced
3874:2effa961f67f 3875:ea1d32861cfc
96 void DicomMoveScuJob::Retrieve(const DicomMap& findAnswer) 96 void DicomMoveScuJob::Retrieve(const DicomMap& findAnswer)
97 { 97 {
98 if (connection_.get() == NULL) 98 if (connection_.get() == NULL)
99 { 99 {
100 DicomAssociationParameters params(localAet_, remote_); 100 DicomAssociationParameters params(localAet_, remote_);
101
102 if (timeout_ >= 0)
103 {
104 params.SetTimeout(static_cast<uint32_t>(timeout_));
105 }
106
101 connection_.reset(new DicomControlUserConnection(params)); 107 connection_.reset(new DicomControlUserConnection(params));
102 } 108 }
103 109
104 if (timeout_ > -1)
105 {
106 connection_->SetTimeout(timeout_);
107 }
108
109 connection_->Move(targetAet_, findAnswer); 110 connection_->Move(targetAet_, findAnswer);
110 } 111 }
111 112
112 113
113 static void AddTagIfString(Json::Value& target, 114 static void AddTagIfString(Json::Value& target,