# HG changeset patch # User Sebastien Jodogne # Date 1718463692 -7200 # Node ID 88e98907b14094905ad69330321c5f1c1927206f # Parent 6a891818bad5baaeebd37ecffb8d6071250e43e4 provide a way to go back to Nexus viewer 4.2 diff -r 6a891818bad5 -r 88e98907b140 .reuse/dep5 --- a/.reuse/dep5 Sat Jun 15 16:51:42 2024 +0200 +++ b/.reuse/dep5 Sat Jun 15 17:01:32 2024 +0200 @@ -7,8 +7,8 @@ NEWS README Resources/CMake/3dhop-4.3.patch - Resources/CMake/nexus-viewer-4.2.patch - Resources/CMake/nexus-viewer-4.3.patch + Resources/CMake/NexusViewer-4.2.patch + Resources/CMake/NexusViewer-4.3.patch Resources/CreateThreeDist.txt Resources/Nexus.txt WebApplications/o3dv.html diff -r 6a891818bad5 -r 88e98907b140 CMakeLists.txt --- a/CMakeLists.txt Sat Jun 15 16:51:42 2024 +0200 +++ b/CMakeLists.txt Sat Jun 15 17:01:32 2024 +0200 @@ -198,7 +198,8 @@ list(APPEND STATIC_ASSETS_CONTENT "${CMAKE_SOURCE_DIR}/JavaScriptLibraries/dist-three") if (ENABLE_NEXUS) - include(${CMAKE_SOURCE_DIR}/Resources/CMake/NexusViewer.cmake) + #include(${CMAKE_SOURCE_DIR}/Resources/CMake/NexusViewer-4.2.cmake) + include(${CMAKE_SOURCE_DIR}/Resources/CMake/NexusViewer-4.3.cmake) list(APPEND STATIC_ASSETS_PREFIXES "nexus") list(APPEND STATIC_ASSETS_CONTENT ${NEXUS_VIEWER_DIR}) diff -r 6a891818bad5 -r 88e98907b140 Resources/CMake/NexusViewer-4.2.cmake --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/CMake/NexusViewer-4.2.cmake Sat Jun 15 17:01:32 2024 +0200 @@ -0,0 +1,50 @@ +# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-License-Identifier: GPL-3.0-or-later + + +# STL plugin for Orthanc +# Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +DownloadPackage( + "6069b141edb7ce1d543b53ddaa4b41d1" + "https://orthanc.uclouvain.be/downloads/third-party-downloads/STL/nexus-4.2.zip" + "${CMAKE_BINARY_DIR}/nexus-4.2") + +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 + DESTINATION + ${NEXUS_VIEWER_DIR} + ) + +execute_process( + COMMAND ${PATCH_EXECUTABLE} -p0 -N -i + ${CMAKE_CURRENT_LIST_DIR}/NexusViewer-4.2.patch + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + RESULT_VARIABLE Failure + ) + +list(APPEND STATIC_ASSETS_PREFIXES "nexus") +list(APPEND STATIC_ASSETS_CONTENT ${NEXUS_VIEWER_DIR}) diff -r 6a891818bad5 -r 88e98907b140 Resources/CMake/NexusViewer-4.2.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/CMake/NexusViewer-4.2.patch Sat Jun 15 17:01:32 2024 +0200 @@ -0,0 +1,12 @@ +diff -urEb nexus.orig/threejs.html nexus/threejs.html +--- nexus.orig/threejs.html 2024-06-15 16:27:10.763574203 +0200 ++++ nexus/threejs.html 2024-06-15 16:28:03.807136118 +0200 +@@ -5,7 +5,7 @@ + + + +- ++ + + + diff -r 6a891818bad5 -r 88e98907b140 Resources/CMake/NexusViewer-4.3.cmake --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/CMake/NexusViewer-4.3.cmake Sat Jun 15 17:01:32 2024 +0200 @@ -0,0 +1,45 @@ +# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# SPDX-License-Identifier: GPL-3.0-or-later + + +# STL plugin for Orthanc +# Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +DownloadPackage( + "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}) + +file(COPY + ${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}/NexusViewer-4.3.patch + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + RESULT_VARIABLE Failure + ) + +list(APPEND STATIC_ASSETS_PREFIXES "nexus") +list(APPEND STATIC_ASSETS_CONTENT ${NEXUS_VIEWER_DIR}) diff -r 6a891818bad5 -r 88e98907b140 Resources/CMake/NexusViewer-4.3.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/CMake/NexusViewer-4.3.patch Sat Jun 15 17:01:32 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 @@ + Nexus threejs + + +- ++ + + + diff -r 6a891818bad5 -r 88e98907b140 Resources/CMake/NexusViewer.cmake --- a/Resources/CMake/NexusViewer.cmake Sat Jun 15 16:51:42 2024 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -# SPDX-FileCopyrightText: 2023-2024 Sebastien Jodogne, UCLouvain, Belgium -# SPDX-License-Identifier: GPL-3.0-or-later - - -# STL plugin for Orthanc -# Copyright (C) 2023-2024 Sebastien Jodogne, UCLouvain, Belgium -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -DownloadPackage( - "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}) - -file(COPY - ${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.3.patch - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE Failure - ) - -list(APPEND STATIC_ASSETS_PREFIXES "nexus") -list(APPEND STATIC_ASSETS_CONTENT ${NEXUS_VIEWER_DIR}) diff -r 6a891818bad5 -r 88e98907b140 Resources/CMake/nexus-viewer-4.2.patch --- a/Resources/CMake/nexus-viewer-4.2.patch Sat Jun 15 16:51:42 2024 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -urEb nexus.orig/threejs.html nexus/threejs.html ---- nexus.orig/threejs.html 2024-06-15 16:27:10.763574203 +0200 -+++ nexus/threejs.html 2024-06-15 16:28:03.807136118 +0200 -@@ -5,7 +5,7 @@ - - - -- -+ - - - diff -r 6a891818bad5 -r 88e98907b140 Resources/CMake/nexus-viewer-4.3.patch --- a/Resources/CMake/nexus-viewer-4.3.patch Sat Jun 15 16:51:42 2024 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -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 @@ - Nexus threejs - - -- -+ - - -