# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1448891503 -3600
# Node ID 3dcf5c0734c9714acfc2ba06ce7328454261ac0c
# Parent  8ae1a18b9afba042c8f65057d391b05b1e1393f9
New "AgfaImpax" modality manufacturer for AGFA Impax

diff -r 8ae1a18b9afb -r 3dcf5c0734c9 NEWS
--- a/NEWS	Mon Nov 30 14:04:05 2015 +0100
+++ b/NEWS	Mon Nov 30 14:51:43 2015 +0100
@@ -72,6 +72,7 @@
 * "--logdir" flag creates a single log file instead of 3 separate files for errors/warnings/infos
 * "--errors" flag lists the error codes that could be returned by Orthanc
 * Under Windows, the exit status of Orthanc corresponds to the encountered error code
+* New "AgfaImpax" modality manufacturer for AGFA Impax
 * Upgrade to Boost 1.59.0 for static builds
 
 
diff -r 8ae1a18b9afb -r 3dcf5c0734c9 OrthancServer/DicomProtocol/DicomUserConnection.cpp
--- a/OrthancServer/DicomProtocol/DicomUserConnection.cpp	Mon Nov 30 14:04:05 2015 +0100
+++ b/OrthancServer/DicomProtocol/DicomUserConnection.cpp	Mon Nov 30 14:51:43 2015 +0100
@@ -447,12 +447,15 @@
   {
     switch (manufacturer)
     {
+      case ModalityManufacturer_AgfaImpax:
       case ModalityManufacturer_SyngoVia:
       {
         std::auto_ptr<DicomMap> fix(fields.Clone());
 
         // This issue for Syngo.Via and its solution was reported by
-        // Emsy Chan by private mail on June 17th, 2015.
+        // Emsy Chan by private mail on 2015-06-17. According to
+        // Robert van Ommen (2015-11-30), the same fix is required for
+        // Agfa Impax.
         std::set<DicomTag> tags;
         fix->GetTags(tags);
 
diff -r 8ae1a18b9afb -r 3dcf5c0734c9 OrthancServer/ServerEnumerations.cpp
--- a/OrthancServer/ServerEnumerations.cpp	Mon Nov 30 14:04:05 2015 +0100
+++ b/OrthancServer/ServerEnumerations.cpp	Mon Nov 30 14:51:43 2015 +0100
@@ -337,6 +337,9 @@
       case ModalityManufacturer_SyngoVia:
         return "SyngoVia";
       
+      case ModalityManufacturer_AgfaImpax:
+        return "AgfaImpax";
+      
       default:
         throw OrthancException(ErrorCode_ParameterOutOfRange);
     }
@@ -400,6 +403,10 @@
     {
       return ModalityManufacturer_SyngoVia;
     }
+    else if (manufacturer == "AgfaImpax")
+    {
+      return ModalityManufacturer_AgfaImpax;
+    }
     else
     {
       throw OrthancException(ErrorCode_ParameterOutOfRange);
diff -r 8ae1a18b9afb -r 3dcf5c0734c9 OrthancServer/ServerEnumerations.h
--- a/OrthancServer/ServerEnumerations.h	Mon Nov 30 14:04:05 2015 +0100
+++ b/OrthancServer/ServerEnumerations.h	Mon Nov 30 14:51:43 2015 +0100
@@ -62,7 +62,8 @@
     ModalityManufacturer_ClearCanvas,
     ModalityManufacturer_MedInria,
     ModalityManufacturer_Dcm4Chee,
-    ModalityManufacturer_SyngoVia
+    ModalityManufacturer_SyngoVia,
+    ModalityManufacturer_AgfaImpax
   };
 
   enum DicomRequestType
diff -r 8ae1a18b9afb -r 3dcf5c0734c9 Resources/CMake/DcmtkConfiguration.cmake
--- a/Resources/CMake/DcmtkConfiguration.cmake	Mon Nov 30 14:04:05 2015 +0100
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Mon Nov 30 14:51:43 2015 +0100
@@ -1,6 +1,6 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK)
   SET(DCMTK_VERSION_NUMBER 360)
-  set(DCMTK_PACKAGE_VERSION "3.6.0")
+  SET(DCMTK_PACKAGE_VERSION "3.6.0")
   SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0)
   SET(DCMTK_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.0.zip")
   SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4")
diff -r 8ae1a18b9afb -r 3dcf5c0734c9 Resources/Configuration.json
--- a/Resources/Configuration.json	Mon Nov 30 14:04:05 2015 +0100
+++ b/Resources/Configuration.json	Mon Nov 30 14:51:43 2015 +0100
@@ -150,8 +150,8 @@
      * A fourth parameter is available to enable patches for a
      * specific PACS manufacturer. The allowed values are currently
      * "Generic" (default value), "StoreScp" (storescp tool from
-     * DCMTK), "ClearCanvas", "MedInria", "Dcm4Chee" and
-     * "SyngoVia". This parameter is case-sensitive.
+     * DCMTK), "ClearCanvas", "MedInria", "Dcm4Chee", "SyngoVia", and
+     * "AgfaImpax". This parameter is case-sensitive.
      **/
     // "clearcanvas" : [ "CLEARCANVAS", "192.168.1.1", 104, "ClearCanvas" ]
   },
diff -r 8ae1a18b9afb -r 3dcf5c0734c9 UnitTestsSources/UnitTestsMain.cpp
--- a/UnitTestsSources/UnitTestsMain.cpp	Mon Nov 30 14:04:05 2015 +0100
+++ b/UnitTestsSources/UnitTestsMain.cpp	Mon Nov 30 14:51:43 2015 +0100
@@ -529,6 +529,7 @@
   ASSERT_STREQ("MedInria", EnumerationToString(StringToModalityManufacturer("MedInria")));
   ASSERT_STREQ("Dcm4Chee", EnumerationToString(StringToModalityManufacturer("Dcm4Chee")));
   ASSERT_STREQ("SyngoVia", EnumerationToString(StringToModalityManufacturer("SyngoVia")));
+  ASSERT_STREQ("AgfaImpax", EnumerationToString(StringToModalityManufacturer("AgfaImpax")));
 }