Mercurial > hg > orthanc
comparison OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp @ 4729:4e2247df6327
Added "Short" and "Full" options in /modalities/id/find-worklist
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 25 Jun 2021 10:41:35 +0200 |
parents | d9473bd5ed43 |
children | 7826ac059c31 |
comparison
equal
deleted
inserted
replaced
4728:b5ca12bfce8c | 4729:4e2247df6327 |
---|---|
201 { | 201 { |
202 connection_.reset(); | 202 connection_.reset(); |
203 } | 203 } |
204 | 204 |
205 | 205 |
206 void DicomMoveScuJob::SetQueryFormat(DicomToJsonFormat format) | |
207 { | |
208 if (IsStarted()) | |
209 { | |
210 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
211 } | |
212 else | |
213 { | |
214 queryFormat_ = format; | |
215 } | |
216 } | |
217 | |
218 | |
206 void DicomMoveScuJob::GetPublicContent(Json::Value& value) | 219 void DicomMoveScuJob::GetPublicContent(Json::Value& value) |
207 { | 220 { |
208 SetOfCommandsJob::GetPublicContent(value); | 221 SetOfCommandsJob::GetPublicContent(value); |
209 | 222 |
210 value["LocalAet"] = parameters_.GetLocalApplicationEntityTitle(); | 223 value[LOCAL_AET] = parameters_.GetLocalApplicationEntityTitle(); |
211 value["RemoteAet"] = parameters_.GetRemoteModality().GetApplicationEntityTitle(); | 224 value["RemoteAet"] = parameters_.GetRemoteModality().GetApplicationEntityTitle(); |
212 value["Query"] = query_; | 225 value["Query"] = query_; |
213 } | 226 } |
214 | 227 |
215 | 228 |
217 const Json::Value& serialized) : | 230 const Json::Value& serialized) : |
218 SetOfCommandsJob(new Unserializer(*this), serialized), | 231 SetOfCommandsJob(new Unserializer(*this), serialized), |
219 context_(context), | 232 context_(context), |
220 parameters_(DicomAssociationParameters::UnserializeJob(serialized)), | 233 parameters_(DicomAssociationParameters::UnserializeJob(serialized)), |
221 targetAet_(SerializationToolbox::ReadString(serialized, TARGET_AET)), | 234 targetAet_(SerializationToolbox::ReadString(serialized, TARGET_AET)), |
222 query_(Json::arrayValue) | 235 query_(Json::arrayValue), |
236 queryFormat_(DicomToJsonFormat_Short) | |
223 { | 237 { |
224 if (serialized.isMember(QUERY) && | 238 if (serialized.isMember(QUERY) && |
225 serialized[QUERY].type() == Json::arrayValue) | 239 serialized[QUERY].type() == Json::arrayValue) |
226 { | 240 { |
227 query_ = serialized[QUERY]; | 241 query_ = serialized[QUERY]; |