comparison OrthancServer/ServerJobs/DicomMoveScuJob.h @ 3786:3801435e34a1 SylvainRouquette/fix-issue169-95b752c

integration Orthanc-1.6.0->SylvainRouquette
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 19 Mar 2020 11:48:30 +0100
parents 2a170a8f1faf
children 138d0dde41b5
comparison
equal deleted inserted replaced
3785:763533d6dd67 3786:3801435e34a1
1 /** 1 /**
2 * Orthanc - A Lightweight, RESTful DICOM Store 2 * Orthanc - A Lightweight, RESTful DICOM Store
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
4 * Department, University Hospital of Liege, Belgium 4 * Department, University Hospital of Liege, Belgium
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium 5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
6 * 6 *
7 * This program is free software: you can redistribute it and/or 7 * This program is free software: you can redistribute it and/or
8 * modify it under the terms of the GNU General Public License as 8 * modify it under the terms of the GNU General Public License as
9 * published by the Free Software Foundation, either version 3 of the 9 * published by the Free Software Foundation, either version 3 of the
10 * License, or (at your option) any later version. 10 * License, or (at your option) any later version.
31 **/ 31 **/
32 32
33 33
34 #pragma once 34 #pragma once
35 35
36 #include "../../Core/Compatibility.h"
36 #include "../../Core/JobsEngine/SetOfCommandsJob.h" 37 #include "../../Core/JobsEngine/SetOfCommandsJob.h"
37 #include "../../Core/DicomNetworking/DicomUserConnection.h" 38 #include "../../Core/DicomNetworking/DicomUserConnection.h"
38 39
39 #include "../QueryRetrieveHandler.h" 40 #include "../QueryRetrieveHandler.h"
40 41
46 { 47 {
47 private: 48 private:
48 class Command; 49 class Command;
49 class Unserializer; 50 class Unserializer;
50 51
51 ServerContext& context_; 52 ServerContext& context_;
52 std::string localAet_; 53 std::string localAet_;
53 std::string targetAet_; 54 std::string targetAet_;
54 RemoteModalityParameters remote_; 55 RemoteModalityParameters remote_;
55 std::auto_ptr<DicomUserConnection> connection_; 56 std::unique_ptr<DicomUserConnection> connection_;
56 Json::Value query_; 57 Json::Value query_;
57 58
58 void Retrieve(const DicomMap& findAnswer); 59 void Retrieve(const DicomMap& findAnswer);
59 60
60 public: 61 public:
61 DicomMoveScuJob(ServerContext& context) : 62 DicomMoveScuJob(ServerContext& context) :