Mercurial > hg > orthanc-stone

changeset 244:313903066093 am

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup
author am@osimis.io
date Wed, 20 Jun 2018 14:56:52 +0200
parents 50fb32abf85e
children e802578e1554
files Applications/Samples/Web/tsconfig-samples.json Platforms/Generic/OracleWebService.h Platforms/Wasm/CMakeLists.txt Platforms/Wasm/tsconfig-stone.json Platforms/Wasm/wasm-viewport.ts Resources/CMake/OrthancStoneConfiguration.cmake
diffstat 6 files changed, 21 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Samples/Web/tsconfig-samples.json	Wed Jun 20 14:27:06 2018 +0200
+++ b/Applications/Samples/Web/tsconfig-samples.json	Wed Jun 20 14:56:52 2018 +0200
@@ -1,14 +1,10 @@
 {
+    "extends" : "../../../Platforms/Wasm/tsconfig-stone",
     "compilerOptions": {
-    "sourceMap": false,
-    "lib" : [
-        "es2017",
-        "dom"
-    ]
-    },
-    "include" : [
-        "../../../Platforms/Wasm/stone-framework-loader.ts",
-        "../../../Platforms/Wasm/wasm-application.ts",
-        "../../../Platforms/Wasm/wasm-viewport.ts"
-    ]
+        "sourceMap": false,
+        "lib" : [
+            "es2017",
+            "dom"
+        ]
+    }
 }
--- a/Platforms/Generic/OracleWebService.h	Wed Jun 20 14:27:06 2018 +0200
+++ b/Platforms/Generic/OracleWebService.h	Wed Jun 20 14:56:52 2018 +0200
@@ -64,7 +64,7 @@
 
     void Stop()
     {
-        oracle_.Start();
+        oracle_.Stop();
     }
   };
 }
--- a/Platforms/Wasm/CMakeLists.txt	Wed Jun 20 14:27:06 2018 +0200
+++ b/Platforms/Wasm/CMakeLists.txt	Wed Jun 20 14:56:52 2018 +0200
@@ -61,9 +61,6 @@
 
 macro(BuildSample Target Header Sample)
   add_executable(${Target}
-    ${ORTHANC_STONE_ROOT}/Platforms/Wasm/Defaults.cpp
-    ${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmWebService.cpp
-    ${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmViewport.cpp
 
     ${ORTHANC_STONE_ROOT}/Applications/Samples/SampleMainWasm.cpp
 #    ${ORTHANC_STONE_ROOT}/Applications/Samples/SampleApplicationContext.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Platforms/Wasm/tsconfig-stone.json	Wed Jun 20 14:56:52 2018 +0200
@@ -0,0 +1,7 @@
+{
+    "include" : [
+        "../../../Platforms/Wasm/stone-framework-loader.ts",
+        "../../../Platforms/Wasm/wasm-application.ts",
+        "../../../Platforms/Wasm/wasm-viewport.ts"
+    ]
+}
--- a/Platforms/Wasm/wasm-viewport.ts	Wed Jun 20 14:27:06 2018 +0200
+++ b/Platforms/Wasm/wasm-viewport.ts	Wed Jun 20 14:56:52 2018 +0200
@@ -65,6 +65,9 @@
       this.module_ = module;
       this.canvasId_ = canvasId;
       this.htmlCanvas_ = document.getElementById(this.canvasId_) as HTMLCanvasElement;
+      if (this.htmlCanvas_ == null) {
+        console.log("Can not create WasmViewport, did not find the canvas whose id is '", this.canvasId_, "'");
+      }
       this.context_ = this.htmlCanvas_.getContext('2d');
 
       this.ViewportSetSize = this.module_.cwrap('ViewportSetSize', null, [ 'number', 'number', 'number' ]);
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Wed Jun 20 14:27:06 2018 +0200
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Wed Jun 20 14:56:52 2018 +0200
@@ -158,6 +158,9 @@
 else()
   list(APPEND APPLICATIONS_SOURCES
     ${ORTHANC_STONE_ROOT}/Applications/Wasm/StartupParametersBuilder.cpp
+    ${ORTHANC_STONE_ROOT}/Platforms/Wasm/Defaults.cpp
+    ${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmWebService.cpp
+    ${ORTHANC_STONE_ROOT}/Platforms/Wasm/WasmViewport.cpp
     )
 endif()