Mercurial > hg > orthanc-stone
annotate Platforms/Wasm/wasm-application-runner.ts @ 535:79bb0a02d1cc bgo-commands-codegen
- Added ORTHANC_OVERRIDE to several methods (translates to "override" in C++ 11 compilers)
- Last fixes to new style command handling (removed useless commands and switch command handling in simple samples to use XxxxSerializedMessageXxxx instead of XxxxCommandXxxx
- Fixed hardcoded input instance in SingleFrameEditorApplication
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Tue, 19 Mar 2019 09:13:57 +0100 |
| parents | 548eed46f535 |
| children | f65748b33bd1 |
| rev | line source |
|---|---|
|
466
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
1 import Stone = require('./stone-framework-loader'); |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
2 import StoneViewport = require('./wasm-viewport'); |
|
526
548eed46f535
introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents:
508
diff
changeset
|
3 import * as Logger from './logger' |
| 287 | 4 |
| 5 if (!('WebAssembly' in window)) { | |
| 6 alert('Sorry, your browser does not support WebAssembly :('); | |
| 7 } | |
| 8 | |
|
466
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
9 //var StoneFrameworkModule : Stone.Framework = (<any>window).StoneFrameworkModule; |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
10 //export declare var StoneFrameworkModule : Stone.Framework; |
| 287 | 11 |
| 12 // global functions | |
| 13 var WasmWebService_NotifyError: Function = null; | |
| 14 var WasmWebService_NotifySuccess: Function = null; | |
|
435
e641d3978856
WasmWebService now using BaseWebService and supporting cache
am@osimis.io
parents:
431
diff
changeset
|
15 var WasmWebService_NotifyCachedSuccess: Function = null; |
|
431
26b90b110719
added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents:
418
diff
changeset
|
16 var WasmDelayedCallExecutor_ExecuteCallback: Function = null; |
|
386
e33659decec5
renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
17 var WasmDoAnimation: Function = null; |
| 287 | 18 var SetStartupParameter: Function = null; |
| 19 var CreateWasmApplication: Function = null; | |
|
466
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
20 export var CreateCppViewport: Function = null; |
| 287 | 21 var ReleaseCppViewport: Function = null; |
| 22 var StartWasmApplication: Function = null; | |
|
508
7105a0bad250
- Added HandleSerializedMessage to IStoneApplication (empty impl)
Benjamin Golinvaux <bgo@osimis.io>
parents:
466
diff
changeset
|
23 export var SendSerializedMessageToStoneApplication: Function = null; |
| 287 | 24 |
|
386
e33659decec5
renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
25 function DoAnimationThread() { |
|
e33659decec5
renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
26 if (WasmDoAnimation != null) { |
|
e33659decec5
renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
27 WasmDoAnimation(); |
| 287 | 28 } |
| 29 | |
|
386
e33659decec5
renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
30 setTimeout(DoAnimationThread, 100); // Update the viewport content every 100ms if need be |
| 287 | 31 } |
| 32 | |
| 313 | 33 function GetUriParameters(): Map<string, string> { |
| 287 | 34 var parameters = window.location.search.substr(1); |
| 35 | |
| 36 if (parameters != null && | |
| 37 parameters != '') { | |
| 313 | 38 var result = new Map<string, string>(); |
| 287 | 39 var tokens = parameters.split('&'); |
| 40 | |
| 41 for (var i = 0; i < tokens.length; i++) { | |
| 42 var tmp = tokens[i].split('='); | |
| 43 if (tmp.length == 2) { | |
| 44 result[tmp[0]] = decodeURIComponent(tmp[1]); | |
| 45 } | |
| 46 } | |
| 47 | |
| 48 return result; | |
| 49 } | |
| 50 else { | |
| 313 | 51 return new Map<string, string>(); |
| 287 | 52 } |
| 53 } | |
| 54 | |
| 55 // function UpdateWebApplication(statusUpdateMessage: string) { | |
| 56 // console.log(statusUpdateMessage); | |
| 57 // } | |
| 58 | |
| 314 | 59 function _InitializeWasmApplication(orthancBaseUrl: string): void { |
| 287 | 60 |
| 61 CreateWasmApplication(); | |
| 62 | |
| 63 // parse uri and transmit the parameters to the app before initializing it | |
| 313 | 64 let parameters = GetUriParameters(); |
| 287 | 65 |
| 313 | 66 for (let key in parameters) { |
| 287 | 67 if (parameters.hasOwnProperty(key)) { |
| 68 SetStartupParameter(key, parameters[key]); | |
| 69 } | |
| 70 } | |
| 71 | |
| 418 | 72 StartWasmApplication(orthancBaseUrl); |
| 313 | 73 |
| 418 | 74 // trigger a first resize of the canvas that has just been initialized |
|
466
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
75 StoneViewport.WasmViewport.ResizeAll(); |
| 287 | 76 |
|
386
e33659decec5
renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
77 DoAnimationThread(); |
| 287 | 78 } |
| 79 | |
|
466
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
80 export function InitializeWasmApplication(wasmModuleName: string, orthancBaseUrl: string) { |
| 287 | 81 |
| 82 Stone.Framework.Configure(wasmModuleName); | |
| 83 | |
| 84 // Wait for the Orthanc Framework to be initialized (this initializes | |
| 85 // the WebAssembly environment) and then, create and initialize the Wasm application | |
| 86 Stone.Framework.Initialize(true, function () { | |
| 87 | |
|
526
548eed46f535
introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents:
508
diff
changeset
|
88 Logger.defaultLogger.debug("Connecting C++ methods to JS methods"); |
| 287 | 89 |
|
466
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
90 SetStartupParameter = (<any> window).StoneFrameworkModule.cwrap('SetStartupParameter', null, ['string', 'string']); |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
91 CreateWasmApplication = (<any> window).StoneFrameworkModule.cwrap('CreateWasmApplication', null, ['number']); |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
92 CreateCppViewport = (<any> window).StoneFrameworkModule.cwrap('CreateCppViewport', 'number', []); |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
93 ReleaseCppViewport = (<any> window).StoneFrameworkModule.cwrap('ReleaseCppViewport', null, ['number']); |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
94 StartWasmApplication = (<any> window).StoneFrameworkModule.cwrap('StartWasmApplication', null, ['string']); |
| 287 | 95 |
|
466
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
96 (<any> window).WasmWebService_NotifyCachedSuccess = (<any> window).StoneFrameworkModule.cwrap('WasmWebService_NotifyCachedSuccess', null, ['number']); |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
97 (<any> window).WasmWebService_NotifySuccess = (<any> window).StoneFrameworkModule.cwrap('WasmWebService_NotifySuccess', null, ['number', 'string', 'array', 'number', 'number']); |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
98 (<any> window).WasmWebService_NotifyError = (<any> window).StoneFrameworkModule.cwrap('WasmWebService_NotifyError', null, ['number', 'string', 'number']); |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
99 (<any> window).WasmDelayedCallExecutor_ExecuteCallback = (<any> window).StoneFrameworkModule.cwrap('WasmDelayedCallExecutor_ExecuteCallback', null, ['number']); |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
100 // no need to put this into the globals for it's only used in this very module |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
101 WasmDoAnimation = (<any> window).StoneFrameworkModule.cwrap('WasmDoAnimation', null, []); |
| 287 | 102 |
|
508
7105a0bad250
- Added HandleSerializedMessage to IStoneApplication (empty impl)
Benjamin Golinvaux <bgo@osimis.io>
parents:
466
diff
changeset
|
103 SendSerializedMessageToStoneApplication = (<any> window).StoneFrameworkModule.cwrap('SendSerializedMessageToStoneApplication', 'string', ['string']); |
| 287 | 104 |
|
526
548eed46f535
introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents:
508
diff
changeset
|
105 Logger.defaultLogger.debug("Connecting C++ methods to JS methods - done"); |
| 287 | 106 |
| 107 // Prevent scrolling | |
| 108 document.body.addEventListener('touchmove', function (event) { | |
| 109 event.preventDefault(); | |
| 110 }, false); | |
| 111 | |
| 314 | 112 _InitializeWasmApplication(orthancBaseUrl); |
| 287 | 113 }); |
|
466
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
114 } |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
115 |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
116 |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
117 // exports.InitializeWasmApplication = InitializeWasmApplication; |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
118 |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
119 |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
435
diff
changeset
|
120 |