Commit 2003538a authored by Sebastien Jodogne's avatar Sebastien Jodogne
Browse files

New upstream version 0.6

parent 16777848

.hg_archival.txt

+4 −4
Original line number Diff line number Diff line 
repo: 4a7a53257c7df5a97aea39377b8c9a6e815c9763

node: 38d12348a1534ecb5f7c428aa5dd5235b76df338

branch: OrthancWSI-0.5

node: dd736430e3a4c9f6816dd3a54d4d0f4716123c71

branch: OrthancWSI-0.6

latesttag: null

latesttagdistance: 146

changessincelatesttag: 148
 
latesttagdistance: 159

changessincelatesttag: 162

AUTHORS

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Orthanc for Whole-Slide Imaging 
Authors

-------



* Sebastien Jodogne <s.jodogne@gmail.com>

* Sebastien Jodogne <s.jodogne@orthanc-labs.com>



  Overall design and lead developer.

Applications/ApplicationToolbox.cpp

+9 −8
Original line number Diff line number Diff line
@@ -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
@@ -22,13 +22,14 @@ 
#include "ApplicationToolbox.h"



#include "../Framework/Inputs/OpenSlideLibrary.h"

#include "../Framework/MultiThreading/BagOfTasksProcessor.h"



#include <Core/DicomParsing/FromDcmtkBridge.h>

#include <Core/HttpClient.h>

#include <Core/Logging.h>

#include <Core/MultiThreading/BagOfTasksProcessor.h>

#include <Core/OrthancException.h>

#include <Core/SystemToolbox.h>

#include <Core/Toolbox.h>



#include <boost/filesystem.hpp>

#include <boost/lexical_cast.hpp>
@@ -63,7 +64,7 @@ namespace OrthancWSI 
    void GlobalInitialize()

    {

      Orthanc::Logging::Initialize();

      Orthanc::HttpClient::InitializeOpenSsl();

      Orthanc::Toolbox::InitializeOpenSsl();

      Orthanc::HttpClient::GlobalInitialize();

      Orthanc::FromDcmtkBridge::InitializeDictionary(false /* don't load private dictionary */);

      assert(DisplayPerformanceWarning());
@@ -74,7 +75,7 @@ namespace OrthancWSI 
    {

      OrthancWSI::OpenSlideLibrary::Finalize();

      Orthanc::HttpClient::GlobalFinalize();

      Orthanc::HttpClient::FinalizeOpenSsl();

      Orthanc::Toolbox::FinalizeOpenSsl();

    }
@@ -217,12 +218,12 @@ namespace OrthancWSI 
        << path << " " << ORTHANC_WSI_VERSION << std::endl

        << "Copyright (C) 2012-2016 Sebastien Jodogne, "

        << "Medical Physics Department, University Hospital of Liege (Belgium)" << std::endl

        << "Copyright (C) 2017-2018 Osimis S.A. (Belgium)" << std::endl

        << "Copyright (C) 2017-2019 Osimis S.A. (Belgium)" << std::endl

        << "Licensing AGPL: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl.html>." << std::endl

        << "This is free software: you are free to change and redistribute it." << std::endl

        << "There is NO WARRANTY, to the extent permitted by law." << std::endl

        << std::endl

        << "Written by Sebastien Jodogne <s.jodogne@gmail.com>" << std::endl;

        << "Written by Sebastien Jodogne <s.jodogne@orthanc-labs.com>" << std::endl;

    }
@@ -279,8 +280,8 @@ namespace OrthancWSI 
      if (options.count(OPTION_USERNAME) &&

          options.count(OPTION_PASSWORD))

      {

        parameters.SetUsername(options[OPTION_USERNAME].as<std::string>());

        parameters.SetPassword(options[OPTION_PASSWORD].as<std::string>());

        parameters.SetCredentials(options[OPTION_USERNAME].as<std::string>(),

                                  options[OPTION_PASSWORD].as<std::string>());

      }



      if (options.count(OPTION_TIMEOUT))

Applications/ApplicationToolbox.h

+3 −2
Original line number Diff line number Diff line
@@ -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
@@ -21,7 +21,8 @@ 


#pragma once



#include <Core/MultiThreading/BagOfTasks.h>

#include "../Framework/MultiThreading/BagOfTasks.h"



#include <Core/WebServiceParameters.h>



#include <string>

Applications/CMakeLists.txt

+4 −2
Original line number Diff line number Diff line
@@ -100,14 +100,15 @@ set(ORTHANC_WSI_SOURCES 
  ${ORTHANC_WSI_DIR}/Framework/Inputs/TiledPyramidStatistics.cpp

  ${ORTHANC_WSI_DIR}/Framework/Jpeg2000Reader.cpp

  ${ORTHANC_WSI_DIR}/Framework/Jpeg2000Writer.cpp

  ${ORTHANC_WSI_DIR}/Framework/Targets/FolderTarget.cpp

  ${ORTHANC_WSI_DIR}/Framework/Targets/OrthancTarget.cpp

  ${ORTHANC_WSI_DIR}/Framework/MultiThreading/BagOfTasksProcessor.cpp

  ${ORTHANC_WSI_DIR}/Framework/Outputs/DicomPyramidWriter.cpp

  ${ORTHANC_WSI_DIR}/Framework/Outputs/HierarchicalTiffWriter.cpp

  ${ORTHANC_WSI_DIR}/Framework/Outputs/InMemoryTiledImage.cpp

  ${ORTHANC_WSI_DIR}/Framework/Outputs/MultiframeDicomWriter.cpp

  ${ORTHANC_WSI_DIR}/Framework/Outputs/PyramidWriterBase.cpp

  ${ORTHANC_WSI_DIR}/Framework/Outputs/TruncatedPyramidWriter.cpp

  ${ORTHANC_WSI_DIR}/Framework/Targets/FolderTarget.cpp

  ${ORTHANC_WSI_DIR}/Framework/Targets/OrthancTarget.cpp

  )



EmbedResources(
@@ -119,6 +120,7 @@ EmbedResources( 


add_definitions(

  -DHAS_ORTHANC_EXCEPTION=1

  -DORTHANC_ENABLE_LOGGING_PLUGIN=0

  )