Mercurial > hg > orthanc-stone

comparison Platforms/Wasm/Defaults.cpp @ 603:70992b38aa8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 79bb0a02d1cc
children 4f2416d519b4
comparison
equal deleted inserted replaced
602:03c4b998fcd0 603:70992b38aa8a
3 #include "WasmWebService.h" 3 #include "WasmWebService.h"
4 #include "WasmDelayedCallExecutor.h" 4 #include "WasmDelayedCallExecutor.h"
5 #include <Framework/dev.h> 5 #include <Framework/dev.h>
6 #include "Framework/Widgets/TestCairoWidget.h" 6 #include "Framework/Widgets/TestCairoWidget.h"
7 #include <Framework/Viewport/WidgetViewport.h> 7 #include <Framework/Viewport/WidgetViewport.h>
8 #include <Applications/Wasm/StartupParametersBuilder.h>
9 #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h>
10 #include <Core/Logging.h>
11
8 #include <algorithm> 12 #include <algorithm>
9 #include "Applications/Wasm/StartupParametersBuilder.h" 13
10 #include "Platforms/Wasm/WasmPlatformApplicationAdapter.h"
11 14
12 static unsigned int width_ = 0; 15 static unsigned int width_ = 0;
13 static unsigned int height_ = 0; 16 static unsigned int height_ = 0;
14 17
15 /**********************************/ 18 /**********************************/
85 } 88 }
86 89
87 void EMSCRIPTEN_KEEPALIVE StartWasmApplication(const char* baseUri) { 90 void EMSCRIPTEN_KEEPALIVE StartWasmApplication(const char* baseUri) {
88 91
89 printf("StartWasmApplication\n"); 92 printf("StartWasmApplication\n");
93
94 Orthanc::Logging::SetErrorWarnInfoTraceLoggingFunctions(
95 stone_console_error, stone_console_warning,
96 stone_console_info, stone_console_trace);
90 97
91 // recreate a command line from uri arguments and parse it 98 // recreate a command line from uri arguments and parse it
92 boost::program_options::variables_map parameters; 99 boost::program_options::variables_map parameters;
93 boost::program_options::options_description options; 100 boost::program_options::options_description options;
94 application->DeclareStartupOptions(options); 101 application->DeclareStartupOptions(options);
102 application->Initialize(context.get(), statusBar_, parameters); 109 application->Initialize(context.get(), statusBar_, parameters);
103 application->InitializeWasm(); 110 application->InitializeWasm();
104 111
105 // viewport->SetSize(width_, height_); 112 // viewport->SetSize(width_, height_);
106 printf("StartWasmApplication - completed\n"); 113 printf("StartWasmApplication - completed\n");
114 }
115
116 bool EMSCRIPTEN_KEEPALIVE WasmIsTraceLevelEnabled()
117 {
118 return Orthanc::Logging::IsTraceLevelEnabled();
119 }
120
121 bool EMSCRIPTEN_KEEPALIVE WasmIsInfoLevelEnabled()
122 {
123 return Orthanc::Logging::IsInfoLevelEnabled();
107 } 124 }
108 125
109 void EMSCRIPTEN_KEEPALIVE WasmDoAnimation() 126 void EMSCRIPTEN_KEEPALIVE WasmDoAnimation()
110 { 127 {
111 for (auto viewport : viewports_) { 128 for (auto viewport : viewports_) {