# HG changeset patch # User Sebastien Jodogne # Date 1592238094 -7200 # Node ID d1dde1f86d4ab96e73fb70a51f12304952ac2a17 # Parent 9cbc6d21ae898c130adbe178daa317e29e001563 fix build of wasm samples diff -r 9cbc6d21ae89 -r d1dde1f86d4a Samples/WebAssembly/CMakeLists.txt --- 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 ) diff -r 9cbc6d21ae89 -r d1dde1f86d4a Samples/WebAssembly/RtViewer/CMakeLists.txt --- 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 ) diff -r 9cbc6d21ae89 -r d1dde1f86d4a Samples/WebAssembly/SingleFrameViewer/SingleFrameViewerApplication.h --- 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); } - void HandleThumbnail(const SeriesThumbnailsLoader::ThumbnailLoadedMessage& message) + void HandleThumbnail(const SeriesThumbnailsLoader::SuccessMessage& message) { if (observer_.get() != NULL) { @@ -326,7 +326,7 @@ application->Register( *application->resourcesLoader_, &WebViewerLoaders::HandleLoadedResources); - application->Register( + application->Register( *application->thumbnailsLoader_, &WebViewerLoaders::HandleThumbnail); lock->AddLoader(application);