annotate OrthancStone/Sources/Toolbox/OrthancDatasets/FullOrthancDataset.cpp @ 1871:7053b8a0aaec

upgrade to year 2022
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 11 Jan 2022 11:18:48 +0100
parents 3889ae96d2e9
children 07964689cb0b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Stone of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
1871
7053b8a0aaec upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1870
diff changeset
5 * Copyright (C) 2017-2022 Osimis S.A., Belgium
7053b8a0aaec upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1870
diff changeset
6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * This program is free software: you can redistribute it and/or
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
9 * modify it under the terms of the GNU Lesser General Public License
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * as published by the Free Software Foundation, either version 3 of
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * the License, or (at your option) any later version.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * This program is distributed in the hope that it will be useful, but
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
16 * Lesser General Public License for more details.
1596
4fb8fdf03314 removed annoying whitespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1512
diff changeset
17 *
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
19 * License along with this program. If not, see
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
20 * <http://www.gnu.org/licenses/>.
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 **/
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #include "FullOrthancDataset.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 #include <OrthancException.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 #include <stdio.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 #include <cassert>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 namespace OrthancStone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 static const Json::Value* AccessTag(const Json::Value& dataset,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 const Orthanc::DicomTag& tag)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 if (dataset.type() != Json::objectValue)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 char name[16];
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 sprintf(name, "%04x,%04x", tag.GetGroup(), tag.GetElement());
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 if (!dataset.isMember(name))
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 return NULL;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 const Json::Value& value = dataset[name];
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 if (value.type() != Json::objectValue ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 !value.isMember("Name") ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 !value.isMember("Type") ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 !value.isMember("Value") ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 value["Name"].type() != Json::stringValue ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 value["Type"].type() != Json::stringValue)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 return &value;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 static const Json::Value& GetSequenceContent(const Json::Value& sequence)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 assert(sequence.type() == Json::objectValue);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 assert(sequence.isMember("Type"));
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 assert(sequence.isMember("Value"));
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 const Json::Value& value = sequence["Value"];
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 if (sequence["Type"].asString() != "Sequence" ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 value.type() != Json::arrayValue)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 return value;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 static bool GetStringInternal(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 const Json::Value& tag)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 assert(tag.type() == Json::objectValue);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 assert(tag.isMember("Type"));
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 assert(tag.isMember("Value"));
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 const Json::Value& value = tag["Value"];
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 if (tag["Type"].asString() != "String" ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 value.type() != Json::stringValue)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 result = value.asString();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 return true;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105
1834
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
106 const Json::Value* FullOrthancDataset::LookupPath(const Orthanc::DicomPath& path) const
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 const Json::Value* content = &root_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 for (unsigned int depth = 0; depth < path.GetPrefixLength(); depth++)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 const Json::Value* sequence = AccessTag(*content, path.GetPrefixTag(depth));
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 if (sequence == NULL)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 return NULL;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 const Json::Value& nextContent = GetSequenceContent(*sequence);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 size_t index = path.GetPrefixIndex(depth);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 if (index >= nextContent.size())
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 return NULL;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 content = &nextContent[static_cast<Json::Value::ArrayIndex>(index)];
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 return AccessTag(*content, path.GetFinalTag());
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 void FullOrthancDataset::CheckRoot() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 if (root_.type() != Json::objectValue)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 FullOrthancDataset::FullOrthancDataset(IOrthancConnection& orthanc,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 const std::string& uri)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 IOrthancConnection::RestApiGet(root_, orthanc, uri);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 CheckRoot();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 FullOrthancDataset::FullOrthancDataset(const std::string& content)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 IOrthancConnection::ParseJson(root_, content);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 CheckRoot();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 FullOrthancDataset::FullOrthancDataset(const void* content,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 size_t size)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 IOrthancConnection::ParseJson(root_, content, size);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 CheckRoot();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 FullOrthancDataset::FullOrthancDataset(const Json::Value& root) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 root_(root)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 CheckRoot();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 bool FullOrthancDataset::GetStringValue(std::string& result,
1834
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
175 const Orthanc::DicomPath& path) const
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 const Json::Value* value = LookupPath(path);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 if (value == NULL)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 return false;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 return GetStringInternal(result, *value);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 bool FullOrthancDataset::GetSequenceSize(size_t& size,
1834
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
191 const Orthanc::DicomPath& path) const
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 const Json::Value* sequence = LookupPath(path);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 if (sequence == NULL)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 return false;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 size = GetSequenceContent(*sequence).size();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 return true;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 }