Mercurial > hg > orthanc
annotate Core/JobsEngine/Operations/JobOperationValues.cpp @ 3712:2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 02 Mar 2020 15:32:45 +0100 |
| parents | 94f4a18a79cc |
| 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 | |
|
3640
94f4a18a79cc
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 2601 | 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 #include "../../PrecompiledHeaders.h" | |
| 35 #include "JobOperationValues.h" | |
| 36 | |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
37 #include "../IJobUnserializer.h" |
| 2601 | 38 #include "../../OrthancException.h" |
| 39 | |
| 40 #include <cassert> | |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
41 #include <memory> |
| 2601 | 42 |
| 43 namespace Orthanc | |
| 44 { | |
| 45 void JobOperationValues::Append(JobOperationValues& target, | |
| 46 bool clear) | |
| 47 { | |
| 48 target.Reserve(target.GetSize() + GetSize()); | |
| 49 | |
| 50 for (size_t i = 0; i < values_.size(); i++) | |
| 51 { | |
| 52 if (clear) | |
| 53 { | |
| 54 target.Append(values_[i]); | |
| 55 values_[i] = NULL; | |
| 56 } | |
| 57 else | |
| 58 { | |
| 59 target.Append(GetValue(i).Clone()); | |
| 60 } | |
| 61 } | |
| 62 | |
| 63 if (clear) | |
| 64 { | |
| 65 Clear(); | |
| 66 } | |
| 67 } | |
| 68 | |
| 69 | |
| 70 void JobOperationValues::Clear() | |
| 71 { | |
| 72 for (size_t i = 0; i < values_.size(); i++) | |
| 73 { | |
| 74 if (values_[i] != NULL) | |
| 75 { | |
| 76 delete values_[i]; | |
| 77 } | |
| 78 } | |
| 79 | |
| 80 values_.clear(); | |
| 81 } | |
| 82 | |
| 83 | |
| 84 void JobOperationValues::Append(JobOperationValue* value) // Takes ownership | |
| 85 { | |
| 86 if (value == NULL) | |
| 87 { | |
| 88 throw OrthancException(ErrorCode_NullPointer); | |
| 89 } | |
| 90 else | |
| 91 { | |
| 92 values_.push_back(value); | |
| 93 } | |
| 94 } | |
| 95 | |
| 96 | |
| 97 JobOperationValue& JobOperationValues::GetValue(size_t index) const | |
| 98 { | |
| 99 if (index >= values_.size()) | |
| 100 { | |
| 101 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 102 } | |
| 103 else | |
| 104 { | |
| 105 assert(values_[index] != NULL); | |
| 106 return *values_[index]; | |
| 107 } | |
| 108 } | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
109 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
110 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
111 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
|
112 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
113 target = Json::arrayValue; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
114 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
115 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
|
116 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
117 Json::Value tmp; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
118 values_[i]->Serialize(tmp); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
119 target.append(tmp); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
120 } |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2601
diff
changeset
|
121 } |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
122 |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
123 |
| 2655 | 124 JobOperationValues* JobOperationValues::Unserialize(IJobUnserializer& unserializer, |
| 125 const Json::Value& source) | |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
126 { |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
127 if (source.type() != Json::arrayValue) |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
128 { |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
129 throw OrthancException(ErrorCode_BadFileFormat); |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
130 } |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
131 |
|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
132 std::unique_ptr<JobOperationValues> result(new JobOperationValues); |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
133 |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
134 result->Reserve(source.size()); |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
135 |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
136 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
|
137 { |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
138 result->Append(unserializer.UnserializeValue(source[i])); |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
139 } |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
140 |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
141 return result.release(); |
|
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2616
diff
changeset
|
142 } |
| 2601 | 143 } |