# HG changeset patch # User Sebastien Jodogne # Date 1596731529 -7200 # Node ID d3cafeef07bb24becde43774b7278d488ff913c8 # Parent 3eca4f9c282708d92db14ca47f9ac2c2ffa8fed1 fix for new interface of Orthanc::ParsedDicomFile::ExtractDicomSummary() diff -r 3eca4f9c2827 -r d3cafeef07bb OrthancStone/Resources/CMake/OrthancStoneConfiguration.cmake --- a/OrthancStone/Resources/CMake/OrthancStoneConfiguration.cmake Tue Aug 04 14:37:41 2020 +0200 +++ b/OrthancStone/Resources/CMake/OrthancStoneConfiguration.cmake Thu Aug 06 18:32:09 2020 +0200 @@ -178,6 +178,7 @@ add_definitions( -DHAS_ORTHANC_EXCEPTION=1 + -DORTHANC_STONE_MAX_TAG_LENGTH=256 ) if (CMAKE_BUILD_TYPE STREQUAL "Debug") diff -r 3eca4f9c2827 -r d3cafeef07bb OrthancStone/Sources/Loaders/DicomResourcesLoader.cpp --- a/OrthancStone/Sources/Loaders/DicomResourcesLoader.cpp Tue Aug 04 14:37:41 2020 +0200 +++ b/OrthancStone/Sources/Loaders/DicomResourcesLoader.cpp Thu Aug 06 18:32:09 2020 +0200 @@ -534,7 +534,7 @@ ignoreTagLength.insert(Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR); // Needed for RT-DOSE Orthanc::DicomMap summary; - message.GetDicom().ExtractDicomSummary(summary, ignoreTagLength); + message.GetDicom().ExtractDicomSummary(summary, ORTHANC_STONE_MAX_TAG_LENGTH, ignoreTagLength); handler.GetTarget()->AddResource(summary); handler.BroadcastSuccess(); diff -r 3eca4f9c2827 -r d3cafeef07bb StoneWebViewer/WebAssembly/NOTES.txt --- a/StoneWebViewer/WebAssembly/NOTES.txt Tue Aug 04 14:37:41 2020 +0200 +++ b/StoneWebViewer/WebAssembly/NOTES.txt Thu Aug 06 18:32:09 2020 +0200 @@ -1,2 +1,2 @@ # source ~/Downloads/emsdk/emsdk_env.sh -# cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -G Ninja +# cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DALLOW_DOWNLOADS=ON -G Ninja diff -r 3eca4f9c2827 -r d3cafeef07bb StoneWebViewer/WebAssembly/StoneWebViewer.cpp --- a/StoneWebViewer/WebAssembly/StoneWebViewer.cpp Tue Aug 04 14:37:41 2020 +0200 +++ b/StoneWebViewer/WebAssembly/StoneWebViewer.cpp Thu Aug 06 18:32:09 2020 +0200 @@ -1125,7 +1125,7 @@ virtual void Handle(const OrthancStone::ParseDicomSuccessMessage& message) const ORTHANC_OVERRIDE { Orthanc::DicomMap tags; - message.GetDicom().ExtractDicomSummary(tags); + message.GetDicom().ExtractDicomSummary(tags, ORTHANC_STONE_MAX_TAG_LENGTH); std::string s; if (!tags.LookupStringValue(s, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))