Mercurial > hg > orthanc-stone

changeset 522:700aa66f2f29 bgo-commands-codegen

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed deleted file from cmakelists + fixed renames in compilation. Samples build OK in WAS but still not fully functional
author Benjamin Golinvaux <bgo@osimis.io>
date Tue, 12 Mar 2019 15:01:36 +0100
parents 17106b29ed6d
children b1377625e4ba
files Applications/Samples/CMakeLists.txt Applications/Samples/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.cpp Applications/Samples/SimpleViewerApplicationSingleFile.h
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Samples/CMakeLists.txt	Tue Mar 12 13:11:18 2019 +0100
+++ b/Applications/Samples/CMakeLists.txt	Tue Mar 12 15:01:36 2019 +0100
@@ -38,7 +38,7 @@
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WASM_FLAGS}")
 
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${WASM_FLAGS}")  # not always clear which flags are for the compiler and which one are for the linker -> pass them all to the linker too
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --js-library ${STONE_SOURCES_DIR}/Applications/Samples/samples-library.js")
+  # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --js-library ${STONE_SOURCES_DIR}/Applications/Samples/samples-library.js")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --js-library ${STONE_SOURCES_DIR}/Platforms/Wasm/WasmWebService.js")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --js-library ${STONE_SOURCES_DIR}/Platforms/Wasm/WasmDelayedCallExecutor.js")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --js-library ${STONE_SOURCES_DIR}/Platforms/Wasm/default-library.js")
--- a/Applications/Samples/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.cpp	Tue Mar 12 13:11:18 2019 +0100
+++ b/Applications/Samples/SimpleViewer/Wasm/SimpleViewerWasmApplicationAdapter.cpp	Tue Mar 12 15:01:36 2019 +0100
@@ -45,7 +45,7 @@
 
     writer->write(event, &outputStr);
 
-    NotifyStatusUpdateFromCppToWeb(outputStr.str());
+    NotifyStatusUpdateFromCppToWebWithString(outputStr.str());
   }
 
 } // namespace SimpleViewer
\ No newline at end of file
--- a/Applications/Samples/SimpleViewerApplicationSingleFile.h	Tue Mar 12 13:11:18 2019 +0100
+++ b/Applications/Samples/SimpleViewerApplicationSingleFile.h	Tue Mar 12 15:01:36 2019 +0100
@@ -215,12 +215,12 @@
           if (input == "select-tool:line-measure")
           {
             viewerApplication_.currentTool_ = Tools_LineMeasure;
-            NotifyStatusUpdateFromCppToWeb("currentTool=line-measure");
+            NotifyStatusUpdateFromCppToWebWithString("currentTool=line-measure");
           }
           else if (input == "select-tool:circle-measure")
           {
             viewerApplication_.currentTool_ = Tools_CircleMeasure;
-            NotifyStatusUpdateFromCppToWeb("currentTool=circle-measure");
+            NotifyStatusUpdateFromCppToWebWithString("currentTool=circle-measure");
           }
 
           output = "ok";
@@ -231,7 +231,7 @@
           UpdateStoneApplicationStatusFromCppWithSerializedMessage(statusUpdateMessage.c_str());
         }
 
-        virtual void NotifyStatusUpdateFromCppToWeb(const std::string& statusUpdateMessage) 
+        virtual void NotifyStatusUpdateFromCppToWebWithString(const std::string& statusUpdateMessage) 
         {
           UpdateStoneApplicationStatusFromCppWithString(statusUpdateMessage.c_str());
         }