Mercurial > hg > orthanc-stl
changeset 65:6a891818bad5
upgraded Nexus viewer to version 4.3
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sat, 15 Jun 2024 16:51:42 +0200 |
| parents | 5e11f5880e6d |
| children | 88e98907b140 |
| files | .reuse/dep5 LICENSES/MIT.txt NEWS Resources/CMake/NexusViewer.cmake Resources/CMake/nexus-viewer-4.3.patch Sources/OrthancExplorer.js |
| diffstat | 6 files changed, 30 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/.reuse/dep5 Sat Jun 15 16:35:21 2024 +0200 +++ b/.reuse/dep5 Sat Jun 15 16:51:42 2024 +0200 @@ -3,7 +3,16 @@ Upstream-Contact: Sebastien Jodogne <s.jodogne@gmail.com> Source: https://orthanc.uclouvain.be/ -Files: NEWS README WebApplications/o3dv.html WebApplications/three.html Resources/CreateThreeDist.txt Resources/Nexus.txt Resources/CMake/3dhop-4.3.patch +Files: + NEWS + README + Resources/CMake/3dhop-4.3.patch + Resources/CMake/nexus-viewer-4.2.patch + Resources/CMake/nexus-viewer-4.3.patch + Resources/CreateThreeDist.txt + Resources/Nexus.txt + WebApplications/o3dv.html + WebApplications/three.html Copyright: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium License: GPL-3.0-or-later @@ -18,7 +27,3 @@ Files: Resources/Orthanc/Sdk-1.2.0/orthanc/OrthancCPlugin.h Copyright: 2012-2016 Sebastien Jodogne <s.jodogne@gmail.com>, University Hospital of Liege (Belgium) License: GPL-3.0-or-later - -Files: Resources/Nexus/* -Copyright: 2012-2018, Visual Computing Lab, ISTI - CNR -License: MIT
--- a/LICENSES/MIT.txt Sat Jun 15 16:35:21 2024 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -MIT License - -Copyright (c) <year> <copyright holders> - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/NEWS Sat Jun 15 16:35:21 2024 +0200 +++ b/NEWS Sat Jun 15 16:51:42 2024 +0200 @@ -2,6 +2,7 @@ =============================== * Added 3DHOP viewer (version 4.3) for Nexus models +* Upgraded Nexus viewer to version 4.3 (Nexus 2020) Version 1.1 (2024-05-22)
--- a/Resources/CMake/NexusViewer.cmake Sat Jun 15 16:35:21 2024 +0200 +++ b/Resources/CMake/NexusViewer.cmake Sat Jun 15 16:51:42 2024 +0200 @@ -20,28 +20,23 @@ DownloadPackage( - "6069b141edb7ce1d543b53ddaa4b41d1" - "https://orthanc.uclouvain.be/downloads/third-party-downloads/STL/nexus-4.2.zip" - "${CMAKE_BINARY_DIR}/nexus-4.2") + "bf61d139b592eb5b724f0f8a3f53bb04" + "https://orthanc.uclouvain.be/downloads/third-party-downloads/STL/nexus-4.3.zip" + "${CMAKE_BINARY_DIR}/nexus-4.3") set(NEXUS_VIEWER_DIR ${CMAKE_CURRENT_BINARY_DIR}/nexus) file(MAKE_DIRECTORY ${NEXUS_VIEWER_DIR}) -DownloadCompressedFile( - "df21a4a192c0952a1189125609cc76f9" - "https://orthanc.uclouvain.be/downloads/third-party-downloads/STL/three-84.js.gz" - "${NEXUS_VIEWER_DIR}/three-84.js") - file(COPY - ${CMAKE_BINARY_DIR}/nexus-4.2/html/js - ${CMAKE_BINARY_DIR}/nexus-4.2/html/threejs.html + ${CMAKE_BINARY_DIR}/nexus-4.3/html/js + ${CMAKE_BINARY_DIR}/nexus-4.3/html/threejs.html DESTINATION ${NEXUS_VIEWER_DIR} ) execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${CMAKE_CURRENT_LIST_DIR}/nexus-viewer-4.2.patch + ${CMAKE_CURRENT_LIST_DIR}/nexus-viewer-4.3.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/CMake/nexus-viewer-4.3.patch Sat Jun 15 16:51:42 2024 +0200 @@ -0,0 +1,12 @@ +diff -urEb nexus.orig/threejs.html nexus/threejs.html +--- nexus.orig/threejs.html 2024-06-15 16:43:08.948546947 +0200 ++++ nexus/threejs.html 2024-06-15 16:43:46.232375961 +0200 +@@ -4,7 +4,7 @@ + <title>Nexus threejs</title> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"> +-<style> body { margin:0; width:100vw; height:100vh; } #container { width:100vw; height:100vh; } </style> ++<style> body { margin:0; width:100vw; height:100vh; overflow-x: hidden; overflow-y: hidden; } #container { width:100vw; height:100vh; } </style> + <script src="js/three.min.js"></script> + <script src="js/nexus.js"></script> + <script src="js/nexus_three.js"></script>
--- a/Sources/OrthancExplorer.js Sat Jun 15 16:35:21 2024 +0200 +++ b/Sources/OrthancExplorer.js Sat Jun 15 16:51:42 2024 +0200 @@ -515,7 +515,7 @@ .attr('data-divider-theme', 'd') .attr('data-role', 'listview'); - AddViewer(viewers, 'Basic Nexus viewer (version 4.2 - Nexus 2018)', function() { + AddViewer(viewers, 'Basic Nexus viewer (version 4.3 - Nexus 2020)', function() { window.open('../stl/nexus/threejs.html?model=../../instances/' + instanceId + '/nexus'); });