Mercurial > hg > orthanc-stone

comparison Framework/Viewport/WebAssemblyViewport.cpp @ 1480:4de884c95cd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix includes in WebAssemblyCairoViewport
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 19 Jun 2020 16:21:17 +0200
parents 30deba7bc8e2
children 6e43cac7833c
comparison
equal deleted inserted replaced
1479:5e3cfe87a873 1480:4de884c95cd8
234 { 234 {
235 boost::shared_ptr<IViewport> viewport = shared_from_this(); 235 boost::shared_ptr<IViewport> viewport = shared_from_this();
236 controller_.reset(new ViewportController(viewport)); 236 controller_.reset(new ViewportController(viewport));
237 237
238 LOG(INFO) << "Initializing Stone viewport on HTML canvas: " 238 LOG(INFO) << "Initializing Stone viewport on HTML canvas: "
239 << canvasId_; 239 << canvasId_;
240 240
241 if (canvasId_.empty() || 241 if (canvasId_.empty() ||
242 canvasId_[0] == '#') 242 canvasId_[0] == '#')
243 { 243 {
244 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange, 244 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange,
299 { 299 {
300 300
301 emscripten_set_mousedown_callback(canvasCssSelector_.c_str(), 301 emscripten_set_mousedown_callback(canvasCssSelector_.c_str(),
302 reinterpret_cast<void*>(this), 302 reinterpret_cast<void*>(this),
303 false, 303 false,
304 OnMouseDown); 304 NULL);
305 305
306 emscripten_set_mousemove_callback(canvasCssSelector_.c_str(), 306 emscripten_set_mousemove_callback(canvasCssSelector_.c_str(),
307 reinterpret_cast<void*>(this), 307 reinterpret_cast<void*>(this),
308 false, 308 false,
309 OnMouseMove); 309 NULL);
310 310
311 emscripten_set_mouseup_callback(canvasCssSelector_.c_str(), 311 emscripten_set_mouseup_callback(canvasCssSelector_.c_str(),
312 reinterpret_cast<void*>(this), 312 reinterpret_cast<void*>(this),
313 false, 313 false,
314 OnMouseUp); 314 NULL);
315 } 315 }
316 } 316 }
317 317
318 IViewport::ILock* WebAssemblyViewport::Lock() 318 IViewport::ILock* WebAssemblyViewport::Lock()
319 { 319 {