Mercurial > hg > orthanc
annotate OrthancFramework/Sources/JobsEngine/Operations/JobOperationValues.cpp @ 4527:31f940334496
Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246)
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 24 Feb 2021 12:39:35 +0100 |
| parents | d9473bd5ed43 |
| children | 7053502fbf97 |
| 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 | |
|
4437
d9473bd5ed43
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4348
diff
changeset
|
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium |
| 2601 | 6 * |
| 7 * 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
|
8 * 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
|
9 * 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
|
10 * the License, or (at your option) any later version. |
| 2601 | 11 * |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * 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
|
15 * Lesser General Public License for more details. |
| 2601 | 16 * |
|
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 * 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
|
18 * 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
|
19 * <http://www.gnu.org/licenses/>. |
| 2601 | 20 **/ |
| 21 | |
| 22 | |
| 23 #include "../../PrecompiledHeaders.h" | |
| 24 #include "JobOperationValues.h" | |
| 25 | |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
26 #include "../IJobUnserializer.h" |
| 2601 | 27 #include "../../OrthancException.h" |
| 28 | |
| 29 #include <cassert> | |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
30 #include <memory> |
| 2601 | 31 |
| 32 namespace Orthanc | |
| 33 { | |
|
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
|
34 #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
|
35 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
|
36 { |
|
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 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
|
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 #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
|
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 |
| 2601 | 42 void JobOperationValues::Append(JobOperationValues& target, |
| 43 bool clear) | |
| 44 { | |
| 45 target.Reserve(target.GetSize() + GetSize()); | |
| 46 | |
| 47 for (size_t i = 0; i < values_.size(); i++) | |
| 48 { | |
| 49 if (clear) | |
| 50 { | |
| 51 target.Append(values_[i]); | |
| 52 values_[i] = NULL; | |
| 53 } | |
| 54 else | |
| 55 { | |
| 56 target.Append(GetValue(i).Clone()); | |
| 57 } | |
| 58 } | |
| 59 | |
| 60 if (clear) | |
| 61 { | |
| 62 Clear(); | |
| 63 } | |
| 64 } | |
| 65 | |
| 4300 | 66 JobOperationValues::~JobOperationValues() |
| 67 { | |
| 68 Clear(); | |
| 69 } | |
| 70 | |
| 71 void JobOperationValues::Move(JobOperationValues &target) | |
| 72 { | |
| 73 return Append(target, true); | |
| 74 } | |
| 75 | |
| 76 void JobOperationValues::Copy(JobOperationValues &target) | |
| 77 { | |
| 78 return Append(target, false); | |
| 79 } | |
| 80 | |
| 2601 | 81 |
| 82 void JobOperationValues::Clear() | |
| 83 { | |
| 84 for (size_t i = 0; i < values_.size(); i++) | |
| 85 { | |
| 86 if (values_[i] != NULL) | |
| 87 { | |
| 88 delete values_[i]; | |
| 89 } | |
| 90 } | |
| 91 | |
| 92 values_.clear(); | |
| 93 } | |
| 94 | |
| 4300 | 95 void JobOperationValues::Reserve(size_t count) |
| 96 { | |
| 97 values_.reserve(count); | |
| 98 } | |
| 99 | |
| 2601 | 100 |
|
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4300
diff
changeset
|
101 void JobOperationValues::Append(IJobOperationValue* value) // Takes ownership |
| 2601 | 102 { |
| 103 if (value == NULL) | |
| 104 { | |
| 105 throw OrthancException(ErrorCode_NullPointer); | |
| 106 } | |
| 107 else | |
| 108 { | |
| 109 values_.push_back(value); | |
| 110 } | |
| 111 } | |
| 112 | |
| 4300 | 113 size_t JobOperationValues::GetSize() const |
| 114 { | |
| 115 return values_.size(); | |
| 116 } | |
| 117 | |
| 2601 | 118 |
|
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4300
diff
changeset
|
119 IJobOperationValue& JobOperationValues::GetValue(size_t index) const |
| 2601 | 120 { |
| 121 if (index >= values_.size()) | |
| 122 { | |
| 123 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 124 } | |
| 125 else | |
| 126 { | |
| 127 assert(values_[index] != NULL); | |
| 128 return *values_[index]; | |
| 129 } | |
| 130 } | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
131 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
132 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
133 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
|
134 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
135 target = Json::arrayValue; |
|
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 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
|
138 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
139 Json::Value tmp; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
140 values_[i]->Serialize(tmp); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
141 target.append(tmp); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
142 } |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
143 } |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
144 |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
145 |
| 2655 | 146 JobOperationValues* JobOperationValues::Unserialize(IJobUnserializer& unserializer, |
| 147 const Json::Value& source) | |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
148 { |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
149 if (source.type() != Json::arrayValue) |
|
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 throw OrthancException(ErrorCode_BadFileFormat); |
|
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 |
|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
154 std::unique_ptr<JobOperationValues> result(new JobOperationValues); |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
155 |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
156 result->Reserve(source.size()); |
|
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 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
|
159 { |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
160 result->Append(unserializer.UnserializeValue(source[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 |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
163 return result.release(); |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
164 } |
| 2601 | 165 } |