Mercurial > hg > orthanc

comparison OrthancServer/ServerJobs/Operations/StoreScuOperation.h @ 3851:6498739a3c3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring: TimeoutDicomConnectionManager is now only used by Lua
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 20 Apr 2020 16:46:44 +0200
parents d729d6e8b484
children 8f7ad4989fec
comparison
equal deleted inserted replaced
3850:d729d6e8b484 3851:6498739a3c3c
32 32
33 33
34 #pragma once 34 #pragma once
35 35
36 #include "../../../Core/JobsEngine/Operations/IJobOperation.h" 36 #include "../../../Core/JobsEngine/Operations/IJobOperation.h"
37 #include "../../../Core/DicomNetworking/RemoteModalityParameters.h" 37 #include "../../../Core/DicomNetworking/TimeoutDicomConnectionManager.h"
38 38
39 namespace Orthanc 39 namespace Orthanc
40 { 40 {
41 class StoreScuOperation : public IJobOperation 41 class StoreScuOperation : public IJobOperation
42 { 42 {
43 private: 43 private:
44 std::string localAet_; 44 TimeoutDicomConnectionManager& connectionManager_;
45 RemoteModalityParameters modality_; 45 std::string localAet_;
46 RemoteModalityParameters modality_;
46 47
47 public: 48 public:
48 StoreScuOperation(const std::string& localAet, 49 StoreScuOperation(TimeoutDicomConnectionManager& connectionManager,
50 const std::string& localAet,
49 const RemoteModalityParameters& modality) : 51 const RemoteModalityParameters& modality) :
52 connectionManager_(connectionManager),
50 localAet_(localAet), 53 localAet_(localAet),
51 modality_(modality) 54 modality_(modality)
52 { 55 {
53 } 56 }
54 57
55 StoreScuOperation(const Json::Value& serialized); 58 StoreScuOperation(TimeoutDicomConnectionManager& connectionManager,
59 const Json::Value& serialized);
56 60
57 const std::string& GetLocalAet() const 61 const std::string& GetLocalAet() const
58 { 62 {
59 return localAet_; 63 return localAet_;
60 } 64 }
63 { 67 {
64 return modality_; 68 return modality_;
65 } 69 }
66 70
67 virtual void Apply(JobOperationValues& outputs, 71 virtual void Apply(JobOperationValues& outputs,
68 const JobOperationValue& input, 72 const JobOperationValue& input);
69 TimeoutDicomConnectionManager& manager);
70 73
71 virtual void Serialize(Json::Value& result) const; 74 virtual void Serialize(Json::Value& result) const;
72 }; 75 };
73 } 76 }
74 77