Mercurial > hg > orthanc

comparison OrthancCppClient/Series.cpp @ 496:7f7a2d174acb laaw

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
preparing Laaw packaging
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 17 Jul 2013 17:07:12 +0200
parents f3d4193c571a
children ec19da4a1fe7
comparison
equal deleted inserted replaced
494:012b63028085 496:7f7a2d174acb
203 203
204 void Series::ReadSeries() 204 void Series::ReadSeries()
205 { 205 {
206 Orthanc::HttpClient client(connection_.GetHttpClient()); 206 Orthanc::HttpClient client(connection_.GetHttpClient());
207 207
208 client.SetUrl(connection_.GetOrthancUrl() + "/series/" + id_); 208 client.SetUrl(std::string(connection_.GetOrthancUrl()) + "/series/" + id_);
209 Json::Value v; 209 Json::Value v;
210 if (!client.Apply(series_)) 210 if (!client.Apply(series_))
211 { 211 {
212 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); 212 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
213 } 213 }
214 } 214 }
215 215
216 Orthanc::IDynamicObject* Series::GetFillerItem(size_t index) 216 Orthanc::IDynamicObject* Series::GetFillerItem(size_t index)
217 { 217 {
218 Json::Value::ArrayIndex tmp = static_cast<Json::Value::ArrayIndex>(index); 218 Json::Value::ArrayIndex tmp = static_cast<Json::Value::ArrayIndex>(index);
219 return new Instance(connection_, series_["Instances"][tmp].asString()); 219 std::string id = series_["Instances"][tmp].asString();
220 return new Instance(connection_, id.c_str());
220 } 221 }
221 222
222 Series::Series(const OrthancConnection& connection, 223 Series::Series(const OrthancConnection& connection,
223 const std::string& id) : 224 const char* id) :
224 connection_(connection), 225 connection_(connection),
225 id_(id), 226 id_(id),
226 instances_(*this) 227 instances_(*this)
227 { 228 {
228 ReadSeries(); 229 ReadSeries();
252 return dynamic_cast<Instance&>(instances_.GetItem(index)); 253 return dynamic_cast<Instance&>(instances_.GetItem(index));
253 } 254 }
254 255
255 std::string Series::GetUrl() const 256 std::string Series::GetUrl() const
256 { 257 {
257 return connection_.GetOrthancUrl() + "/series/" + id_; 258 return std::string(connection_.GetOrthancUrl()) + "/series/" + id_;
258 } 259 }
259 260
260 unsigned int Series::GetWidth() 261 unsigned int Series::GetWidth()
261 { 262 {
262 Check3DImage(); 263 Check3DImage();