Mercurial > hg > orthanc-stone

comparison Samples/Shared/SharedBasicScene.cpp @ 896:875bd6aca5e6 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <alain@mazy.be>
date Fri, 12 Jul 2019 14:57:48 +0200
parents 6073c980323a 6e79e8c9021c
children 9c2f6d6b9f4a
comparison
equal deleted inserted replaced
895:6073c980323a 896:875bd6aca5e6
216 { 216 {
217 currentTracker_.reset(new PanSceneTracker(viewportController_, pointerEvent)); 217 currentTracker_.reset(new PanSceneTracker(viewportController_, pointerEvent));
218 } 218 }
219 else if (event.button == GUIADAPTER_MOUSEBUTTON_RIGHT && compositor_.get() != NULL) 219 else if (event.button == GUIADAPTER_MOUSEBUTTON_RIGHT && compositor_.get() != NULL)
220 { 220 {
221 currentTracker_.reset(new ZoomSceneTracker(viewportController_, pointerEvent, compositor_->GetHeight())); 221 currentTracker_.reset(new ZoomSceneTracker(viewportController_, pointerEvent, compositor_->GetCanvasHeight()));
222 } 222 }
223 } 223 }
224 else if (event.type == GUIADAPTER_EVENT_MOUSEMOVE) 224 else if (event.type == GUIADAPTER_EVENT_MOUSEMOVE)
225 { 225 {
226 if (showCursorInfo_) 226 if (showCursorInfo_)
239 { 239 {
240 switch (guiEvent.sym[0]) 240 switch (guiEvent.sym[0])
241 { 241 {
242 case 's': 242 case 's':
243 { 243 {
244 viewportController_->FitContent(compositor_->GetWidth(), compositor_->GetHeight()); 244 viewportController_->FitContent(compositor_->GetCanvasWidth(), compositor_->GetCanvasHeight());
245 return true; 245 return true;
246 }; 246 };
247 #if ORTHANC_SANDBOXED == 0 247 #if ORTHANC_SANDBOXED == 0
248 case 'c': 248 case 'c':
249 { 249 {
250 Scene2D& scene(*(viewportController_->GetScene())); 250 Scene2D& scene(*(viewportController_->GetScene()));
251 TakeScreenshot("screenshot.png", scene, compositor_->GetWidth(), compositor_->GetHeight()); 251 TakeScreenshot("screenshot.png", scene, compositor_->GetCanvasWidth(), compositor_->GetCanvasHeight());
252 return true; 252 return true;
253 } 253 }
254 #endif 254 #endif
255 case 'd': 255 case 'd':
256 { 256 {