Mercurial > hg > orthanc-stone

annotate Platforms/Wasm/wasm-application-runner.ts @ 719:633bb89d4a6e rtviewer19branch

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes to auxiliary parameters management
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 20 May 2019 19:55:13 +0200
parents df7286320507
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
4
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
5 if (!('WebAssembly' in window)) {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
6 alert('Sorry, your browser does not support WebAssembly :(');
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
7 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
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
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
11
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
12 // global functions
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
13 var WasmWebService_NotifyError: Function = null;
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
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
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
18 var SetStartupParameter: Function = null;
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
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
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
21 var ReleaseCppViewport: Function = null;
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
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
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
24
715
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
25 var auxiliaryParameters : Map<string,string> = null;
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
26
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
27 export function SetApplicationParameters(params : Map<string,string>) {
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
28 if (auxiliaryParameters != null) {
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
29 console.warn("wasm-application-runner.SetApplicationParameters: about to overwrite the existing application parameters!")
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
30 }
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
31 auxiliaryParameters = params;
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
32 }
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
33
386
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 314
diff changeset
34 function DoAnimationThread() {
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 314
diff changeset
35 if (WasmDoAnimation != null) {
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 314
diff changeset
36 WasmDoAnimation();
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
37 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
38
715
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
39 // Update the viewport content every 100ms if need be
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
40 setTimeout(DoAnimationThread, 100);
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
41 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
42
715
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
43
313
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 303
diff changeset
44 function GetUriParameters(): Map<string, string> {
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
45 var parameters = window.location.search.substr(1);
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
46
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
47 if (parameters != null &&
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
48 parameters != '') {
313
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 303
diff changeset
49 var result = new Map<string, string>();
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
50 var tokens = parameters.split('&');
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
51
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
52 for (var i = 0; i < tokens.length; i++) {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
53 var tmp = tokens[i].split('=');
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
54 if (tmp.length == 2) {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
55 result[tmp[0]] = decodeURIComponent(tmp[1]);
715
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
56 } else if(tmp.length == 1) {
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
57 // if there is no '=', we treat ot afterwards as a flag-style param
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
58 result[tmp[0]] = "";
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
59 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
60 }
715
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
61 return result;
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
62 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
63 else {
313
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 303
diff changeset
64 return new Map<string, string>();
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
65 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
66 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
67
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
68 // function UpdateWebApplication(statusUpdateMessage: string) {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
69 // console.log(statusUpdateMessage);
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
70 // }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
71
314
97f16214dc5e cleanup
am@osimis.io
parents: 313
diff changeset
72 function _InitializeWasmApplication(orthancBaseUrl: string): void {
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
73
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
74 CreateWasmApplication();
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
75
719
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
76 // parse uri and transmit the URI parameters to the app before initializing it
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
77 let parameters = GetUriParameters();
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
78
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
79 // merge params but give priority to URI parameters
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
80 var resultingParams : Map<string,string>;
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
81
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
82 if (auxiliaryParameters == null) {
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
83 resultingParams = new Map<string,string>();
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
84 } else {
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
85 resultingParams = auxiliaryParameters;
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
86 }
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
87
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
88 for (let key in parameters) {
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
89 if (parameters.hasOwnProperty(key)) {
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
90 resultingParams[key] = parameters[key]
715
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
91 }
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
92 }
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
93
719
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
94 for (let key in resultingParams) {
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
95 if (resultingParams.hasOwnProperty(key)) {
715
636eb0e4c9dd Adding SetApplicationParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
96 Logger.defaultLogger.debug(
719
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
97 `About to call SetStartupParameter("${key}","${resultingParams[key]}")`);
633bb89d4a6e Fixes to auxiliary parameters management
Benjamin Golinvaux <bgo@osimis.io>
parents: 718
diff changeset
98 SetStartupParameter(key, resultingParams[key]);
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
99 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
100 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
101
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 386
diff changeset
102 StartWasmApplication(orthancBaseUrl);
313
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 303
diff changeset
103
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 386
diff changeset
104 // 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
105 StoneViewport.WasmViewport.ResizeAll();
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
106
386
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 314
diff changeset
107 DoAnimationThread();
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
108 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
109
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 435
diff changeset
110 export function InitializeWasmApplication(wasmModuleName: string, orthancBaseUrl: string) {
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
111
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
112 Stone.Framework.Configure(wasmModuleName);
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
113
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
114 // Wait for the Orthanc Framework to be initialized (this initializes
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
115 // the WebAssembly environment) and then, create and initialize the Wasm application
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
116 Stone.Framework.Initialize(true, function () {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
117
526
548eed46f535 introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents: 508
diff changeset
118 Logger.defaultLogger.debug("Connecting C++ methods to JS methods");
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
119
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 435
diff changeset
120 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
121 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
122 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
123 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
124 StartWasmApplication = (<any> window).StoneFrameworkModule.cwrap('StartWasmApplication', null, ['string']);
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
125
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 435
diff changeset
126 (<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
127 (<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
128 (<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
129 (<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
130 // 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
131 WasmDoAnimation = (<any> window).StoneFrameworkModule.cwrap('WasmDoAnimation', null, []);
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
132
508
7105a0bad250 - Added HandleSerializedMessage to IStoneApplication (empty impl)
Benjamin Golinvaux <bgo@osimis.io>
parents: 466
diff changeset
133 SendSerializedMessageToStoneApplication = (<any> window).StoneFrameworkModule.cwrap('SendSerializedMessageToStoneApplication', 'string', ['string']);
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
134
526
548eed46f535 introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents: 508
diff changeset
135 Logger.defaultLogger.debug("Connecting C++ methods to JS methods - done");
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
136
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
137 // Prevent scrolling
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
138 document.body.addEventListener('touchmove', function (event) {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
139 event.preventDefault();
545
e1ba16436d59 set events passive again
Alain Mazy <alain@mazy.be>
parents: 536
diff changeset
140 }, { passive: false}); // must not be passive if calling event.preventDefault, ie to cancel scroll or zoom of the whole interface
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
141
314
97f16214dc5e cleanup
am@osimis.io
parents: 313
diff changeset
142 _InitializeWasmApplication(orthancBaseUrl);
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents:
diff changeset
143 });
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 435
diff changeset
144 }
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 435
diff changeset
145
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 435
diff changeset
146
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 435
diff changeset
147 // exports.InitializeWasmApplication = InitializeWasmApplication;
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 435
diff changeset
148
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 435
diff changeset
149
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 435
diff changeset
150