Mercurial > hg > orthanc-stone
view Platforms/Wasm/stone-framework-loader.ts @ 508:7105a0bad250 bgo-commands-codegen
- Added HandleSerializedMessage to IStoneApplication (empty impl)
- Split UpdateWebApplication with "WithString" and "WithSerializedMessage" variants
- Due to the modules in TS, globals are now unallowed and the callbacks from C++ to JS are stored in the "window" instance
- Split UpdateStoneApplicationStatusFromCpp with "WithString" and "WithSerializedMessage" variants
- Split NotifyStatusUpdateFromCppToWeb with "WithString" and "WithSerializedMessage" variants
- SendMessageToStoneApplication (C++ global) has been split into SendSerializedMessageToStoneApplication and SendCommandToStoneApplication
- In WasmPlatformApplicationAdapter: HandleMessageFromWeb becomes HandleCommandFromWeb
- In WasmPlatformApplicationAdapter: added HandleSerializedMessageFromWeb
- stonegentool now handles the "json" primitive type (used, a.o., in the VSOL "EditInstance" message)
- Fixed indentation and added json serialization overloads in the stonegentool templates
- Added test of the json primitive type to testWasmIntegrated (in Resources/CodeGeneration)
- Adapted testWasmIntegrated (in Resources/CodeGeneration) to the changes above
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 06 Mar 2019 10:14:59 +0100 |
parents | 5055031f4a06 |
children | 548eed46f535 |
line wrap: on
line source
/** * This file contains primitives to interface with WebAssembly and * with the Stone framework. **/ export declare type InitializationCallback = () => void; //export declare var StoneFrameworkModule : any; export var StoneFrameworkModule : any; //const ASSETS_FOLDER : string = "assets/lib"; //const WASM_FILENAME : string = "orthanc-framework"; export class Framework { private static singleton_ : Framework = null; private static wasmModuleName_ : string = null; public static Configure(wasmModuleName: string) { this.wasmModuleName_ = wasmModuleName; } private constructor(verbose : boolean) { //this.ccall('Initialize', null, [ 'number' ], [ verbose ]); } public ccall( name: string, returnType: string, argTypes: Array<string>, argValues: Array<any>) : any { return (<any> window).StoneFrameworkModule.ccall(name, returnType, argTypes, argValues); } public cwrap( name: string, returnType: string, argTypes: Array<string>) : any { return (<any> window).StoneFrameworkModule.cwrap(name, returnType, argTypes); } public static GetInstance() : Framework { if (Framework.singleton_ == null) { throw new Error('The WebAssembly module is not loaded yet'); } else { return Framework.singleton_; } } public static Initialize( verbose: boolean, callback: InitializationCallback) { console.log('Initializing WebAssembly Module'); // (<any> window). (<any> window).StoneFrameworkModule = { preRun: [ function() { console.log('Loading the Stone Framework using WebAssembly'); } ], postRun: [ function() { // This function is called by ".js" wrapper once the ".wasm" // WebAssembly module has been loaded and compiled by the // browser console.log('WebAssembly is ready'); Framework.singleton_ = new Framework(verbose); callback(); } ], print: function(text : string) { console.log(text); }, printErr: function(text : string) { console.error(text); }, totalDependencies: 0 }; // Dynamic loading of the JavaScript wrapper around WebAssembly var script = document.createElement('script'); script.type = 'application/javascript'; //script.src = "orthanc-stone.js"; // ASSETS_FOLDER + '/' + WASM_FILENAME + '.js'; script.src = this.wasmModuleName_ + ".js";// "OrthancStoneSimpleViewer.js"; // ASSETS_FOLDER + '/' + WASM_FILENAME + '.js'; script.async = true; document.head.appendChild(script); } }