Mercurial > hg > orthanc-stone

comparison Applications/Samples/SingleFrameApplication.h @ 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 257f2c9a02ac
comparison
equal deleted inserted replaced
1296:86400fa16091 1298:8a0a62189f46
195 } 195 }
196 196
197 GetMainWidget().FitContent(); 197 GetMainWidget().FitContent();
198 } 198 }
199 199
200 std::auto_ptr<Interactor> mainWidgetInteractor_; 200 std::unique_ptr<Interactor> mainWidgetInteractor_;
201 const Deprecated::DicomSeriesVolumeSlicer* source_; 201 const Deprecated::DicomSeriesVolumeSlicer* source_;
202 unsigned int slice_; 202 unsigned int slice_;
203 203
204 public: 204 public:
205 SingleFrameApplication(MessageBroker& broker) : 205 SingleFrameApplication(MessageBroker& broker) :
243 std::string instance = parameters["instance"].as<std::string>(); 243 std::string instance = parameters["instance"].as<std::string>();
244 int frame = parameters["frame"].as<unsigned int>(); 244 int frame = parameters["frame"].as<unsigned int>();
245 245
246 mainWidget_ = new Deprecated::SliceViewerWidget(GetBroker(), "main-widget"); 246 mainWidget_ = new Deprecated::SliceViewerWidget(GetBroker(), "main-widget");
247 247
248 std::auto_ptr<Deprecated::DicomSeriesVolumeSlicer> layer(new Deprecated::DicomSeriesVolumeSlicer(GetBroker(), context->GetOrthancApiClient())); 248 std::unique_ptr<Deprecated::DicomSeriesVolumeSlicer> layer(new Deprecated::DicomSeriesVolumeSlicer(GetBroker(), context->GetOrthancApiClient()));
249 source_ = layer.get(); 249 source_ = layer.get();
250 layer->LoadFrame(instance, frame); 250 layer->LoadFrame(instance, frame);
251 layer->RegisterObserverCallback(new Callable<SingleFrameApplication, Deprecated::IVolumeSlicer::GeometryReadyMessage>(*this, &SingleFrameApplication::OnMainWidgetGeometryReady)); 251 layer->RegisterObserverCallback(new Callable<SingleFrameApplication, Deprecated::IVolumeSlicer::GeometryReadyMessage>(*this, &SingleFrameApplication::OnMainWidgetGeometryReady));
252 GetMainWidget().AddLayer(layer.release()); 252 GetMainWidget().AddLayer(layer.release());
253 253