annotate Platforms/Wasm/Defaults.h @ 603:70992b38aa8a

new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 29 Apr 2019 15:09:48 +0200
parents 7105a0bad250
children 4f2416d519b4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
1 #pragma once
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
2
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
3 #include <emscripten/emscripten.h>
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
4
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
5 #include <Framework/dev.h>
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
6 #include <Framework/Viewport/WidgetViewport.h>
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
7 #include <Framework/Widgets/LayoutWidget.h>
288
8c8da145fefa renamings and doc
am@osimis.io
parents: 287
diff changeset
8 #include <Applications/IStoneApplication.h>
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
9 #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h>
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
10
233
68856534f005 added layout to VSOL, SDL & wasm working
am@osimis.io
parents: 229
diff changeset
11 typedef OrthancStone::WidgetViewport* ViewportHandle; // the objects exchanged between JS and C++
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
12
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
13 #ifdef __cplusplus
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
14 extern "C" {
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
15 #endif
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
16
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
17 // JS methods accessible from C++
229
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
18 extern void ScheduleWebViewportRedrawFromCpp(ViewportHandle cppViewportHandle);
508
7105a0bad250 - Added HandleSerializedMessage to IStoneApplication (empty impl)
Benjamin Golinvaux <bgo@osimis.io>
parents: 389
diff changeset
19 extern void UpdateStoneApplicationStatusFromCppWithString(const char* statusUpdateMessage);
7105a0bad250 - Added HandleSerializedMessage to IStoneApplication (empty impl)
Benjamin Golinvaux <bgo@osimis.io>
parents: 389
diff changeset
20 extern void UpdateStoneApplicationStatusFromCppWithSerializedMessage(const char* statusUpdateMessage);
603
70992b38aa8a new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents: 508
diff changeset
21 extern void stone_console_error(const char*);
70992b38aa8a new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents: 508
diff changeset
22 extern void stone_console_warning(const char*);
70992b38aa8a new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents: 508
diff changeset
23 extern void stone_console_info(const char*);
70992b38aa8a new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents: 508
diff changeset
24 extern void stone_console_trace(const char*);
70992b38aa8a new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents: 508
diff changeset
25
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
26 // C++ methods accessible from JS
229
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
27 extern void EMSCRIPTEN_KEEPALIVE CreateWasmApplication(ViewportHandle cppViewportHandle);
254
abc1c6231947 cleanup
am@osimis.io
parents: 253
diff changeset
28 extern void EMSCRIPTEN_KEEPALIVE SetStartupParameter(const char* keyc, const char* value);
abc1c6231947 cleanup
am@osimis.io
parents: 253
diff changeset
29
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
30
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
31 #ifdef __cplusplus
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
32 }
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
33 #endif
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
34
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
35 // these methods must be implemented in the custom app "mainWasm.cpp"
288
8c8da145fefa renamings and doc
am@osimis.io
parents: 287
diff changeset
36 extern OrthancStone::IStoneApplication* CreateUserApplication(OrthancStone::MessageBroker& broker);
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
37 extern OrthancStone::WasmPlatformApplicationAdapter* CreateWasmApplicationAdapter(OrthancStone::MessageBroker& broker, OrthancStone::IStoneApplication* application);
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
38
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
39 namespace OrthancStone {
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
40
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
41 // default Observer to trigger Viewport redraw when something changes in the Viewport
385
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 307
diff changeset
42 class ViewportContentChangedObserver : public IObserver
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
43 {
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
44 private:
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
45 // Flag to avoid flooding JavaScript with redundant Redraw requests
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
46 bool isScheduled_;
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
47
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
48 public:
385
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 307
diff changeset
49 ViewportContentChangedObserver(MessageBroker& broker) :
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 307
diff changeset
50 IObserver(broker),
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
51 isScheduled_(false)
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
52 {
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
53 }
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
54
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
55 void Reset()
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
56 {
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
57 isScheduled_ = false;
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
58 }
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
59
385
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 307
diff changeset
60 void OnViewportChanged(const IViewport::ViewportChangedMessage& message)
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
61 {
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
62 if (!isScheduled_)
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
63 {
385
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 307
diff changeset
64 ScheduleWebViewportRedrawFromCpp((ViewportHandle)&message.GetOrigin()); // loosing constness when transmitted to Web
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
65 isScheduled_ = true;
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
66 }
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
67 }
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
68 };
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
69
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
70 // default status bar to log messages on the console/stdout
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
71 class StatusBar : public OrthancStone::IStatusBar
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
72 {
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
73 public:
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
74 virtual void ClearMessage()
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
75 {
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
76 }
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
77
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
78 virtual void SetMessage(const std::string& message)
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
79 {
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
80 printf("%s\n", message.c_str());
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
81 }
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
82 };
385
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 307
diff changeset
83 }