Mercurial > hg > orthanc-stone

comparison Samples/MultiPlatform/BasicScene/BasicScene.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
67 p[4] = 0; 67 p[4] = 0;
68 p[5] = 0; 68 p[5] = 0;
69 69
70 scene.SetLayer(12, new ColorTextureSceneLayer(i)); 70 scene.SetLayer(12, new ColorTextureSceneLayer(i));
71 71
72 std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); 72 std::unique_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i));
73 l->SetOrigin(-3, 2); 73 l->SetOrigin(-3, 2);
74 l->SetPixelSpacing(1.5, 1); 74 l->SetPixelSpacing(1.5, 1);
75 l->SetAngle(20.0 / 180.0 * 3.14); 75 l->SetAngle(20.0 / 180.0 * 3.14);
76 scene.SetLayer(14, l.release()); 76 scene.SetLayer(14, l.release());
77 } 77 }
83 uint8_t *p = reinterpret_cast<uint8_t*>(i.GetRow(0)); 83 uint8_t *p = reinterpret_cast<uint8_t*>(i.GetRow(0));
84 p[0] = 255; 84 p[0] = 255;
85 p[1] = 0; 85 p[1] = 0;
86 p[2] = 0; 86 p[2] = 0;
87 87
88 std::auto_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i)); 88 std::unique_ptr<ColorTextureSceneLayer> l(new ColorTextureSceneLayer(i));
89 l->SetOrigin(-2, 1); 89 l->SetOrigin(-2, 1);
90 l->SetAngle(20.0 / 180.0 * 3.14); 90 l->SetAngle(20.0 / 180.0 * 3.14);
91 scene.SetLayer(13, l.release()); 91 scene.SetLayer(13, l.release());
92 } 92 }
93 93
94 // Some lines 94 // Some lines
95 { 95 {
96 std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer); 96 std::unique_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer);
97 97
98 layer->SetThickness(1); 98 layer->SetThickness(1);
99 99
100 PolylineSceneLayer::Chain chain; 100 PolylineSceneLayer::Chain chain;
101 chain.push_back(ScenePoint2D(0 - 0.5, 0 - 0.5)); 101 chain.push_back(ScenePoint2D(0 - 0.5, 0 - 0.5));
123 scene.SetLayer(50, layer.release()); 123 scene.SetLayer(50, layer.release());
124 } 124 }
125 125
126 // Some text 126 // Some text
127 { 127 {
128 std::auto_ptr<TextSceneLayer> layer(new TextSceneLayer); 128 std::unique_ptr<TextSceneLayer> layer(new TextSceneLayer);
129 layer->SetText("Hello"); 129 layer->SetText("Hello");
130 scene.SetLayer(100, layer.release()); 130 scene.SetLayer(100, layer.release());
131 } 131 }
132 } 132 }
133 133
168 layer.SetText(buf); 168 layer.SetText(buf);
169 layer.SetPosition(p.GetX(), p.GetY()); 169 layer.SetPosition(p.GetX(), p.GetY());
170 } 170 }
171 else 171 else
172 { 172 {
173 std::auto_ptr<TextSceneLayer> 173 std::unique_ptr<TextSceneLayer>
174 layer(new TextSceneLayer); 174 layer(new TextSceneLayer);
175 layer->SetColor(0, 255, 0); 175 layer->SetColor(0, 255, 0);
176 layer->SetText(buf); 176 layer->SetText(buf);
177 layer->SetBorder(20); 177 layer->SetBorder(20);
178 layer->SetAnchor(BitmapAnchor_BottomCenter); 178 layer->SetAnchor(BitmapAnchor_BottomCenter);