# HG changeset patch # User Sebastien Jodogne # Date 1734436153 -3600 # Node ID 900e29a3d93692d4b4cd112277fd9257efa4099e # Parent ec0f264beac9d9485f75bdecf15bc60e3ac77a76 removed dependency on bootstrap-vue diff -r ec0f264beac9 -r 900e29a3d936 CMakeLists.txt --- a/CMakeLists.txt Tue Dec 17 12:38:37 2024 +0100 +++ b/CMakeLists.txt Tue Dec 17 12:49:13 2024 +0100 @@ -51,7 +51,6 @@ mark_as_advanced(ORTHANC_FRAMEWORK_STATIC) -set(BUILD_BOOTSTRAP_VUE OFF CACHE BOOL "Compile Bootstrap-Vue from sources") set(BUILD_BABEL_POLYFILL OFF CACHE BOOL "Retrieve babel-polyfill from npm") diff -r ec0f264beac9 -r 900e29a3d936 NEWS --- a/NEWS Tue Dec 17 12:38:37 2024 +0100 +++ b/NEWS Tue Dec 17 12:49:13 2024 +0100 @@ -1,15 +1,16 @@ Pending changes in the mainline =============================== -* Added a "Server" entry in the DICOMweb job content. +* Added a "Server" entry in the DICOMweb job content * Fixed parsing of numerical values in QIDO-RS response that prevented, among other, the retrieval of "NumberOfStudyRelatedInstances", "NumberOfStudyRelatedSeries",... -* Fixed non-Latin "PatientName" values that were empty in some QIDO-RS responses. -* Optimized the retrieval of single frame in WADO-RS when no transcoding is required. - This greatly improves the download time of multi-frame images in OHIF. -* Optimization when running with an Orthanc that supports the "ExtendedFind" primitive. -* Added support for Orthanc running in "ReadOnly" mode. -* Fix handling of revisions for cached data. +* Fixed non-Latin "PatientName" values that were empty in some QIDO-RS responses +* Optimized the retrieval of single frame in WADO-RS when no transcoding is required, + which greatly improves the download time of multi-frame images in OHIF +* Optimization when running with an Orthanc that supports the "ExtendedFind" primitive +* Added support for Orthanc running in "ReadOnly" mode +* Fix handling of revisions for cached data +* Removed dependency on bootstrap-vue Version 1.17 (2024-06-05) diff -r ec0f264beac9 -r 900e29a3d936 Resources/CMake/JavaScriptLibraries.cmake --- a/Resources/CMake/JavaScriptLibraries.cmake Tue Dec 17 12:38:37 2024 +0100 +++ b/Resources/CMake/JavaScriptLibraries.cmake Tue Dec 17 12:49:13 2024 +0100 @@ -46,72 +46,6 @@ "${CMAKE_CURRENT_BINARY_DIR}/Font-Awesome-4.7.0") -set(BOOTSTRAP_VUE_SOURCES_DIR ${CMAKE_CURRENT_BINARY_DIR}/bootstrap-vue-2.0.0-rc.24) - -if (BUILD_BOOTSTRAP_VUE OR - BUILD_BABEL_POLYFILL) - find_program(NPM_EXECUTABLE npm) - if (${NPM_EXECUTABLE} MATCHES "NPM_EXECUTABLE-NOTFOUND") - message(FATAL_ERROR "Please install the 'npm' standard command-line tool") - endif() -endif() - -if (BUILD_BOOTSTRAP_VUE) - DownloadPackage( - "36ab31495ab94162e159619532e8def5" - "${BASE_URL}/dicom-web/bootstrap-vue-2.0.0-rc.24.tar.gz" - "${BOOTSTRAP_VUE_SOURCES_DIR}") - - if (NOT IS_DIRECTORY "${BOOTSTRAP_VUE_SOURCES_DIR}/node_modules") - execute_process( - COMMAND ${NPM_EXECUTABLE} install - WORKING_DIRECTORY ${BOOTSTRAP_VUE_SOURCES_DIR} - RESULT_VARIABLE Failure - OUTPUT_QUIET - ) - - if (Failure) - message(FATAL_ERROR "Error while running 'npm install' on Bootstrap-Vue") - endif() - endif() - - if (NOT IS_DIRECTORY "${BOOTSTRAP_VUE_SOURCES_DIR}/dist") - execute_process( - COMMAND ${NPM_EXECUTABLE} run build - WORKING_DIRECTORY ${BOOTSTRAP_VUE_SOURCES_DIR} - RESULT_VARIABLE Failure - OUTPUT_QUIET - ) - - if (Failure) - message(FATAL_ERROR "Error while running 'npm build' on Bootstrap-Vue") - endif() - endif() - -else() - - ## - ## Generation of the precompiled Bootstrap-Vue package: - ## - ## Possibility 1 (build from sources): - ## $ cmake -DBUILD_BOOTSTRAP_VUE=ON . - ## $ tar cvfz bootstrap-vue-2.0.0-rc.24-dist.tar.gz bootstrap-vue-2.0.0-rc.24/dist/ - ## - ## Possibility 2 (download from CDN): - ## $ mkdir /tmp/i && cd /tmp/i - ## $ wget -r --no-parent https://unpkg.com/bootstrap-vue@2.0.0-rc.24/dist/ - ## $ mv unpkg.com/bootstrap-vue@2.0.0-rc.24/ bootstrap-vue-2.0.0-rc.24 - ## $ rm bootstrap-vue-2.0.0-rc.24/dist/index.html - ## $ tar cvfz bootstrap-vue-2.0.0-rc.24-dist.tar.gz bootstrap-vue-2.0.0-rc.24/dist/ - - DownloadPackage( - "ba0e67b1f0b4ce64e072b42b17f6c578" - "${BASE_URL}/dicom-web/bootstrap-vue-2.0.0-rc.24-dist.tar.gz" - "${BOOTSTRAP_VUE_SOURCES_DIR}") - -endif() - - if (BUILD_BABEL_POLYFILL) set(BABEL_POLYFILL_SOURCES_DIR ${CMAKE_CURRENT_BINARY_DIR}/node_modules/babel-polyfill/dist) @@ -124,7 +58,7 @@ ) if (Failure) - message(FATAL_ERROR "Error while running 'npm install' on Bootstrap-Vue") + message(FATAL_ERROR "Error while running 'npm install' on babel-polyfill") endif() endif() else() @@ -145,8 +79,6 @@ file(COPY ${BABEL_POLYFILL_SOURCES_DIR}/polyfill.min.js - ${BOOTSTRAP_VUE_SOURCES_DIR}/dist/bootstrap-vue.min.js - ${BOOTSTRAP_VUE_SOURCES_DIR}/dist/bootstrap-vue.min.js.map ${CMAKE_CURRENT_BINARY_DIR}/axios-0.19.0/dist/axios.min.js ${CMAKE_CURRENT_BINARY_DIR}/axios-0.19.0/dist/axios.min.map ${CMAKE_CURRENT_BINARY_DIR}/bootstrap-4.3.1/dist/js/bootstrap.min.js @@ -157,8 +89,6 @@ ) file(COPY - ${BOOTSTRAP_VUE_SOURCES_DIR}/dist/bootstrap-vue.min.css - ${BOOTSTRAP_VUE_SOURCES_DIR}/dist/bootstrap-vue.min.css.map ${CMAKE_CURRENT_BINARY_DIR}/Font-Awesome-4.7.0/css/font-awesome.min.css ${CMAKE_CURRENT_BINARY_DIR}/bootstrap-4.3.1/dist/css/bootstrap.min.css ${CMAKE_CURRENT_BINARY_DIR}/bootstrap-4.3.1/dist/css/bootstrap.min.css.map diff -r ec0f264beac9 -r 900e29a3d936 WebApplication/index.html --- a/WebApplication/index.html Tue Dec 17 12:38:37 2024 +0100 +++ b/WebApplication/index.html Tue Dec 17 12:49:13 2024 +0100 @@ -189,14 +189,14 @@ Tag Description - Value + Value - {{'Tag' in s ? s.Tag : ''}} - {{'Name' in s ? s.Name : ''}} - {{'Value' in s ? s.Value : ''}} + {{'Tag' in s ? s.Tag : ''}} + {{'Name' in s ? s.Name : ''}} + {{'Value' in s ? s.Value : ''}} @@ -313,14 +313,14 @@ Tag Description - Value + Value - {{'Tag' in s ? s.Tag : ''}} - {{'Name' in s ? s.Name : ''}} - {{'Value' in s ? s.Value : ''}} + {{'Tag' in s ? s.Tag : ''}} + {{'Name' in s ? s.Name : ''}} + {{'Value' in s ? s.Value : ''}}