Mercurial > hg > orthanc-stone
comparison Samples/Sdl/TrackerSampleApp.cpp @ 706:ef07304d4423
Fixed C++ code to be C++03 compatible
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 20 May 2019 11:03:36 +0200 |
parents | 059e1fd05fd6 |
children | af0aa0c149fa |
comparison
equal
deleted
inserted
replaced
705:f45fca2ebd10 | 706:ef07304d4423 |
---|---|
86 // do not try to use stuff too early! | 86 // do not try to use stuff too early! |
87 if (compositor_.get() == NULL) | 87 if (compositor_.get() == NULL) |
88 return; | 88 return; |
89 | 89 |
90 std::stringstream msg; | 90 std::stringstream msg; |
91 for (auto kv : infoTextMap_) | 91 |
92 { | 92 for (std::map<std::string, std::string>::const_iterator kv = infoTextMap_.begin(); |
93 msg << kv.first << " : " << kv.second << std::endl; | 93 kv != infoTextMap_.end(); ++kv) |
94 } | 94 { |
95 auto msgS = msg.str(); | 95 msg << kv->first << " : " << kv->second << std::endl; |
96 } | |
97 std::string msgS = msg.str(); | |
96 | 98 |
97 TextSceneLayer* layerP = NULL; | 99 TextSceneLayer* layerP = NULL; |
98 if (GetScene()->HasLayer(FIXED_INFOTEXT_LAYER_ZINDEX)) | 100 if (GetScene()->HasLayer(FIXED_INFOTEXT_LAYER_ZINDEX)) |
99 { | 101 { |
100 TextSceneLayer& layer = dynamic_cast<TextSceneLayer&>( | 102 TextSceneLayer& layer = dynamic_cast<TextSceneLayer&>( |
191 //LOG(TRACE) << "activeTracker_->PointerMove(e); " << | 193 //LOG(TRACE) << "activeTracker_->PointerMove(e); " << |
192 // e.GetMainPosition().GetX() << " " << e.GetMainPosition().GetY(); | 194 // e.GetMainPosition().GetX() << " " << e.GetMainPosition().GetY(); |
193 | 195 |
194 activeTracker_->PointerMove(e); | 196 activeTracker_->PointerMove(e); |
195 if (!activeTracker_->IsAlive()) | 197 if (!activeTracker_->IsAlive()) |
196 activeTracker_ = NULL; | 198 activeTracker_.reset(); |
197 } | 199 } |
198 } | 200 } |
199 } | 201 } |
200 else if (event.type == SDL_MOUSEBUTTONUP) | 202 else if (event.type == SDL_MOUSEBUTTONUP) |
201 { | 203 { |
203 { | 205 { |
204 PointerEvent e; | 206 PointerEvent e; |
205 e.AddPosition(compositor_->GetPixelCenterCoordinates(event.button.x, event.button.y)); | 207 e.AddPosition(compositor_->GetPixelCenterCoordinates(event.button.x, event.button.y)); |
206 activeTracker_->PointerUp(e); | 208 activeTracker_->PointerUp(e); |
207 if (!activeTracker_->IsAlive()) | 209 if (!activeTracker_->IsAlive()) |
208 activeTracker_ = NULL; | 210 activeTracker_.reset(); |
209 } | 211 } |
210 } | 212 } |
211 else if (event.type == SDL_MOUSEBUTTONDOWN) | 213 else if (event.type == SDL_MOUSEBUTTONDOWN) |
212 { | 214 { |
213 PointerEvent e; | 215 PointerEvent e; |
215 event.button.x, event.button.y)); | 217 event.button.x, event.button.y)); |
216 if (activeTracker_) | 218 if (activeTracker_) |
217 { | 219 { |
218 activeTracker_->PointerDown(e); | 220 activeTracker_->PointerDown(e); |
219 if (!activeTracker_->IsAlive()) | 221 if (!activeTracker_->IsAlive()) |
220 activeTracker_ = NULL; | 222 activeTracker_.reset(); |
221 } | 223 } |
222 else | 224 else |
223 { | 225 { |
224 // we ATTEMPT to create a tracker if need be | 226 // we ATTEMPT to create a tracker if need be |
225 activeTracker_ = CreateSuitableTracker(event, e); | 227 activeTracker_ = CreateSuitableTracker(event, e); |
233 case SDLK_ESCAPE: | 235 case SDLK_ESCAPE: |
234 if (activeTracker_) | 236 if (activeTracker_) |
235 { | 237 { |
236 activeTracker_->Cancel(); | 238 activeTracker_->Cancel(); |
237 if (!activeTracker_->IsAlive()) | 239 if (!activeTracker_->IsAlive()) |
238 activeTracker_ = NULL; | 240 activeTracker_.reset(); |
239 } | 241 } |
240 break; | 242 break; |
241 | 243 |
242 case SDLK_t: | 244 case SDLK_t: |
243 if (!activeTracker_) | 245 if (!activeTracker_) |
329 return FlexiblePointerTrackerPtr(new CreateLineMeasureTracker( | 331 return FlexiblePointerTrackerPtr(new CreateLineMeasureTracker( |
330 IObserver::GetBroker(), controller_, undoStack_, measureTools_, e)); | 332 IObserver::GetBroker(), controller_, undoStack_, measureTools_, e)); |
331 case GuiTool_AngleMeasure: | 333 case GuiTool_AngleMeasure: |
332 return FlexiblePointerTrackerPtr(new CreateAngleMeasureTracker( | 334 return FlexiblePointerTrackerPtr(new CreateAngleMeasureTracker( |
333 IObserver::GetBroker(), controller_, undoStack_, measureTools_, e)); | 335 IObserver::GetBroker(), controller_, undoStack_, measureTools_, e)); |
334 return NULL; | |
335 case GuiTool_CircleMeasure: | 336 case GuiTool_CircleMeasure: |
336 LOG(ERROR) << "Not implemented yet!"; | 337 LOG(ERROR) << "Not implemented yet!"; |
337 return NULL; | 338 return FlexiblePointerTrackerPtr(); |
338 case GuiTool_EllipseMeasure: | 339 case GuiTool_EllipseMeasure: |
339 LOG(ERROR) << "Not implemented yet!"; | 340 LOG(ERROR) << "Not implemented yet!"; |
340 return NULL; | 341 return FlexiblePointerTrackerPtr(); |
341 default: | 342 default: |
342 throw OrthancException(ErrorCode_InternalError, "Wrong tool!"); | 343 throw OrthancException(ErrorCode_InternalError, "Wrong tool!"); |
343 } | 344 } |
344 } | 345 } |
345 } | 346 } |
346 default: | 347 default: |
347 return NULL; | 348 return FlexiblePointerTrackerPtr(); |
348 } | 349 } |
349 } | 350 } |
350 | 351 |
351 | 352 |
352 TrackerSampleApp::TrackerSampleApp(MessageBroker& broker) : IObserver(broker) | 353 TrackerSampleApp::TrackerSampleApp(MessageBroker& broker) : IObserver(broker) |
459 void TrackerSampleApp::DisableTracker() | 460 void TrackerSampleApp::DisableTracker() |
460 { | 461 { |
461 if (activeTracker_) | 462 if (activeTracker_) |
462 { | 463 { |
463 activeTracker_->Cancel(); | 464 activeTracker_->Cancel(); |
464 activeTracker_ = NULL; | 465 activeTracker_.reset(); |
465 } | 466 } |
466 } | 467 } |
467 | 468 |
468 void TrackerSampleApp::TakeScreenshot(const std::string& target, | 469 void TrackerSampleApp::TakeScreenshot(const std::string& target, |
469 unsigned int canvasWidth, | 470 unsigned int canvasWidth, |
485 | 486 |
486 | 487 |
487 FlexiblePointerTrackerPtr TrackerSampleApp::TrackerHitTest(const PointerEvent & e) | 488 FlexiblePointerTrackerPtr TrackerSampleApp::TrackerHitTest(const PointerEvent & e) |
488 { | 489 { |
489 // std::vector<MeasureToolPtr> measureTools_; | 490 // std::vector<MeasureToolPtr> measureTools_; |
490 return nullptr; | 491 return FlexiblePointerTrackerPtr(); |
491 } | 492 } |
492 | 493 |
493 static void GLAPIENTRY | 494 static void GLAPIENTRY |
494 OpenGLMessageCallback(GLenum source, | 495 OpenGLMessageCallback(GLenum source, |
495 GLenum type, | 496 GLenum type, |