changeset 161:4ac039ed55bd

Upgrade to Cornerstone 0.11.0
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 15 Jun 2017 17:43:34 +0200
parents b0910ae2ace5
children f17ecfffdc75
files NEWS Resources/CMake/JavaScriptLibraries.cmake WebApplication/viewer.html
diffstat 3 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Fri Jun 09 16:13:05 2017 +0200
+++ b/NEWS	Thu Jun 15 17:43:34 2017 +0200
@@ -1,6 +1,7 @@
 Pending changes in the mainline
 ===============================
 
+* Upgrade to Cornerstone 0.11.0
 * Performance warning if runtime debug assertions are turned on
 * Fix issue 44 (Bad interpretation of photometric interpretation MONOCHROME1)
 
--- a/Resources/CMake/JavaScriptLibraries.cmake	Fri Jun 09 16:13:05 2017 +0200
+++ b/Resources/CMake/JavaScriptLibraries.cmake	Thu Jun 15 17:43:34 2017 +0200
@@ -20,9 +20,9 @@
 set(BASE_URL "http://www.orthanc-server.com/downloads/third-party/WebViewer")
 
 DownloadPackage(
-  "3335b0a3ee2bde780777d648cccefe55"
-  "${BASE_URL}/cornerstone-0.8.4.zip"
-  "cornerstone-0.8.4")
+  "dbf236ede85e7b7871c9a42edad16d81"
+  "${BASE_URL}/cornerstone-0.11.0.zip"
+  "cornerstone-0.11.0")
 
 DownloadPackage(
   "cb943ac26be9ee755e8741ea232389e2"
@@ -49,8 +49,8 @@
 file(MAKE_DIRECTORY ${JAVASCRIPT_LIBS_DIR})
 
 file(COPY
-  ${CMAKE_CURRENT_BINARY_DIR}/cornerstone-0.8.4/dist/cornerstone.min.css
-  ${CMAKE_CURRENT_BINARY_DIR}/cornerstone-0.8.4/dist/cornerstone.min.js
+  ${CMAKE_CURRENT_BINARY_DIR}/cornerstone-0.11.0/example/cornerstone.css
+  ${CMAKE_CURRENT_BINARY_DIR}/cornerstone-0.11.0/dist/cornerstone.min.js
   ${CMAKE_CURRENT_BINARY_DIR}/jquery-ui-1.11.3/external/jquery/jquery.js
   ${CMAKE_CURRENT_BINARY_DIR}/jquery-ui-1.11.3/images
   ${CMAKE_CURRENT_BINARY_DIR}/jquery-ui-1.11.3/jquery-ui.min.css
--- a/WebApplication/viewer.html	Fri Jun 09 16:13:05 2017 +0200
+++ b/WebApplication/viewer.html	Thu Jun 15 17:43:34 2017 +0200
@@ -6,7 +6,7 @@
     <title>Orthanc Web Viewer</title>
     <link href="../libs/jquery-ui.min.css" rel="stylesheet" />
     <link href="../libs/jquery-ui.theme.min.css" rel="stylesheet" />
-    <link href="../libs/cornerstone.min.css" rel="stylesheet" />
+    <link href="../libs/cornerstone.css" rel="stylesheet" />
     <link href="../libs/jquery.jspanel.min.css" rel="stylesheet" />
     <link href="viewer.css" rel="stylesheet" />
   </head>