changeset 1474:d1dde1f86d4a

fix build of wasm samples
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 15 Jun 2020 18:21:34 +0200
parents 9cbc6d21ae89
children 615035c2f3ba
files Samples/WebAssembly/CMakeLists.txt Samples/WebAssembly/RtViewer/CMakeLists.txt Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Samples/WebAssembly/CMakeLists.txt	Mon Jun 15 18:02:49 2020 +0200
+++ b/Samples/WebAssembly/CMakeLists.txt	Mon Jun 15 18:21:34 2020 +0200
@@ -36,7 +36,7 @@
 include(${ORTHANC_ROOT}/Resources/CMake/AutoGeneratedCode.cmake)
 include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake)
 
-SET(ENABLE_DCMTK ON)
+SET(ENABLE_DCMTK OFF)  # Not necessary
 SET(ENABLE_GOOGLE_TEST OFF)
 SET(ENABLE_LOCALE ON)  # Necessary for text rendering
 SET(ENABLE_WASM ON)
@@ -56,6 +56,7 @@
   "${CMAKE_BINARY_DIR}/ubuntu-font-family-0.83")
 
 EmbedResources(
+  COLORMAP_HOT ${ORTHANC_STONE_ROOT}/Resources/Colormaps/hot.lut  
   UBUNTU_FONT  ${CMAKE_BINARY_DIR}/ubuntu-font-family-0.83/Ubuntu-R.ttf
   )
 
--- a/Samples/WebAssembly/RtViewer/CMakeLists.txt	Mon Jun 15 18:02:49 2020 +0200
+++ b/Samples/WebAssembly/RtViewer/CMakeLists.txt	Mon Jun 15 18:21:34 2020 +0200
@@ -36,7 +36,7 @@
 include(${ORTHANC_ROOT}/Resources/CMake/AutoGeneratedCode.cmake)
 include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake)
 
-SET(ENABLE_DCMTK ON)
+SET(ENABLE_DCMTK OFF)  # Not necessary
 SET(ENABLE_GOOGLE_TEST OFF)
 SET(ENABLE_LOCALE ON)  # Necessary for text rendering
 SET(ENABLE_WASM ON)
@@ -56,6 +56,7 @@
   "${CMAKE_BINARY_DIR}/ubuntu-font-family-0.83")
 
 EmbedResources(
+  COLORMAP_HOT ${ORTHANC_STONE_ROOT}/Resources/Colormaps/hot.lut  
   UBUNTU_FONT  ${CMAKE_BINARY_DIR}/ubuntu-font-family-0.83/Ubuntu-R.ttf
   )
 
--- a/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h	Mon Jun 15 18:02:49 2020 +0200
+++ b/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h	Mon Jun 15 18:21:34 2020 +0200
@@ -200,7 +200,7 @@
       return new Orthanc::SingleValueObject<Type>(type);
     }
     
-    void HandleThumbnail(const SeriesThumbnailsLoader::ThumbnailLoadedMessage& message)
+    void HandleThumbnail(const SeriesThumbnailsLoader::SuccessMessage& message)
     {
       if (observer_.get() != NULL)
       {
@@ -326,7 +326,7 @@
         application->Register<DicomResourcesLoader::SuccessMessage>(
           *application->resourcesLoader_, &WebViewerLoaders::HandleLoadedResources);
 
-        application->Register<SeriesThumbnailsLoader::ThumbnailLoadedMessage>(
+        application->Register<SeriesThumbnailsLoader::SuccessMessage>(
           *application->thumbnailsLoader_, &WebViewerLoaders::HandleThumbnail);
 
         lock->AddLoader(application);