Mercurial > hg > orthanc-stone
diff Samples/WebAssembly/BasicMPR.cpp @ 1299:c38c89684d83 broker
replacing std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 17:21:24 +0100 |
parents | 2d8ab34c8c91 |
children |
line wrap: on
line diff
--- a/Samples/WebAssembly/BasicMPR.cpp Sun Feb 23 15:32:24 2020 +0100 +++ b/Samples/WebAssembly/BasicMPR.cpp Mon Mar 02 17:21:24 2020 +0100 @@ -38,7 +38,7 @@ { private: OrthancStone::WebAssemblyViewport viewport_; - std::auto_ptr<VolumeSceneLayerSource> source_; + std::unique_ptr<VolumeSceneLayerSource> source_; VolumeProjection projection_; std::vector<CoordinateSystem3D> planes_; size_t currentPlane_; @@ -155,9 +155,9 @@ boost::shared_ptr<OrthancStone::OrthancSeriesVolumeProgressiveLoader> loader_; -std::auto_ptr<OrthancStone::VolumeSlicerWidget> widget1_; -std::auto_ptr<OrthancStone::VolumeSlicerWidget> widget2_; -std::auto_ptr<OrthancStone::VolumeSlicerWidget> widget3_; +std::unique_ptr<OrthancStone::VolumeSlicerWidget> widget1_; +std::unique_ptr<OrthancStone::VolumeSlicerWidget> widget2_; +std::unique_ptr<OrthancStone::VolumeSlicerWidget> widget3_; OrthancStone::MessageBroker broker_; OrthancStone::WebAssemblyOracle oracle_(broker_); @@ -371,7 +371,7 @@ widget1_.reset(new OrthancStone::VolumeSlicerWidget(broker_, "mycanvas1", OrthancStone::VolumeProjection_Axial)); { - std::auto_ptr<OrthancStone::GrayscaleStyleConfigurator> style(new OrthancStone::GrayscaleStyleConfigurator); + std::unique_ptr<OrthancStone::GrayscaleStyleConfigurator> style(new OrthancStone::GrayscaleStyleConfigurator); style->SetLinearInterpolation(true); style->SetWindowing(OrthancStone::ImageWindowing_Bone); widget1_->SetSlicer(0, loader_, *loader_, style.release()); @@ -380,7 +380,7 @@ widget2_.reset(new OrthancStone::VolumeSlicerWidget(broker_, "mycanvas2", OrthancStone::VolumeProjection_Coronal)); { - std::auto_ptr<OrthancStone::GrayscaleStyleConfigurator> style(new OrthancStone::GrayscaleStyleConfigurator); + std::unique_ptr<OrthancStone::GrayscaleStyleConfigurator> style(new OrthancStone::GrayscaleStyleConfigurator); style->SetLinearInterpolation(true); style->SetWindowing(OrthancStone::ImageWindowing_Bone); widget2_->SetSlicer(0, loader_, *loader_, style.release()); @@ -389,7 +389,7 @@ widget3_.reset(new OrthancStone::VolumeSlicerWidget(broker_, "mycanvas3", OrthancStone::VolumeProjection_Sagittal)); { - std::auto_ptr<OrthancStone::GrayscaleStyleConfigurator> style(new OrthancStone::GrayscaleStyleConfigurator); + std::unique_ptr<OrthancStone::GrayscaleStyleConfigurator> style(new OrthancStone::GrayscaleStyleConfigurator); style->SetLinearInterpolation(true); style->SetWindowing(OrthancStone::ImageWindowing_Bone); widget3_->SetSlicer(0, loader_, *loader_, style.release());