Mercurial > hg > orthanc-stone

comparison Applications/Generic/GuiAdapter.cpp @ 1308:adf234ecaa00 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 10:21:54 +0100
parents 257f2c9a02ac
children 4f8c9065ee52
comparison
equal deleted inserted replaced
1307:8a28a9bf8876 1308:adf234ecaa00
32 32
33 #if ORTHANC_ENABLE_THREADS == 1 33 #if ORTHANC_ENABLE_THREADS == 1
34 # include "../../Framework/Deprecated/Messages/LockingEmitter.h" 34 # include "../../Framework/Deprecated/Messages/LockingEmitter.h"
35 #endif 35 #endif
36 36
37 #include <Core/Compatibility.h>
38
37 namespace OrthancStone 39 namespace OrthancStone
38 { 40 {
39 void GuiAdapter::RegisterWidget(boost::shared_ptr<IGuiAdapterWidget> widget)
40 {
41 widgets_.push_back(widget);
42 }
43
44 std::ostream& operator<<( 41 std::ostream& operator<<(
45 std::ostream& os, const GuiAdapterKeyboardEvent& event) 42 std::ostream& os, const GuiAdapterKeyboardEvent& event)
46 { 43 {
47 os << "sym: " << event.sym << " (" << (int)(event.sym[0]) << ") ctrl: " << event.ctrlKey << ", " << 44 os << "sym: " << event.sym << " (" << (int)(event.sym[0]) << ") ctrl: " << event.ctrlKey << ", " <<
48 "shift: " << event.shiftKey << ", " << 45 "shift: " << event.shiftKey << ", " <<
198 double time, void* userData) 195 double time, void* userData)
199 { 196 {
200 // userData is OnMouseWheelFuncAdapterPayload 197 // userData is OnMouseWheelFuncAdapterPayload
201 FuncAdapterPayload<GenericFunc>* payload = 198 FuncAdapterPayload<GenericFunc>* payload =
202 reinterpret_cast<FuncAdapterPayload<GenericFunc>*>(userData); 199 reinterpret_cast<FuncAdapterPayload<GenericFunc>*>(userData);
203 //std::auto_ptr< FuncAdapterPayload<GenericFunc> > deleter(payload); 200 //std::unique_ptr< FuncAdapterPayload<GenericFunc> > deleter(payload);
204 bool ret = (*(payload->callback))(time, payload->userData); 201 bool ret = (*(payload->callback))(time, payload->userData);
205 return static_cast<EM_BOOL>(ret); 202 return static_cast<EM_BOOL>(ret);
206 } 203 }
207 204
208 // resize: (const char* target, void* userData, EM_BOOL useCapture, em_ui_callback_func callback) 205 // resize: (const char* target, void* userData, EM_BOOL useCapture, em_ui_callback_func callback)
217 { 214 {
218 // TODO: write RemoveCallback with an int id that gets returned from 215 // TODO: write RemoveCallback with an int id that gets returned from
219 // here 216 // here
220 FuncAdapterPayload<GenericFunc>* payload = 217 FuncAdapterPayload<GenericFunc>* payload =
221 new FuncAdapterPayload<GenericFunc>(); 218 new FuncAdapterPayload<GenericFunc>();
222 std::auto_ptr<FuncAdapterPayload<GenericFunc> > payloadP(payload); 219 std::unique_ptr<FuncAdapterPayload<GenericFunc> > payloadP(payload);
223 payload->canvasId = canvasId; 220 payload->canvasId = canvasId;
224 payload->callback = func; 221 payload->callback = func;
225 payload->userData = userData; 222 payload->userData = userData;
226 void* userDataRaw = reinterpret_cast<void*>(payload); 223 void* userDataRaw = reinterpret_cast<void*>(payload);
227 // LOG(INFO) << "SetCallback -- userDataRaw: " << userDataRaw << 224 // LOG(INFO) << "SetCallback -- userDataRaw: " << userDataRaw <<
242 typename EmscriptenSetCallbackFunc> 239 typename EmscriptenSetCallbackFunc>
243 static void SetCallback2( 240 static void SetCallback2(
244 EmscriptenSetCallbackFunc emFunc, 241 EmscriptenSetCallbackFunc emFunc,
245 std::string canvasId, void* userData, bool capture, GenericFunc func) 242 std::string canvasId, void* userData, bool capture, GenericFunc func)
246 { 243 {
247 std::auto_ptr<FuncAdapterPayload<GenericFunc> > payload( 244 std::unique_ptr<FuncAdapterPayload<GenericFunc> > payload(
248 new FuncAdapterPayload<GenericFunc>() 245 new FuncAdapterPayload<GenericFunc>()
249 ); 246 );
250 payload->canvasId = canvasId; 247 payload->canvasId = canvasId;
251 payload->callback = func; 248 payload->callback = func;
252 payload->userData = userData; 249 payload->userData = userData;
265 static void SetAnimationFrameCallback( 262 static void SetAnimationFrameCallback(
266 EmscriptenSetCallbackFunc emFunc, 263 EmscriptenSetCallbackFunc emFunc,
267 void* userData, GenericFunc func) 264 void* userData, GenericFunc func)
268 { 265 {
269 // LOG(ERROR) << "SetAnimationFrameCallback !!!!!! (RequestAnimationFrame)"; 266 // LOG(ERROR) << "SetAnimationFrameCallback !!!!!! (RequestAnimationFrame)";
270 std::auto_ptr<FuncAdapterPayload<GenericFunc> > payload( 267 std::unique_ptr<FuncAdapterPayload<GenericFunc> > payload(
271 new FuncAdapterPayload<GenericFunc>() 268 new FuncAdapterPayload<GenericFunc>()
272 ); 269 );
273 payload->canvasId = "UNDEFINED"; 270 payload->canvasId = "UNDEFINED";
274 payload->callback = func; 271 payload->callback = func;
275 payload->userData = userData; 272 payload->userData = userData;