Mercurial > hg > orthanc
annotate OrthancServer/Sources/ServerJobs/DicomMoveScuJob.h @ 4730:7826ac059c31
Added Short/Simplify/Full options to format "/modalities/{id}/find-worklist" and "/queries/{id}/retrieve"
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 25 Jun 2021 18:13:45 +0200 |
| parents | 4e2247df6327 |
| children | c1d6ce00be3f 7053502fbf97 |
| rev | line source |
|---|---|
| 2867 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
4437
d9473bd5ed43
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4205
diff
changeset
|
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium |
| 2867 | 6 * |
| 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 | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 11 * | |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 23 * | |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
| 34 #pragma once | |
| 35 | |
| 4045 | 36 #include "../../../OrthancFramework/Sources/Compatibility.h" |
| 37 #include "../../../OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.h" | |
| 38 #include "../../../OrthancFramework/Sources/JobsEngine/SetOfCommandsJob.h" | |
| 2867 | 39 |
| 40 #include "../QueryRetrieveHandler.h" | |
| 41 | |
| 42 namespace Orthanc | |
| 43 { | |
|
3095
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
44 class ServerContext; |
|
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
45 |
| 2867 | 46 class DicomMoveScuJob : public SetOfCommandsJob |
| 47 { | |
| 48 private: | |
| 49 class Command; | |
| 50 class Unserializer; | |
| 51 | |
|
3877
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
52 ServerContext& context_; |
|
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
53 DicomAssociationParameters parameters_; |
|
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
54 std::string targetAet_; |
|
4730
7826ac059c31
Added Short/Simplify/Full options to format "/modalities/{id}/find-worklist" and "/queries/{id}/retrieve"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4729
diff
changeset
|
55 DicomFindAnswers query_; |
|
4729
4e2247df6327
Added "Short" and "Full" options in /modalities/id/find-worklist
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
56 DicomToJsonFormat queryFormat_; // New in 1.9.5 |
| 2867 | 57 |
|
3843
138d0dde41b5
end of replacements of DicomUserConnection by DicomControlUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3712
diff
changeset
|
58 std::unique_ptr<DicomControlUserConnection> connection_; |
|
138d0dde41b5
end of replacements of DicomUserConnection by DicomControlUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3712
diff
changeset
|
59 |
| 2867 | 60 void Retrieve(const DicomMap& findAnswer); |
| 61 | |
| 62 public: | |
| 4205 | 63 explicit DicomMoveScuJob(ServerContext& context) : |
|
3303
a215182a0c2f
"DicomMoveScu" jobs provide the associated C-FIND answer in their "Query" public field
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
64 context_(context), |
|
4730
7826ac059c31
Added Short/Simplify/Full options to format "/modalities/{id}/find-worklist" and "/queries/{id}/retrieve"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4729
diff
changeset
|
65 query_(true /* this is for worklists */), |
|
4729
4e2247df6327
Added "Short" and "Full" options in /modalities/id/find-worklist
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
66 queryFormat_(DicomToJsonFormat_Short) |
| 2867 | 67 { |
| 68 } | |
| 69 | |
| 70 DicomMoveScuJob(ServerContext& context, | |
| 71 const Json::Value& serialized); | |
| 72 | |
| 73 void AddFindAnswer(const DicomMap& answer); | |
| 74 | |
| 75 void AddFindAnswer(QueryRetrieveHandler& query, | |
| 76 size_t i); | |
|
3877
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
77 |
|
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
78 const DicomAssociationParameters& GetParameters() const |
| 2867 | 79 { |
|
3877
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
80 return parameters_; |
| 2867 | 81 } |
|
3877
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
82 |
|
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
83 void SetLocalAet(const std::string& aet); |
| 2867 | 84 |
|
3877
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
85 void SetRemoteModality(const RemoteModalityParameters& remote); |
|
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
86 |
|
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
87 void SetTimeout(uint32_t timeout); |
| 2867 | 88 |
| 89 const std::string& GetTargetAet() const | |
| 90 { | |
| 91 return targetAet_; | |
| 92 } | |
|
3877
4b4f387c6bb8
making DicomMoveScuJob more consistent with DicomModalityStoreJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3870
diff
changeset
|
93 |
| 2867 | 94 void SetTargetAet(const std::string& aet); |
| 95 | |
|
4729
4e2247df6327
Added "Short" and "Full" options in /modalities/id/find-worklist
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
96 void SetQueryFormat(DicomToJsonFormat format); |
|
4e2247df6327
Added "Short" and "Full" options in /modalities/id/find-worklist
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
97 |
|
4e2247df6327
Added "Short" and "Full" options in /modalities/id/find-worklist
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
98 DicomToJsonFormat GetQueryFormat() const |
|
4e2247df6327
Added "Short" and "Full" options in /modalities/id/find-worklist
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
99 { |
|
4e2247df6327
Added "Short" and "Full" options in /modalities/id/find-worklist
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
100 return queryFormat_; |
|
4e2247df6327
Added "Short" and "Full" options in /modalities/id/find-worklist
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
101 } |
|
4e2247df6327
Added "Short" and "Full" options in /modalities/id/find-worklist
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4437
diff
changeset
|
102 |
| 4205 | 103 virtual void Stop(JobStopReason reason) ORTHANC_OVERRIDE; |
| 2867 | 104 |
| 4205 | 105 virtual void GetJobType(std::string& target) ORTHANC_OVERRIDE |
| 2867 | 106 { |
| 107 target = "DicomMoveScu"; | |
| 108 } | |
| 109 | |
| 4205 | 110 virtual void GetPublicContent(Json::Value& value) ORTHANC_OVERRIDE; |
| 2867 | 111 |
| 4205 | 112 virtual bool Serialize(Json::Value& target) ORTHANC_OVERRIDE; |
| 2867 | 113 }; |
| 114 } |