Mercurial > hg > orthanc

comparison OrthancServer/Sources/ServerJobs/DicomMoveScuJob.h @ 4729:4e2247df6327

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
51 51
52 ServerContext& context_; 52 ServerContext& context_;
53 DicomAssociationParameters parameters_; 53 DicomAssociationParameters parameters_;
54 std::string targetAet_; 54 std::string targetAet_;
55 Json::Value query_; 55 Json::Value query_;
56 DicomToJsonFormat queryFormat_; // New in 1.9.5
56 57
57 std::unique_ptr<DicomControlUserConnection> connection_; 58 std::unique_ptr<DicomControlUserConnection> connection_;
58 59
59 void Retrieve(const DicomMap& findAnswer); 60 void Retrieve(const DicomMap& findAnswer);
60 61
61 public: 62 public:
62 explicit DicomMoveScuJob(ServerContext& context) : 63 explicit DicomMoveScuJob(ServerContext& context) :
63 context_(context), 64 context_(context),
64 query_(Json::arrayValue) 65 query_(Json::arrayValue),
66 queryFormat_(DicomToJsonFormat_Short)
65 { 67 {
66 } 68 }
67 69
68 DicomMoveScuJob(ServerContext& context, 70 DicomMoveScuJob(ServerContext& context,
69 const Json::Value& serialized); 71 const Json::Value& serialized);
89 return targetAet_; 91 return targetAet_;
90 } 92 }
91 93
92 void SetTargetAet(const std::string& aet); 94 void SetTargetAet(const std::string& aet);
93 95
96 void SetQueryFormat(DicomToJsonFormat format);
97
98 DicomToJsonFormat GetQueryFormat() const
99 {
100 return queryFormat_;
101 }
102
94 virtual void Stop(JobStopReason reason) ORTHANC_OVERRIDE; 103 virtual void Stop(JobStopReason reason) ORTHANC_OVERRIDE;
95 104
96 virtual void GetJobType(std::string& target) ORTHANC_OVERRIDE 105 virtual void GetJobType(std::string& target) ORTHANC_OVERRIDE
97 { 106 {
98 target = "DicomMoveScu"; 107 target = "DicomMoveScu";