Mercurial > hg > orthanc-stone

comparison Samples/Sdl/FusionMprSdl.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
comparison
equal deleted inserted replaced
1296:86400fa16091 1298:8a0a62189f46
123 GetScene().GetLayer(FIXED_INFOTEXT_LAYER_ZINDEX)); 123 GetScene().GetLayer(FIXED_INFOTEXT_LAYER_ZINDEX));
124 layerP = &layer; 124 layerP = &layer;
125 } 125 }
126 else 126 else
127 { 127 {
128 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer); 128 std::unique_ptr<TextSceneLayer> layer(new TextSceneLayer);
129 layerP = layer.get(); 129 layerP = layer.get();
130 layer->SetColor(0, 255, 0); 130 layer->SetColor(0, 255, 0);
131 layer->SetFontIndex(1); 131 layer->SetFontIndex(1);
132 layer->SetBorder(20); 132 layer->SetBorder(20);
133 layer->SetAnchor(BitmapAnchor_TopLeft); 133 layer->SetAnchor(BitmapAnchor_TopLeft);
158 layer.SetText(buf); 158 layer.SetText(buf);
159 layer.SetPosition(p.GetX(), p.GetY()); 159 layer.SetPosition(p.GetX(), p.GetY());
160 } 160 }
161 else 161 else
162 { 162 {
163 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer); 163 std::unique_ptr<TextSceneLayer> layer(new TextSceneLayer);
164 layer->SetColor(0, 255, 0); 164 layer->SetColor(0, 255, 0);
165 layer->SetText(buf); 165 layer->SetText(buf);
166 layer->SetBorder(20); 166 layer->SetBorder(20);
167 layer->SetAnchor(BitmapAnchor_BottomCenter); 167 layer->SetAnchor(BitmapAnchor_BottomCenter);
168 layer->SetPosition(p.GetX(), p.GetY()); 168 layer->SetPosition(p.GetX(), p.GetY());
633 <FusionMprSdlApp, DicomVolumeImage::GeometryReadyMessage>(*this, &FusionMprSdlApp::Handle)); 633 <FusionMprSdlApp, DicomVolumeImage::GeometryReadyMessage>(*this, &FusionMprSdlApp::Handle));
634 634
635 this->SetVolume1(0, ctLoader, new GrayscaleStyleConfigurator); 635 this->SetVolume1(0, ctLoader, new GrayscaleStyleConfigurator);
636 636
637 { 637 {
638 std::auto_ptr<LookupTableStyleConfigurator> config(new LookupTableStyleConfigurator); 638 std::unique_ptr<LookupTableStyleConfigurator> config(new LookupTableStyleConfigurator);
639 config->SetLookupTable(Orthanc::EmbeddedResources::COLORMAP_HOT); 639 config->SetLookupTable(Orthanc::EmbeddedResources::COLORMAP_HOT);
640 640
641 boost::shared_ptr<DicomVolumeImageMPRSlicer> tmp(new DicomVolumeImageMPRSlicer(dose)); 641 boost::shared_ptr<DicomVolumeImageMPRSlicer> tmp(new DicomVolumeImageMPRSlicer(dose));
642 this->SetVolume2(1, tmp, config.release()); 642 this->SetVolume2(1, tmp, config.release());
643 } 643 }