Mercurial > hg > orthanc-stone

comparison Samples/Shared/RadiographyEditorApp.cpp @ 889:6e79e8c9021c am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->am-dev
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Jul 2019 12:05:02 +0200
parents 56e4e9281076
children
comparison
equal deleted inserted replaced
887:6176917ef890 889:6e79e8c9021c
119 //layer->SetPosition(0,0); 119 //layer->SetPosition(0,0);
120 GetScene()->SetLayer(FIXED_INFOTEXT_LAYER_ZINDEX, layer.release()); 120 GetScene()->SetLayer(FIXED_INFOTEXT_LAYER_ZINDEX, layer.release());
121 } 121 }
122 // position the fixed info text in the upper right corner 122 // position the fixed info text in the upper right corner
123 layerP->SetText(msgS.c_str()); 123 layerP->SetText(msgS.c_str());
124 double cX = compositor_->GetWidth() * (-0.5); 124 double cX = compositor_->GetCanvasWidth() * (-0.5);
125 double cY = compositor_->GetHeight() * (-0.5); 125 double cY = compositor_->GetCanvasHeight() * (-0.5);
126 GetScene()->GetCanvasToSceneTransform().Apply(cX,cY); 126 GetScene()->GetCanvasToSceneTransform().Apply(cX,cY);
127 layerP->SetPosition(cX, cY); 127 layerP->SetPosition(cX, cY);
128 } 128 }
129 129
130 void RadiographyEditorApp::DisplayFloatingCtrlInfoText(const PointerEvent& e) 130 void RadiographyEditorApp::DisplayFloatingCtrlInfoText(const PointerEvent& e)
160 GetScene()->DeleteLayer(FLOATING_INFOTEXT_LAYER_ZINDEX); 160 GetScene()->DeleteLayer(FLOATING_INFOTEXT_LAYER_ZINDEX);
161 } 161 }
162 162
163 ScenePoint2D RadiographyEditorApp::GetRandomPointInScene() const 163 ScenePoint2D RadiographyEditorApp::GetRandomPointInScene() const
164 { 164 {
165 unsigned int w = compositor_->GetWidth(); 165 unsigned int w = compositor_->GetCanvasWidth();
166 LOG(TRACE) << "compositor_->GetWidth() = " << 166 LOG(TRACE) << "compositor_->GetCanvasWidth() = " <<
167 compositor_->GetWidth(); 167 compositor_->GetCanvasWidth();
168 unsigned int h = compositor_->GetHeight(); 168 unsigned int h = compositor_->GetCanvasHeight();
169 LOG(TRACE) << "compositor_->GetHeight() = " << 169 LOG(TRACE) << "compositor_->GetCanvasHeight() = " <<
170 compositor_->GetHeight(); 170 compositor_->GetCanvasHeight();
171 171
172 if ((w >= RAND_MAX) || (h >= RAND_MAX)) 172 if ((w >= RAND_MAX) || (h >= RAND_MAX))
173 LOG(WARNING) << "Canvas is too big : tools will not be randomly placed"; 173 LOG(WARNING) << "Canvas is too big : tools will not be randomly placed";
174 174
175 int x = rand() % w; 175 int x = rand() % w;
285 };break; 285 };break;
286 case 'm': 286 case 'm':
287 CreateRandomMeasureTool(); 287 CreateRandomMeasureTool();
288 break; 288 break;
289 case 's': 289 case 's':
290 controller_->FitContent(compositor_->GetWidth(), 290 controller_->FitContent(compositor_->GetCanvasWidth(),
291 compositor_->GetHeight()); 291 compositor_->GetCanvasHeight());
292 break; 292 break;
293 case 'z': 293 case 'z':
294 LOG(TRACE) << "z has been pressed. modifier = " << modifiers; 294 LOG(TRACE) << "z has been pressed. modifier = " << modifiers;
295 if (modifiers & OrthancStone::KeyboardModifiers_Control) 295 if (modifiers & OrthancStone::KeyboardModifiers_Control)
296 { 296 {
323 break; 323 break;
324 324
325 case 'c': 325 case 'c':
326 TakeScreenshot( 326 TakeScreenshot(
327 "screenshot.png", 327 "screenshot.png",
328 compositor_->GetWidth(), 328 compositor_->GetCanvasWidth(),
329 compositor_->GetHeight()); 329 compositor_->GetCanvasHeight());
330 break; 330 break;
331 331
332 } 332 }
333 } 333 }
334 334
469 469
470 case SDLK_m: 470 case SDLK_m:
471 CreateRandomMeasureTool(); 471 CreateRandomMeasureTool();
472 break; 472 break;
473 case SDLK_s: 473 case SDLK_s:
474 controller_->FitContent(compositor_->GetWidth(), 474 controller_->FitContent(compositor_->GetCanvasWidth(),
475 compositor_->GetHeight()); 475 compositor_->GetCanvasHeight());
476 break; 476 break;
477 477
478 case SDLK_z: 478 case SDLK_z:
479 LOG(TRACE) << "SDLK_z has been pressed. event.key.keysym.mod == " << event.key.keysym.mod; 479 LOG(TRACE) << "SDLK_z has been pressed. event.key.keysym.mod == " << event.key.keysym.mod;
480 if (event.key.keysym.mod & KMOD_CTRL) 480 if (event.key.keysym.mod & KMOD_CTRL)
508 break; 508 break;
509 509
510 case SDLK_c: 510 case SDLK_c:
511 TakeScreenshot( 511 TakeScreenshot(
512 "screenshot.png", 512 "screenshot.png",
513 compositor_->GetWidth(), 513 compositor_->GetCanvasWidth(),
514 compositor_->GetHeight()); 514 compositor_->GetCanvasHeight());
515 break; 515 break;
516 516
517 default: 517 default:
518 break; 518 break;
519 } 519 }
539 return boost::shared_ptr<IFlexiblePointerTracker>(new PanSceneTracker 539 return boost::shared_ptr<IFlexiblePointerTracker>(new PanSceneTracker
540 (controller_, e)); 540 (controller_, e));
541 541
542 case OrthancStone::MouseButton_Right: 542 case OrthancStone::MouseButton_Right:
543 return boost::shared_ptr<IFlexiblePointerTracker>(new ZoomSceneTracker 543 return boost::shared_ptr<IFlexiblePointerTracker>(new ZoomSceneTracker
544 (controller_, e, compositor_->GetHeight())); 544 (controller_, e, compositor_->GetCanvasHeight()));
545 545
546 case OrthancStone::MouseButton_Left: 546 case OrthancStone::MouseButton_Left:
547 { 547 {
548 //LOG(TRACE) << "CreateSuitableTracker: case SDL_BUTTON_LEFT:"; 548 //LOG(TRACE) << "CreateSuitableTracker: case SDL_BUTTON_LEFT:";
549 // TODO: we need to iterate on the set of measuring tool and perform 549 // TODO: we need to iterate on the set of measuring tool and perform
571 case GuiTool_Pan: 571 case GuiTool_Pan:
572 return boost::shared_ptr<IFlexiblePointerTracker>(new PanSceneTracker( 572 return boost::shared_ptr<IFlexiblePointerTracker>(new PanSceneTracker(
573 controller_, e)); 573 controller_, e));
574 case GuiTool_Zoom: 574 case GuiTool_Zoom:
575 return boost::shared_ptr<IFlexiblePointerTracker>(new ZoomSceneTracker( 575 return boost::shared_ptr<IFlexiblePointerTracker>(new ZoomSceneTracker(
576 controller_, e, compositor_->GetHeight())); 576 controller_, e, compositor_->GetCanvasHeight()));
577 //case GuiTool_AngleMeasure: 577 //case GuiTool_AngleMeasure:
578 // return new AngleMeasureTracker(GetScene(), e); 578 // return new AngleMeasureTracker(GetScene(), e);
579 //case GuiTool_CircleMeasure: 579 //case GuiTool_CircleMeasure:
580 // return new CircleMeasureTracker(GetScene(), e); 580 // return new CircleMeasureTracker(GetScene(), e);
581 //case GuiTool_EllipseMeasure: 581 //case GuiTool_EllipseMeasure: