comparison OrthancServer/ServerJobs/DicomMoveScuJob.h @ 3843:138d0dde41b5

end of replacements of DicomUserConnection by DicomControlUserConnection
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 16 Apr 2020 17:24:24 +0200
parents 2a170a8f1faf
children 09798f2b985f
comparison
equal deleted inserted replaced
3842:bdbe12aba99f 3843:138d0dde41b5
32 32
33 33
34 #pragma once 34 #pragma once
35 35
36 #include "../../Core/Compatibility.h" 36 #include "../../Core/Compatibility.h"
37 #include "../../Core/DicomNetworking/DicomControlUserConnection.h"
37 #include "../../Core/JobsEngine/SetOfCommandsJob.h" 38 #include "../../Core/JobsEngine/SetOfCommandsJob.h"
38 #include "../../Core/DicomNetworking/DicomUserConnection.h"
39 39
40 #include "../QueryRetrieveHandler.h" 40 #include "../QueryRetrieveHandler.h"
41 41
42 namespace Orthanc 42 namespace Orthanc
43 { 43 {
47 { 47 {
48 private: 48 private:
49 class Command; 49 class Command;
50 class Unserializer; 50 class Unserializer;
51 51
52 ServerContext& context_; 52 ServerContext& context_;
53 std::string localAet_; 53 std::string localAet_;
54 std::string targetAet_; 54 std::string targetAet_;
55 RemoteModalityParameters remote_; 55 RemoteModalityParameters remote_;
56 std::unique_ptr<DicomUserConnection> connection_; 56 Json::Value query_;
57 Json::Value query_;
58 57
58 std::unique_ptr<DicomControlUserConnection> connection_;
59
59 void Retrieve(const DicomMap& findAnswer); 60 void Retrieve(const DicomMap& findAnswer);
60 61
61 public: 62 public:
62 DicomMoveScuJob(ServerContext& context) : 63 DicomMoveScuJob(ServerContext& context) :
63 context_(context), 64 context_(context),