[med-svn] [Git][med-team/orthanc-webviewer][upstream] New upstream version 2.5
Sebastien Jodogne
gitlab at salsa.debian.org
Wed Feb 27 20:46:55 GMT 2019
Sebastien Jodogne pushed to branch upstream at Debian Med / orthanc-webviewer
Commits:
0e53b56f by jodogne-guest at 2019-02-27T20:21:13Z
New upstream version 2.5
- - - - -
27 changed files:
- .hg_archival.txt
- AUTHORS
- CMakeLists.txt
- NEWS
- Plugin/Cache/CacheIndex.h
- Plugin/Cache/CacheManager.cpp
- Plugin/Cache/CacheManager.h
- Plugin/Cache/CacheScheduler.cpp
- Plugin/Cache/CacheScheduler.h
- Plugin/Cache/ICacheFactory.h
- Plugin/Cache/IPrefetchPolicy.h
- Plugin/DecodedImageAdapter.cpp
- Plugin/DecodedImageAdapter.h
- Plugin/Plugin.cpp
- Plugin/SeriesInformationAdapter.cpp
- Plugin/SeriesInformationAdapter.h
- Plugin/ViewerPrefetchPolicy.cpp
- Plugin/ViewerPrefetchPolicy.h
- Plugin/ViewerToolbox.cpp
- Plugin/ViewerToolbox.h
- README
- Resources/CMake/GdcmConfiguration.cmake
- Resources/CMake/JavaScriptLibraries.cmake
- Resources/Orthanc/DownloadOrthancFramework.cmake
- Resources/Orthanc/LinuxStandardBaseToolchain.cmake
- UnitTestsSources/UnitTestsMain.cpp
- WebApplication/viewer.js
Changes:
=====================================
.hg_archival.txt
=====================================
@@ -1,6 +1,6 @@
repo: 02f7a0400a911dee22d2e761b21b6cab67ede076
-node: 21df474deeb16a56724c0bb3758e56f95e3eff9c
-branch: OrthancWebViewer-2.4
+node: 0a8ed9da08696903df46390e537ffb8e017a1531
+branch: OrthancWebViewer-2.5
latesttag: null
-latesttagdistance: 196
-changessincelatesttag: 200
+latesttagdistance: 211
+changessincelatesttag: 215
=====================================
AUTHORS
=====================================
@@ -5,7 +5,7 @@ Web Viewer plugin for Orthanc
Authors
-------
-* Sebastien Jodogne <s.jodogne at gmail.com>
+* Sebastien Jodogne <s.jodogne at orthanc-labs.com>
Overall design and lead developer.
=====================================
CMakeLists.txt
=====================================
@@ -1,7 +1,7 @@
# Orthanc - A Lightweight, RESTful DICOM Store
# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
# Department, University Hospital of Liege, Belgium
-# Copyright (C) 2017-2018 Osimis S.A., Belgium
+# Copyright (C) 2017-2019 Osimis S.A., Belgium
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU Affero General Public License
@@ -21,13 +21,13 @@ cmake_minimum_required(VERSION 2.8)
project(OrthancWebViewer)
-set(ORTHANC_WEBVIEWER_VERSION "2.4")
+set(ORTHANC_PLUGIN_VERSION "2.5")
-if (ORTHANC_WEBVIEWER_VERSION STREQUAL "mainline")
+if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
set(ORTHANC_FRAMEWORK_VERSION "mainline")
set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
else()
- set(ORTHANC_FRAMEWORK_VERSION "1.3.2")
+ set(ORTHANC_FRAMEWORK_VERSION "1.5.5")
set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
endif()
@@ -88,6 +88,10 @@ else()
)
endif()
+add_definitions(
+ -DORTHANC_ENABLE_LOGGING_PLUGIN=1
+ )
+
EmbedResources(
ORTHANC_EXPLORER ${CMAKE_SOURCE_DIR}/Resources/OrthancExplorer.js
JAVASCRIPT_LIBS ${JAVASCRIPT_LIBS_DIR}
@@ -104,7 +108,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
execute_process(
COMMAND
${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py
- ${ORTHANC_WEBVIEWER_VERSION} "OrthancWebViewer" OrthancWebViewer.dll "Web viewer of medical images for Orthanc"
+ ${ORTHANC_PLUGIN_VERSION} "OrthancWebViewer" OrthancWebViewer.dll "Web viewer of medical images for Orthanc"
ERROR_VARIABLE Failure
OUTPUT_FILE ${AUTOGENERATED_DIR}/Version.rc
)
@@ -152,13 +156,13 @@ endif()
target_link_libraries(OrthancWebViewer ${GDCM_LIBRARIES})
-message("Setting the version of the library to ${ORTHANC_WEBVIEWER_VERSION}")
+message("Setting the version of the library to ${ORTHANC_PLUGIN_VERSION}")
-add_definitions(-DORTHANC_WEBVIEWER_VERSION="${ORTHANC_WEBVIEWER_VERSION}")
+add_definitions(-DORTHANC_PLUGIN_VERSION="${ORTHANC_PLUGIN_VERSION}")
set_target_properties(OrthancWebViewer PROPERTIES
- VERSION ${ORTHANC_WEBVIEWER_VERSION}
- SOVERSION ${ORTHANC_WEBVIEWER_VERSION})
+ VERSION ${ORTHANC_PLUGIN_VERSION}
+ SOVERSION ${ORTHANC_PLUGIN_VERSION})
install(
TARGETS OrthancWebViewer
=====================================
NEWS
=====================================
@@ -2,6 +2,13 @@ Pending changes in the mainline
===============================
+Version 2.5 (2019-02-27)
+========================
+
+* Upgrade to GDCM 2.8.8 for static builds
+* Upgraded Orthanc framework
+
+
Version 2.4 (2018-04-23)
========================
=====================================
Plugin/Cache/CacheIndex.h
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
@@ -33,6 +33,8 @@ namespace OrthancPlugins
int bundle_;
std::string item_;
+ void operator= (const CacheIndex&); // Forbidden
+
public:
CacheIndex(const CacheIndex& other) :
bundle_(other.bundle_),
=====================================
Plugin/Cache/CacheManager.cpp
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
Plugin/Cache/CacheManager.h
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
Plugin/Cache/CacheScheduler.cpp
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
Plugin/Cache/CacheScheduler.h
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
Plugin/Cache/ICacheFactory.h
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
Plugin/Cache/IPrefetchPolicy.h
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
Plugin/DecodedImageAdapter.cpp
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
@@ -323,14 +323,14 @@ namespace OrthancPlugins
switch (accessor.GetFormat())
{
case Orthanc::PixelFormat_RGB24:
- converted = accessor;
+ accessor.GetReadOnlyAccessor(converted);
break;
case Orthanc::PixelFormat_RGB48:
buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_RGB24,
accessor.GetWidth(),
accessor.GetHeight(), false));
- converted = buffer->GetAccessor();
+ buffer->GetWriteableAccessor(converted);
ConvertRGB48ToRGB24(converted, accessor);
break;
@@ -340,12 +340,12 @@ namespace OrthancPlugins
accessor.GetWidth(),
accessor.GetHeight(),
true /* force minimal pitch */));
- converted = buffer->GetAccessor();
+ buffer->GetWriteableAccessor(converted);
Orthanc::ImageProcessing::Convert(converted, accessor);
break;
case Orthanc::PixelFormat_SignedGrayscale16:
- converted = accessor;
+ accessor.GetReadOnlyAccessor(converted);
break;
default:
@@ -434,7 +434,7 @@ namespace OrthancPlugins
accessor.GetFormat() == Orthanc::PixelFormat_RGB24)
{
result["Orthanc"]["Stretched"] = false;
- converted = accessor;
+ accessor.GetReadOnlyAccessor(converted);
}
else if (accessor.GetFormat() == Orthanc::PixelFormat_RGB48)
{
@@ -443,7 +443,8 @@ namespace OrthancPlugins
buffer.reset(new Orthanc::ImageBuffer(Orthanc::PixelFormat_RGB24,
accessor.GetWidth(),
accessor.GetHeight(), false));
- converted = buffer->GetAccessor();
+ buffer->GetWriteableAccessor(converted);
+
ConvertRGB48ToRGB24(converted, accessor);
}
else if (accessor.GetFormat() == Orthanc::PixelFormat_Grayscale16 ||
@@ -455,7 +456,7 @@ namespace OrthancPlugins
accessor.GetWidth(),
accessor.GetHeight(),
true /* force minimal pitch */));
- converted = buffer->GetAccessor();
+ buffer->GetWriteableAccessor(converted);
int64_t a, b;
Orthanc::ImageProcessing::GetMinMaxIntegerValue(a, b, accessor);
=====================================
Plugin/DecodedImageAdapter.h
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
Plugin/Plugin.cpp
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
@@ -435,7 +435,7 @@ static OrthancPluginErrorCode DecodeImageCallback(OrthancPluginImage** target,
*target = NULL;
std::string s = "Cannot decode image using GDCM: " + std::string(e.What());
- OrthancPluginLogError(context_, s.c_str());
+ OrthancPluginLogWarning(context_, s.c_str());
return OrthancPluginErrorCode_Plugin;
}
catch (std::runtime_error& e)
@@ -443,7 +443,7 @@ static OrthancPluginErrorCode DecodeImageCallback(OrthancPluginImage** target,
*target = NULL;
std::string s = "Cannot decode image using GDCM: " + std::string(e.what());
- OrthancPluginLogError(context_, s.c_str());
+ OrthancPluginLogWarning(context_, s.c_str());
return OrthancPluginErrorCode_Plugin;
}
}
@@ -614,10 +614,10 @@ extern "C"
}
if (!scheduler.LookupProperty(webViewerVersion, CacheProperty_WebViewerVersion) ||
- webViewerVersion != std::string(ORTHANC_WEBVIEWER_VERSION))
+ webViewerVersion != std::string(ORTHANC_PLUGIN_VERSION))
{
std::string s = ("The version of the Web viewer plugin has changed from \"" + webViewerVersion + "\" to \"" +
- std::string(ORTHANC_WEBVIEWER_VERSION) + "\": The cache of the Web viewer will be cleared");
+ std::string(ORTHANC_PLUGIN_VERSION) + "\": The cache of the Web viewer will be cleared");
OrthancPluginLogWarning(context_, s.c_str());
clear = true;
}
@@ -629,7 +629,7 @@ extern "C"
OrthancPluginLogWarning(context_, "Clearing the cache of the Web viewer");
scheduler.Clear();
scheduler.SetProperty(CacheProperty_OrthancVersion, context_->orthancVersion);
- scheduler.SetProperty(CacheProperty_WebViewerVersion, ORTHANC_WEBVIEWER_VERSION);
+ scheduler.SetProperty(CacheProperty_WebViewerVersion, ORTHANC_PLUGIN_VERSION);
}
else
{
@@ -729,6 +729,6 @@ extern "C"
ORTHANC_PLUGINS_API const char* OrthancPluginGetVersion()
{
- return ORTHANC_WEBVIEWER_VERSION;
+ return ORTHANC_PLUGIN_VERSION;
}
}
=====================================
Plugin/SeriesInformationAdapter.cpp
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
Plugin/SeriesInformationAdapter.h
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
Plugin/ViewerPrefetchPolicy.cpp
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
Plugin/ViewerPrefetchPolicy.h
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
Plugin/ViewerToolbox.cpp
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
@@ -383,16 +383,12 @@ namespace OrthancPlugins
}
- Orthanc::ImageAccessor ImageReader::GetAccessor() const
+ void ImageReader::GetAccessor(Orthanc::ImageAccessor& target) const
{
- Orthanc::ImageAccessor accessor;
-
- accessor.AssignReadOnly(Convert(OrthancPluginGetImagePixelFormat(context_, image_)),
- OrthancPluginGetImageWidth(context_, image_),
- OrthancPluginGetImageHeight(context_, image_),
- OrthancPluginGetImagePitch(context_, image_),
- OrthancPluginGetImageBuffer(context_, image_));
-
- return accessor;
+ target.AssignReadOnly(Convert(OrthancPluginGetImagePixelFormat(context_, image_)),
+ OrthancPluginGetImageWidth(context_, image_),
+ OrthancPluginGetImageHeight(context_, image_),
+ OrthancPluginGetImagePitch(context_, image_),
+ OrthancPluginGetImageBuffer(context_, image_));
}
}
=====================================
Plugin/ViewerToolbox.h
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
@@ -90,6 +90,6 @@ namespace OrthancPlugins
~ImageReader();
- Orthanc::ImageAccessor GetAccessor() const;
+ void GetAccessor(Orthanc::ImageAccessor& target) const;
};
}
=====================================
README
=====================================
@@ -28,7 +28,7 @@ Installation and usage
----------------------
Build and usage instructions are available in the Orthanc Book:
-https://orthanc.chu.ulg.ac.be/book/plugins/webviewer.html
+http://book.orthanc-server.com/plugins/webviewer.html
Licensing
@@ -42,14 +42,17 @@ Similarly, we ask open-source and closed-source products that make
use of Orthanc to warn us about this use. You can cite our work
using the following BibTeX entry:
- at inproceedings{Jodogne:ISBI2013,
- author = {Jodogne, S. and Bernard, C. and Devillers, M. and Lenaerts, E. and Coucke, P.},
- title = {Orthanc -- {A} Lightweight, {REST}ful {DICOM} Server for Healthcare and Medical Research},
- booktitle={Biomedical Imaging ({ISBI}), {IEEE} 10th International Symposium on},
- year={2013},
- pages={190-193},
- ISSN={1945-7928},
- month=apr,
- url={http://ieeexplore.ieee.org/xpl/articleDetails.jsp?tp=&arnumber=6556444},
- address={San Francisco, {CA}, {USA}}
+ at Article{Jodogne2018,
+ author="Jodogne, S{\'e}bastien",
+ title="The {O}rthanc Ecosystem for Medical Imaging",
+ journal="Journal of Digital Imaging",
+ year="2018",
+ month="Jun",
+ day="01",
+ volume="31",
+ number="3",
+ pages="341--352",
+ issn="1618-727X",
+ doi="10.1007/s10278-018-0082-y",
+ url="https://doi.org/10.1007/s10278-018-0082-y"
}
=====================================
Resources/CMake/GdcmConfiguration.cmake
=====================================
@@ -1,7 +1,7 @@
# Orthanc - A Lightweight, RESTful DICOM Store
# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
# Department, University Hospital of Liege, Belgium
-# Copyright (C) 2017-2018 Osimis S.A., Belgium
+# Copyright (C) 2017-2019 Osimis S.A., Belgium
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU Affero General Public License
@@ -75,8 +75,8 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM)
include(ExternalProject)
externalproject_add(GDCM
- URL "http://www.orthanc-server.com/downloads/third-party/gdcm-2.8.4.tar.gz"
- URL_MD5 "ce957b0bc1be4e8019162a10ca15432f"
+ URL "http://orthanc.osimis.io/ThirdPartyDownloads/gdcm-2.8.8.tar.gz"
+ URL_MD5 "740c22b787a8e47e4d748c167e450d8f"
TIMEOUT 60
CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} ${Flags}
${BUILD_COMMAND} # Customize "make", only for Linux Standard Base (*)
=====================================
Resources/CMake/JavaScriptLibraries.cmake
=====================================
@@ -1,7 +1,7 @@
# Orthanc - A Lightweight, RESTful DICOM Store
# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
# Department, University Hospital of Liege, Belgium
-# Copyright (C) 2017-2018 Osimis S.A., Belgium
+# Copyright (C) 2017-2019 Osimis S.A., Belgium
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU Affero General Public License
@@ -17,32 +17,32 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-set(BASE_URL "http://www.orthanc-server.com/downloads/third-party/WebViewer")
+set(BASE_URL "http://orthanc.osimis.io/ThirdPartyDownloads/web-viewer")
DownloadPackage(
"dbf236ede85e7b7871c9a42edad16d81"
"${BASE_URL}/cornerstone-0.11.0.zip"
- "cornerstone-0.11.0")
+ "${CMAKE_CURRENT_BINARY_DIR}/cornerstone-0.11.0")
DownloadPackage(
"cb943ac26be9ee755e8741ea232389e2"
"${BASE_URL}/jquery-ui-1.11.3.zip"
- "jquery-ui-1.11.3")
+ "${CMAKE_CURRENT_BINARY_DIR}/jquery-ui-1.11.3")
DownloadPackage(
"169c56338f9ff812cae3e91ef72bda2e"
"${BASE_URL}/jsPanel-2.3.3-fixed.zip"
- "jspanel")
+ "${CMAKE_CURRENT_BINARY_DIR}/jspanel")
DownloadPackage(
"8392ad105d913c3a83a7787c8f148055"
"${BASE_URL}/pako-0.2.5.zip"
- "pako-0.2.5")
+ "${CMAKE_CURRENT_BINARY_DIR}/pako-0.2.5")
DownloadPackage(
"7ebea0b624cd62445a124d264dfa2a53"
"${BASE_URL}/js-url-1.8.6.zip"
- "js-url-1.8.6")
+ "${CMAKE_CURRENT_BINARY_DIR}/js-url-1.8.6")
set(JAVASCRIPT_LIBS_DIR ${CMAKE_CURRENT_BINARY_DIR}/javascript-libs)
=====================================
Resources/Orthanc/DownloadOrthancFramework.cmake
=====================================
@@ -1,7 +1,7 @@
# Orthanc - A Lightweight, RESTful DICOM Store
# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
# Department, University Hospital of Liege, Belgium
-# Copyright (C) 2017-2018 Osimis S.A., Belgium
+# Copyright (C) 2017-2019 Osimis S.A., Belgium
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -63,27 +63,47 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "hg" OR
set(ORTHANC_FRAMEWORK_MD5 "")
- if (ORTHANC_FRAMEWORK_VERSION STREQUAL "mainline")
- set(ORTHANC_FRAMEWORK_BRANCH "default")
+ if (NOT DEFINED ORTHANC_FRAMEWORK_BRANCH)
+ if (ORTHANC_FRAMEWORK_VERSION STREQUAL "mainline")
+ set(ORTHANC_FRAMEWORK_BRANCH "default")
- else()
- set(ORTHANC_FRAMEWORK_BRANCH "Orthanc-${ORTHANC_FRAMEWORK_VERSION}")
+ else()
+ set(ORTHANC_FRAMEWORK_BRANCH "Orthanc-${ORTHANC_FRAMEWORK_VERSION}")
- set(RE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$")
- string(REGEX REPLACE ${RE} "\\1" ORTHANC_FRAMEWORK_MAJOR ${ORTHANC_FRAMEWORK_VERSION})
- string(REGEX REPLACE ${RE} "\\2" ORTHANC_FRAMEWORK_MINOR ${ORTHANC_FRAMEWORK_VERSION})
- string(REGEX REPLACE ${RE} "\\3" ORTHANC_FRAMEWORK_REVISION ${ORTHANC_FRAMEWORK_VERSION})
+ set(RE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$")
+ string(REGEX REPLACE ${RE} "\\1" ORTHANC_FRAMEWORK_MAJOR ${ORTHANC_FRAMEWORK_VERSION})
+ string(REGEX REPLACE ${RE} "\\2" ORTHANC_FRAMEWORK_MINOR ${ORTHANC_FRAMEWORK_VERSION})
+ string(REGEX REPLACE ${RE} "\\3" ORTHANC_FRAMEWORK_REVISION ${ORTHANC_FRAMEWORK_VERSION})
- if (NOT ORTHANC_FRAMEWORK_MAJOR MATCHES "^[0-9]+$" OR
- NOT ORTHANC_FRAMEWORK_MINOR MATCHES "^[0-9]+$" OR
- NOT ORTHANC_FRAMEWORK_REVISION MATCHES "^[0-9]+$")
- message("Bad version of the Orthanc framework: ${ORTHANC_FRAMEWORK_VERSION}")
- endif()
+ if (NOT ORTHANC_FRAMEWORK_MAJOR MATCHES "^[0-9]+$" OR
+ NOT ORTHANC_FRAMEWORK_MINOR MATCHES "^[0-9]+$" OR
+ NOT ORTHANC_FRAMEWORK_REVISION MATCHES "^[0-9]+$")
+ message("Bad version of the Orthanc framework: ${ORTHANC_FRAMEWORK_VERSION}")
+ endif()
- if (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.3.1")
- set(ORTHANC_FRAMEWORK_MD5 "dac95bd6cf86fb19deaf4e612961f378")
- elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.3.2")
- set(ORTHANC_FRAMEWORK_MD5 "d0ccdf68e855d8224331f13774992750")
+ if (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.3.1")
+ set(ORTHANC_FRAMEWORK_MD5 "dac95bd6cf86fb19deaf4e612961f378")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.3.2")
+ set(ORTHANC_FRAMEWORK_MD5 "d0ccdf68e855d8224331f13774992750")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.4.0")
+ set(ORTHANC_FRAMEWORK_MD5 "81e15f34d97ac32bbd7d26e85698835a")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.4.1")
+ set(ORTHANC_FRAMEWORK_MD5 "9b6f6114264b17ed421b574cd6476127")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.4.2")
+ set(ORTHANC_FRAMEWORK_MD5 "d1ee84927dcf668e60eb5868d24b9394")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.0")
+ set(ORTHANC_FRAMEWORK_MD5 "4429d8d9dea4ff6648df80ec3c64d79e")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.1")
+ set(ORTHANC_FRAMEWORK_MD5 "099671538865e5da96208b37494d6718")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.2")
+ set(ORTHANC_FRAMEWORK_MD5 "8867050f3e9a1ce6157c1ea7a9433b1b")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.3")
+ set(ORTHANC_FRAMEWORK_MD5 "bf2f5ed1adb8b0fc5f10d278e68e1dfe")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.4")
+ set(ORTHANC_FRAMEWORK_MD5 "404baef5d4c43e7c5d9410edda8ef5a5")
+ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.5")
+ set(ORTHANC_FRAMEWORK_MD5 "cfc437e0687ae4bd725fd93dc1f08bc4")
+ endif()
endif()
endif()
endif()
@@ -217,8 +237,7 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "web")
else()
# Default case: Download from the official Web site
set(ORTHANC_FRAMEMORK_FILENAME Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz)
- #set(ORTHANC_FRAMEWORK_URL "http://www.orthanc-server.com/downloads/get.php?path=/orthanc/${ORTHANC_FRAMEMORK_FILENAME}")
- set(ORTHANC_FRAMEWORK_URL "http://www.orthanc-server.com/downloads/third-party/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}")
+ set(ORTHANC_FRAMEWORK_URL "http://orthanc.osimis.io/ThirdPartyDownloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}")
endif()
set(ORTHANC_FRAMEWORK_ARCHIVE "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${ORTHANC_FRAMEMORK_FILENAME}")
=====================================
Resources/Orthanc/LinuxStandardBaseToolchain.cmake
=====================================
@@ -1,4 +1,4 @@
-# LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON
+# LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu
INCLUDE(CMakeForceCompiler)
=====================================
UnitTestsSources/UnitTestsMain.cpp
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
=====================================
WebApplication/viewer.js
=====================================
@@ -2,7 +2,7 @@
* Orthanc - A Lightweight, RESTful DICOM Store
* Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
* Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/commit/0e53b56f4609ab50ca7f84bea6aa31044e030bb6
--
View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/commit/0e53b56f4609ab50ca7f84bea6aa31044e030bb6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190227/1f1ebebd/attachment-0001.html>
More information about the debian-med-commit
mailing list