Mercurial > hg > orthanc-stone

comparison Samples/Shared/SharedBasicScene.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 875bd6aca5e6
comparison
equal deleted inserted replaced
887:6176917ef890 889:6e79e8c9021c
212 { 212 {
213 currentTracker_.reset(new PanSceneTracker(viewportController_, pointerEvent)); 213 currentTracker_.reset(new PanSceneTracker(viewportController_, pointerEvent));
214 } 214 }
215 else if (event.button == GUIADAPTER_MOUSEBUTTON_RIGHT && compositor_.get() != NULL) 215 else if (event.button == GUIADAPTER_MOUSEBUTTON_RIGHT && compositor_.get() != NULL)
216 { 216 {
217 currentTracker_.reset(new ZoomSceneTracker(viewportController_, pointerEvent, compositor_->GetHeight())); 217 currentTracker_.reset(new ZoomSceneTracker(viewportController_, pointerEvent, compositor_->GetCanvasHeight()));
218 } 218 }
219 } 219 }
220 else if (event.type == GUIADAPTER_EVENT_MOUSEMOVE) 220 else if (event.type == GUIADAPTER_EVENT_MOUSEMOVE)
221 { 221 {
222 if (showCursorInfo_) 222 if (showCursorInfo_)
235 { 235 {
236 switch (guiEvent.sym[0]) 236 switch (guiEvent.sym[0])
237 { 237 {
238 case 's': 238 case 's':
239 { 239 {
240 viewportController_->FitContent(compositor_->GetWidth(), compositor_->GetHeight()); 240 viewportController_->FitContent(compositor_->GetCanvasWidth(), compositor_->GetCanvasHeight());
241 return true; 241 return true;
242 }; 242 };
243 case 'c': 243 case 'c':
244 { 244 {
245 Scene2D& scene(*(viewportController_->GetScene())); 245 Scene2D& scene(*(viewportController_->GetScene()));
246 TakeScreenshot("screenshot.png", scene, compositor_->GetWidth(), compositor_->GetHeight()); 246 TakeScreenshot("screenshot.png", scene, compositor_->GetCanvasWidth(), compositor_->GetCanvasHeight());
247 return true; 247 return true;
248 } 248 }
249 case 'd': 249 case 'd':
250 { 250 {
251 showCursorInfo_ = !showCursorInfo_; 251 showCursorInfo_ = !showCursorInfo_;