Mercurial > hg > orthanc-stone

comparison Applications/Samples/SynchronizedSeriesApplication.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
comparison
equal deleted inserted replaced
1296:86400fa16091 1298:8a0a62189f46
38 { 38 {
39 private: 39 private:
40 LayeredSceneWidget* CreateSeriesWidget(BasicApplicationContext& context, 40 LayeredSceneWidget* CreateSeriesWidget(BasicApplicationContext& context,
41 const std::string& series) 41 const std::string& series)
42 { 42 {
43 std::auto_ptr<ISeriesLoader> loader 43 std::unique_ptr<ISeriesLoader> loader
44 (new OrthancSeriesLoader(context.GetWebService().GetConnection(), series)); 44 (new OrthancSeriesLoader(context.GetWebService().GetConnection(), series));
45 45
46 std::auto_ptr<SampleInteractor> interactor(new SampleInteractor(*loader, false)); 46 std::unique_ptr<SampleInteractor> interactor(new SampleInteractor(*loader, false));
47 47
48 std::auto_ptr<LayeredSceneWidget> widget(new LayeredSceneWidget); 48 std::unique_ptr<LayeredSceneWidget> widget(new LayeredSceneWidget);
49 widget->AddLayer(new SeriesFrameRendererFactory(loader.release(), false)); 49 widget->AddLayer(new SeriesFrameRendererFactory(loader.release(), false));
50 widget->SetSlice(interactor->GetCursor().GetCurrentSlice()); 50 widget->SetSlice(interactor->GetCursor().GetCurrentSlice());
51 widget->SetInteractor(*interactor); 51 widget->SetInteractor(*interactor);
52 52
53 context.AddInteractor(interactor.release()); 53 context.AddInteractor(interactor.release());
81 { 81 {
82 LOG(ERROR) << "At least one of the three series IDs is missing"; 82 LOG(ERROR) << "At least one of the three series IDs is missing";
83 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); 83 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
84 } 84 }
85 85
86 std::auto_ptr<LayeredSceneWidget> a(CreateSeriesWidget(context, parameters["a"].as<std::string>())); 86 std::unique_ptr<LayeredSceneWidget> a(CreateSeriesWidget(context, parameters["a"].as<std::string>()));
87 std::auto_ptr<LayeredSceneWidget> b(CreateSeriesWidget(context, parameters["b"].as<std::string>())); 87 std::unique_ptr<LayeredSceneWidget> b(CreateSeriesWidget(context, parameters["b"].as<std::string>()));
88 std::auto_ptr<LayeredSceneWidget> c(CreateSeriesWidget(context, parameters["c"].as<std::string>())); 88 std::unique_ptr<LayeredSceneWidget> c(CreateSeriesWidget(context, parameters["c"].as<std::string>()));
89 89
90 ReferenceLineFactory::Configure(*a, *b); 90 ReferenceLineFactory::Configure(*a, *b);
91 ReferenceLineFactory::Configure(*a, *c); 91 ReferenceLineFactory::Configure(*a, *c);
92 ReferenceLineFactory::Configure(*b, *c); 92 ReferenceLineFactory::Configure(*b, *c);
93 93
94 std::auto_ptr<LayoutWidget> layout(new LayoutWidget); 94 std::unique_ptr<LayoutWidget> layout(new LayoutWidget);
95 layout->SetPadding(5); 95 layout->SetPadding(5);
96 layout->AddWidget(a.release()); 96 layout->AddWidget(a.release());
97 97
98 std::auto_ptr<LayoutWidget> layoutB(new LayoutWidget); 98 std::unique_ptr<LayoutWidget> layoutB(new LayoutWidget);
99 layoutB->SetVertical(); 99 layoutB->SetVertical();
100 layoutB->SetPadding(5); 100 layoutB->SetPadding(5);
101 layoutB->AddWidget(b.release()); 101 layoutB->AddWidget(b.release());
102 layoutB->AddWidget(c.release()); 102 layoutB->AddWidget(c.release());
103 layout->AddWidget(layoutB.release()); 103 layout->AddWidget(layoutB.release());