Mercurial > hg > orthanc
annotate OrthancFramework/Sources/JobsEngine/Operations/JobOperationValues.cpp @ 5752:717acb0ea546 find-refactoring tip
fix DICOMWeb integration tests
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Tue, 03 Sep 2024 16:37:31 +0200 |
| parents | f7adfb22e20e |
| children |
| rev | line source |
|---|---|
| 2601 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
5640
f7adfb22e20e
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5485
diff
changeset
|
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
|
f7adfb22e20e
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5485
diff
changeset
|
6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
|
5485
48b8dae6dc77
upgrade to year 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5185
diff
changeset
|
7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
| 2601 | 8 * |
| 9 * This program is free software: you can redistribute it and/or | |
|
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
10 * modify it under the terms of the GNU Lesser General Public License |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
11 * as published by the Free Software Foundation, either version 3 of |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
12 * the License, or (at your option) any later version. |
| 2601 | 13 * |
| 14 * This program is distributed in the hope that it will be useful, but | |
| 15 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
17 * Lesser General Public License for more details. |
| 2601 | 18 * |
|
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
19 * You should have received a copy of the GNU Lesser General Public |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
20 * License along with this program. If not, see |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
21 * <http://www.gnu.org/licenses/>. |
| 2601 | 22 **/ |
| 23 | |
| 24 | |
| 25 #include "../../PrecompiledHeaders.h" | |
| 26 #include "JobOperationValues.h" | |
| 27 | |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
28 #include "../IJobUnserializer.h" |
| 2601 | 29 #include "../../OrthancException.h" |
| 30 | |
| 31 #include <cassert> | |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
32 #include <memory> |
| 2601 | 33 |
| 34 namespace Orthanc | |
| 35 { | |
|
4348
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
36 #if ORTHANC_BUILDING_FRAMEWORK_LIBRARY == 1 |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
37 void JobOperationValues::Append(JobOperationValue* value) |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
38 { |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
39 throw OrthancException(ErrorCode_DiscontinuedAbi, "Removed in 1.8.1"); |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
40 } |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
41 #endif |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
42 |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
43 |
| 2601 | 44 void JobOperationValues::Append(JobOperationValues& target, |
| 45 bool clear) | |
| 46 { | |
| 47 target.Reserve(target.GetSize() + GetSize()); | |
| 48 | |
| 49 for (size_t i = 0; i < values_.size(); i++) | |
| 50 { | |
| 51 if (clear) | |
| 52 { | |
| 53 target.Append(values_[i]); | |
| 54 values_[i] = NULL; | |
| 55 } | |
| 56 else | |
| 57 { | |
| 58 target.Append(GetValue(i).Clone()); | |
| 59 } | |
| 60 } | |
| 61 | |
| 62 if (clear) | |
| 63 { | |
| 64 Clear(); | |
| 65 } | |
| 66 } | |
| 67 | |
| 4300 | 68 JobOperationValues::~JobOperationValues() |
| 69 { | |
| 70 Clear(); | |
| 71 } | |
| 72 | |
| 73 void JobOperationValues::Move(JobOperationValues &target) | |
| 74 { | |
| 75 return Append(target, true); | |
| 76 } | |
| 77 | |
| 78 void JobOperationValues::Copy(JobOperationValues &target) | |
| 79 { | |
| 80 return Append(target, false); | |
| 81 } | |
| 82 | |
| 2601 | 83 |
| 84 void JobOperationValues::Clear() | |
| 85 { | |
| 86 for (size_t i = 0; i < values_.size(); i++) | |
| 87 { | |
| 88 if (values_[i] != NULL) | |
| 89 { | |
| 90 delete values_[i]; | |
| 91 } | |
| 92 } | |
| 93 | |
| 94 values_.clear(); | |
| 95 } | |
| 96 | |
| 4300 | 97 void JobOperationValues::Reserve(size_t count) |
| 98 { | |
| 99 values_.reserve(count); | |
| 100 } | |
| 101 | |
| 2601 | 102 |
|
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4300
diff
changeset
|
103 void JobOperationValues::Append(IJobOperationValue* value) // Takes ownership |
| 2601 | 104 { |
| 105 if (value == NULL) | |
| 106 { | |
| 107 throw OrthancException(ErrorCode_NullPointer); | |
| 108 } | |
| 109 else | |
| 110 { | |
| 111 values_.push_back(value); | |
| 112 } | |
| 113 } | |
| 114 | |
| 4300 | 115 size_t JobOperationValues::GetSize() const |
| 116 { | |
| 117 return values_.size(); | |
| 118 } | |
| 119 | |
| 2601 | 120 |
|
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4300
diff
changeset
|
121 IJobOperationValue& JobOperationValues::GetValue(size_t index) const |
| 2601 | 122 { |
| 123 if (index >= values_.size()) | |
| 124 { | |
| 125 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 126 } | |
| 127 else | |
| 128 { | |
| 129 assert(values_[index] != NULL); | |
| 130 return *values_[index]; | |
| 131 } | |
| 132 } | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
133 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
134 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
135 void JobOperationValues::Serialize(Json::Value& target) const |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
136 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
137 target = Json::arrayValue; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
138 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
139 for (size_t i = 0; i < values_.size(); i++) |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
140 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
141 Json::Value tmp; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
142 values_[i]->Serialize(tmp); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
143 target.append(tmp); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
144 } |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
145 } |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
146 |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
147 |
| 2655 | 148 JobOperationValues* JobOperationValues::Unserialize(IJobUnserializer& unserializer, |
| 149 const Json::Value& source) | |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
150 { |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
151 if (source.type() != Json::arrayValue) |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
152 { |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
153 throw OrthancException(ErrorCode_BadFileFormat); |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
154 } |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
155 |
|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
156 std::unique_ptr<JobOperationValues> result(new JobOperationValues); |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
157 |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
158 result->Reserve(source.size()); |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
159 |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
160 for (Json::Value::ArrayIndex i = 0; i < source.size(); i++) |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
161 { |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
162 result->Append(unserializer.UnserializeValue(source[i])); |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
163 } |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
164 |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
165 return result.release(); |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
166 } |
| 2601 | 167 } |