# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1448978354 -3600
# Node ID efbc3afd6cd36e51bf4f9066febaed4c3cee3110
# Parent  d364926389e0a3ee2c43d8dfca3f28d5e2dd0e03
Efilm and Vitrea manufacturers

diff -r d364926389e0 -r efbc3afd6cd3 NEWS
--- a/NEWS	Tue Dec 01 14:53:52 2015 +0100
+++ b/NEWS	Tue Dec 01 14:59:14 2015 +0100
@@ -72,7 +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
+* New "AgfaImpax", "Efilm" and "Vitrea" modality manufacturers
 * Upgrade to Boost 1.59.0 for static builds
 
 
diff -r d364926389e0 -r efbc3afd6cd3 OrthancServer/ServerEnumerations.cpp
--- a/OrthancServer/ServerEnumerations.cpp	Tue Dec 01 14:53:52 2015 +0100
+++ b/OrthancServer/ServerEnumerations.cpp	Tue Dec 01 14:59:14 2015 +0100
@@ -340,6 +340,12 @@
       case ModalityManufacturer_AgfaImpax:
         return "AgfaImpax";
       
+      case ModalityManufacturer_Efilm:
+        return "Efilm";
+      
+      case ModalityManufacturer_Vitrea:
+        return "Vitrea";
+      
       default:
         throw OrthancException(ErrorCode_ParameterOutOfRange);
     }
@@ -407,6 +413,14 @@
     {
       return ModalityManufacturer_AgfaImpax;
     }
+    else if (manufacturer == "Vitrea")
+    {
+      return ModalityManufacturer_Vitrea;
+    }
+    else if (manufacturer == "Efilm")
+    {
+      return ModalityManufacturer_Efilm;
+    }
     else
     {
       throw OrthancException(ErrorCode_ParameterOutOfRange);
diff -r d364926389e0 -r efbc3afd6cd3 OrthancServer/ServerEnumerations.h
--- a/OrthancServer/ServerEnumerations.h	Tue Dec 01 14:53:52 2015 +0100
+++ b/OrthancServer/ServerEnumerations.h	Tue Dec 01 14:59:14 2015 +0100
@@ -63,7 +63,9 @@
     ModalityManufacturer_MedInria,
     ModalityManufacturer_Dcm4Chee,
     ModalityManufacturer_SyngoVia,
-    ModalityManufacturer_AgfaImpax
+    ModalityManufacturer_AgfaImpax,
+    ModalityManufacturer_Efilm,
+    ModalityManufacturer_Vitrea
   };
 
   enum DicomRequestType
diff -r d364926389e0 -r efbc3afd6cd3 Resources/Configuration.json
--- a/Resources/Configuration.json	Tue Dec 01 14:53:52 2015 +0100
+++ b/Resources/Configuration.json	Tue Dec 01 14:59:14 2015 +0100
@@ -150,8 +150,9 @@
      * 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", "SyngoVia", and
-     * "AgfaImpax". This parameter is case-sensitive.
+     * DCMTK), "ClearCanvas", "MedInria", "Dcm4Chee", "SyngoVia",
+     * "AgfaImpax", "Efilm" and "Vitrea". This parameter is
+     * case-sensitive.
      **/
     // "clearcanvas" : [ "CLEARCANVAS", "192.168.1.1", 104, "ClearCanvas" ]
   },
diff -r d364926389e0 -r efbc3afd6cd3 UnitTestsSources/UnitTestsMain.cpp
--- a/UnitTestsSources/UnitTestsMain.cpp	Tue Dec 01 14:53:52 2015 +0100
+++ b/UnitTestsSources/UnitTestsMain.cpp	Tue Dec 01 14:59:14 2015 +0100
@@ -530,6 +530,8 @@
   ASSERT_STREQ("Dcm4Chee", EnumerationToString(StringToModalityManufacturer("Dcm4Chee")));
   ASSERT_STREQ("SyngoVia", EnumerationToString(StringToModalityManufacturer("SyngoVia")));
   ASSERT_STREQ("AgfaImpax", EnumerationToString(StringToModalityManufacturer("AgfaImpax")));
+  ASSERT_STREQ("Efilm", EnumerationToString(StringToModalityManufacturer("Efilm")));
+  ASSERT_STREQ("Vitrea", EnumerationToString(StringToModalityManufacturer("Vitrea")));
 }