Mercurial > hg > orthanc-stone
diff Applications/Samples/SimpleViewerApplicationSingleFile.h @ 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 | 22b80f5c3a1c |
children | 700aa66f2f29 |
line wrap: on
line diff
--- a/Applications/Samples/SimpleViewerApplicationSingleFile.h Fri Mar 01 16:18:38 2019 +0100 +++ b/Applications/Samples/SimpleViewerApplicationSingleFile.h Wed Mar 06 10:14:59 2019 +0100 @@ -205,7 +205,12 @@ { } - virtual void HandleMessageFromWeb(std::string& output, const std::string& input) + virtual void HandleSerializedMessageFromWeb(std::string& output, const std::string& input) + { + // the simple viewer does not use the serialized messages facilities + } + + virtual void HandleCommandFromWeb(std::string& output, const std::string& input) { if (input == "select-tool:line-measure") { @@ -221,9 +226,14 @@ output = "ok"; } + virtual void NotifySerializedMessageFromCppToWeb(const std::string& statusUpdateMessage) + { + UpdateStoneApplicationStatusFromCppWithSerializedMessage(statusUpdateMessage.c_str()); + } + virtual void NotifyStatusUpdateFromCppToWeb(const std::string& statusUpdateMessage) { - UpdateStoneApplicationStatusFromCpp(statusUpdateMessage.c_str()); + UpdateStoneApplicationStatusFromCppWithString(statusUpdateMessage.c_str()); } };