Mercurial > hg > orthanc-stone

comparison Framework/Loaders/DicomStructureSetLoader.cpp @ 1298:8a0a62189f46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replacing std::auto_ptr by std::unique_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 02 Mar 2020 16:31:30 +0100
parents 2d8ab34c8c91
children f4a06ad1580b
comparison
equal deleted inserted replaced
1296:86400fa16091 1298:8a0a62189f46
138 } 138 }
139 139
140 const std::string instanceId = lookup[0]["ID"].asString(); 140 const std::string instanceId = lookup[0]["ID"].asString();
141 141
142 { 142 {
143 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand); 143 std::unique_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
144 command->SetHttpHeader("Accept-Encoding", "gzip"); 144 command->SetHttpHeader("Accept-Encoding", "gzip");
145 std::string uri = "/instances/" + instanceId + "/tags"; 145 std::string uri = "/instances/" + instanceId + "/tags";
146 command->SetUri(uri); 146 command->SetUri(uri);
147 command->SetPayload(new AddReferencedInstance(loader, instanceId)); 147 command->SetPayload(new AddReferencedInstance(loader, instanceId));
148 Schedule(command.release()); 148 Schedule(command.release());
225 static_cast<unsigned int>(nonEmptyInstances.size()); 225 static_cast<unsigned int>(nonEmptyInstances.size());
226 226
227 for (std::set<std::string>::const_iterator 227 for (std::set<std::string>::const_iterator
228 it = nonEmptyInstances.begin(); it != nonEmptyInstances.end(); ++it) 228 it = nonEmptyInstances.begin(); it != nonEmptyInstances.end(); ++it)
229 { 229 {
230 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand); 230 std::unique_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
231 command->SetUri("/tools/lookup"); 231 command->SetUri("/tools/lookup");
232 command->SetMethod(Orthanc::HttpMethod_Post); 232 command->SetMethod(Orthanc::HttpMethod_Post);
233 command->SetBody(*it); 233 command->SetBody(*it);
234 command->SetPayload(new LookupInstance(loader, *it)); 234 command->SetPayload(new LookupInstance(loader, *it));
235 Schedule(command.release()); 235 Schedule(command.release());
290 virtual ISceneLayer* CreateSceneLayer(const ILayerStyleConfigurator* configurator, 290 virtual ISceneLayer* CreateSceneLayer(const ILayerStyleConfigurator* configurator,
291 const CoordinateSystem3D& cuttingPlane) 291 const CoordinateSystem3D& cuttingPlane)
292 { 292 {
293 assert(isValid_); 293 assert(isValid_);
294 294
295 std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer); 295 std::unique_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer);
296 layer->SetThickness(2); 296 layer->SetThickness(2);
297 297
298 for (size_t i = 0; i < content_.GetStructuresCount(); i++) 298 for (size_t i = 0; i < content_.GetStructuresCount(); i++)
299 { 299 {
300 if ((visibility_.size() == 0) || visibility_.at(i)) 300 if ((visibility_.size() == 0) || visibility_.at(i))
375 375
376 instanceId_ = instanceId; 376 instanceId_ = instanceId;
377 initiallyVisibleStructures_ = initiallyVisibleStructures; 377 initiallyVisibleStructures_ = initiallyVisibleStructures;
378 378
379 { 379 {
380 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand); 380 std::unique_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
381 command->SetHttpHeader("Accept-Encoding", "gzip"); 381 command->SetHttpHeader("Accept-Encoding", "gzip");
382 382
383 std::string uri = "/instances/" + instanceId + "/tags?ignore-length=3006-0050"; 383 std::string uri = "/instances/" + instanceId + "/tags?ignore-length=3006-0050";
384 384
385 command->SetUri(uri); 385 command->SetUri(uri);