Mercurial > hg > orthanc-stone
comparison Samples/Sdl/FusionMprSdl.cpp @ 889:6e79e8c9021c am-dev
integration mainline->am-dev
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 10 Jul 2019 12:05:02 +0200 |
parents | 31319fe867b9 |
children | 9c2f6d6b9f4a |
comparison
equal
deleted
inserted
replaced
887:6176917ef890 | 889:6e79e8c9021c |
---|---|
133 //layer->SetPosition(0,0); | 133 //layer->SetPosition(0,0); |
134 GetScene()->SetLayer(FIXED_INFOTEXT_LAYER_ZINDEX, layer.release()); | 134 GetScene()->SetLayer(FIXED_INFOTEXT_LAYER_ZINDEX, layer.release()); |
135 } | 135 } |
136 // position the fixed info text in the upper right corner | 136 // position the fixed info text in the upper right corner |
137 layerP->SetText(msgS.c_str()); | 137 layerP->SetText(msgS.c_str()); |
138 double cX = compositor_->GetWidth() * (-0.5); | 138 double cX = compositor_->GetCanvasWidth() * (-0.5); |
139 double cY = compositor_->GetHeight() * (-0.5); | 139 double cY = compositor_->GetCanvasHeight() * (-0.5); |
140 GetScene()->GetCanvasToSceneTransform().Apply(cX,cY); | 140 GetScene()->GetCanvasToSceneTransform().Apply(cX,cY); |
141 layerP->SetPosition(cX, cY); | 141 layerP->SetPosition(cX, cY); |
142 } | 142 } |
143 | 143 |
144 void FusionMprSdlApp::DisplayFloatingCtrlInfoText(const PointerEvent& e) | 144 void FusionMprSdlApp::DisplayFloatingCtrlInfoText(const PointerEvent& e) |
268 LOG(WARNING) << "You cannot change the active tool when an interaction" | 268 LOG(WARNING) << "You cannot change the active tool when an interaction" |
269 " is taking place"; | 269 " is taking place"; |
270 } | 270 } |
271 break; | 271 break; |
272 case SDLK_s: | 272 case SDLK_s: |
273 controller_->FitContent(compositor_->GetWidth(), | 273 controller_->FitContent(compositor_->GetCanvasWidth(), |
274 compositor_->GetHeight()); | 274 compositor_->GetCanvasHeight()); |
275 break; | 275 break; |
276 | 276 |
277 case SDLK_z: | 277 case SDLK_z: |
278 LOG(TRACE) << "SDLK_z has been pressed. event.key.keysym.mod == " << event.key.keysym.mod; | 278 LOG(TRACE) << "SDLK_z has been pressed. event.key.keysym.mod == " << event.key.keysym.mod; |
279 if (event.key.keysym.mod & KMOD_CTRL) | 279 if (event.key.keysym.mod & KMOD_CTRL) |
307 break; | 307 break; |
308 | 308 |
309 case SDLK_c: | 309 case SDLK_c: |
310 TakeScreenshot( | 310 TakeScreenshot( |
311 "screenshot.png", | 311 "screenshot.png", |
312 compositor_->GetWidth(), | 312 compositor_->GetCanvasWidth(), |
313 compositor_->GetHeight()); | 313 compositor_->GetCanvasHeight()); |
314 break; | 314 break; |
315 | 315 |
316 default: | 316 default: |
317 break; | 317 break; |
318 } | 318 } |
338 return boost::shared_ptr<IFlexiblePointerTracker>(new PanSceneTracker | 338 return boost::shared_ptr<IFlexiblePointerTracker>(new PanSceneTracker |
339 (controller_, e)); | 339 (controller_, e)); |
340 | 340 |
341 case SDL_BUTTON_RIGHT: | 341 case SDL_BUTTON_RIGHT: |
342 return boost::shared_ptr<IFlexiblePointerTracker>(new ZoomSceneTracker | 342 return boost::shared_ptr<IFlexiblePointerTracker>(new ZoomSceneTracker |
343 (controller_, e, compositor_->GetHeight())); | 343 (controller_, e, compositor_->GetCanvasHeight())); |
344 | 344 |
345 case SDL_BUTTON_LEFT: | 345 case SDL_BUTTON_LEFT: |
346 { | 346 { |
347 //LOG(TRACE) << "CreateSuitableTracker: case SDL_BUTTON_LEFT:"; | 347 //LOG(TRACE) << "CreateSuitableTracker: case SDL_BUTTON_LEFT:"; |
348 // TODO: we need to iterate on the set of measuring tool and perform | 348 // TODO: we need to iterate on the set of measuring tool and perform |
370 case FusionMprGuiTool_Pan: | 370 case FusionMprGuiTool_Pan: |
371 return boost::shared_ptr<IFlexiblePointerTracker>(new PanSceneTracker( | 371 return boost::shared_ptr<IFlexiblePointerTracker>(new PanSceneTracker( |
372 controller_, e)); | 372 controller_, e)); |
373 case FusionMprGuiTool_Zoom: | 373 case FusionMprGuiTool_Zoom: |
374 return boost::shared_ptr<IFlexiblePointerTracker>(new ZoomSceneTracker( | 374 return boost::shared_ptr<IFlexiblePointerTracker>(new ZoomSceneTracker( |
375 controller_, e, compositor_->GetHeight())); | 375 controller_, e, compositor_->GetCanvasHeight())); |
376 //case GuiTool_AngleMeasure: | 376 //case GuiTool_AngleMeasure: |
377 // return new AngleMeasureTracker(GetScene(), e); | 377 // return new AngleMeasureTracker(GetScene(), e); |
378 //case GuiTool_CircleMeasure: | 378 //case GuiTool_CircleMeasure: |
379 // return new CircleMeasureTracker(GetScene(), e); | 379 // return new CircleMeasureTracker(GetScene(), e); |
380 //case GuiTool_EllipseMeasure: | 380 //case GuiTool_EllipseMeasure: |