Skip to content
Commits on Source (6)
Show whitespace changes
Inline Side-by-side
.hg_archival.txt
View file @ 1c0b959c
repo: 3959d33612ccaadc0d4d707227fbed09ac35e5fe
node: 870d19e7ea593126b5e7994cbc870847e09843fa
branch: Orthanc-1.5.1
node: 169e0920634088ba788ac5816ec96c2b1739e1c8
branch: Orthanc-1.5.2
latesttag: dcmtk-3.6.1
latesttagdistance: 580
changessincelatesttag: 644
latesttagdistance: 660
changessincelatesttag: 768
.hgignore
View file @ 1c0b959c
......@@ -3,3 +3,4 @@ ThirdPartyDownloads/
CMakeLists.txt.user
*.cpp.orig
*.h.orig
.vs/
.travis.yml
View file @ 1c0b959c
......@@ -43,7 +43,7 @@ before_script:
- cd Build
- if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == OFF ]; then cmake
-DCMAKE_BUILD_TYPE=Debug "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog"
-DALLOW_DOWNLOADS=ON -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_MONGOOSE=OFF -DUSE_SYSTEM_JSONCPP=OFF
-DALLOW_DOWNLOADS=ON -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_CIVETWEB=OFF -DUSE_SYSTEM_JSONCPP=OFF
-DUSE_SYSTEM_GOOGLE_LOG=OFF -DUSE_SYSTEM_PUGIXML=OFF -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON
..; fi
- if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then cmake
......
AUTHORS
View file @ 1c0b959c
......@@ -5,7 +5,7 @@ Orthanc - A Lightweight, RESTful DICOM Server
Authors of Orthanc
------------------
* Sebastien Jodogne <s.jodogne@gmail.com>
* Sebastien Jodogne <s.jodogne@orthanc-labs.com>
Overall design and lead developer.
......
CMakeLists.txt
View file @ 1c0b959c
......@@ -53,7 +53,13 @@ include(${CMAKE_SOURCE_DIR}/Resources/CMake/OrthancFrameworkConfiguration.cmake)
#####################################################################
set(ORTHANC_SERVER_SOURCES
OrthancServer/DatabaseWrapper.cpp
OrthancServer/Database/Compatibility/DatabaseLookup.cpp
OrthancServer/Database/Compatibility/ICreateInstance.cpp
OrthancServer/Database/Compatibility/IGetChildrenMetadata.cpp
OrthancServer/Database/Compatibility/ILookupResources.cpp
OrthancServer/Database/Compatibility/SetOfResources.cpp
OrthancServer/Database/ResourcesContent.cpp
OrthancServer/Database/SQLiteDatabaseWrapper.cpp
OrthancServer/DicomInstanceOrigin.cpp
OrthancServer/DicomInstanceToStore.cpp
OrthancServer/ExportedResource.cpp
......@@ -71,17 +77,11 @@ set(ORTHANC_SERVER_SOURCES
OrthancServer/OrthancRestApi/OrthancRestResources.cpp
OrthancServer/OrthancRestApi/OrthancRestSystem.cpp
OrthancServer/QueryRetrieveHandler.cpp
OrthancServer/Search/DatabaseConstraint.cpp
OrthancServer/Search/DatabaseLookup.cpp
OrthancServer/Search/DicomTagConstraint.cpp
OrthancServer/Search/HierarchicalMatcher.cpp
OrthancServer/Search/IFindConstraint.cpp
OrthancServer/Search/ListConstraint.cpp
OrthancServer/Search/LookupIdentifierQuery.cpp
OrthancServer/Search/LookupResource.cpp
OrthancServer/Search/RangeConstraint.cpp
OrthancServer/Search/SetOfResources.cpp
OrthancServer/Search/ValueConstraint.cpp
OrthancServer/Search/WildcardConstraint.cpp
OrthancServer/Search/ISqlLookupFormatter.cpp
OrthancServer/ServerContext.cpp
OrthancServer/ServerEnumerations.cpp
OrthancServer/ServerIndex.cpp
......@@ -91,6 +91,7 @@ set(ORTHANC_SERVER_SOURCES
OrthancServer/ServerJobs/LuaJobManager.cpp
OrthancServer/ServerJobs/MergeStudyJob.cpp
OrthancServer/ServerJobs/Operations/DeleteResourceOperation.cpp
OrthancServer/ServerJobs/Operations/DicomInstanceOperationValue.cpp
OrthancServer/ServerJobs/Operations/ModifyInstanceOperation.cpp
OrthancServer/ServerJobs/Operations/StorePeerOperation.cpp
OrthancServer/ServerJobs/Operations/StoreScuOperation.cpp
......@@ -127,6 +128,8 @@ set(ORTHANC_UNIT_TESTS_SOURCES
if (ENABLE_PLUGINS)
include_directories(${CMAKE_SOURCE_DIR}/Plugins/Include)
list(APPEND ORTHANC_SERVER_SOURCES
Plugins/Engine/OrthancPluginDatabase.cpp
Plugins/Engine/OrthancPlugins.cpp
......@@ -168,13 +171,16 @@ endif()
#####################################################################
set(ORTHANC_EMBEDDED_FILES
PREPARE_DATABASE ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/PrepareDatabase.sql
UPGRADE_DATABASE_3_TO_4 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Upgrade3To4.sql
UPGRADE_DATABASE_4_TO_5 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Upgrade4To5.sql
CONFIGURATION_SAMPLE ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Configuration.json
DICOM_CONFORMANCE_STATEMENT ${CMAKE_CURRENT_SOURCE_DIR}/Resources/DicomConformanceStatement.txt
LUA_TOOLBOX ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Toolbox.lua
FONT_UBUNTU_MONO_BOLD_16 ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Fonts/UbuntuMonoBold-16.json
LUA_TOOLBOX ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Toolbox.lua
PREPARE_DATABASE ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/PrepareDatabase.sql
UPGRADE_DATABASE_3_TO_4 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/Upgrade3To4.sql
UPGRADE_DATABASE_4_TO_5 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/Upgrade4To5.sql
INSTALL_TRACK_ATTACHMENTS_SIZE
${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/InstallTrackAttachmentsSize.sql
)
if (STANDALONE_BUILD)
......@@ -231,8 +237,6 @@ else()
endif()
include_directories(${CMAKE_SOURCE_DIR}/Plugins/Include)
add_definitions(
-DORTHANC_BUILD_UNIT_TESTS=1
-DORTHANC_ENABLE_LOGGING_PLUGIN=0
......
Core/Cache/ICachePageProvider.h
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Cache/LeastRecentlyUsedIndex.h
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Cache/MemoryCache.cpp
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Cache/MemoryCache.h
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Cache/SharedArchive.cpp
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Cache/SharedArchive.h
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/ChunkedBuffer.cpp
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/ChunkedBuffer.h
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Compression/DeflateBaseCompressor.cpp
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Compression/DeflateBaseCompressor.h
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Compression/GzipCompressor.cpp
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Compression/GzipCompressor.h
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Compression/HierarchicalZipWriter.cpp
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Compression/HierarchicalZipWriter.h
View file @ 1c0b959c
......@@ -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 General Public License as
......
Core/Compression/IBufferCompressor.h
View file @ 1c0b959c
......@@ -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 General Public License as
......