# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1448985423 -3600
# Node ID 36ab170733d622403c9347f4dd033bb8eb08e5e2
# Parent  aa95aea0a352b2b642946ae20ef5bda92caa025c
Made eFilm version explicit

diff -r aa95aea0a352 -r 36ab170733d6 NEWS
--- a/NEWS	Tue Dec 01 16:34:24 2015 +0100
+++ b/NEWS	Tue Dec 01 16:57:03 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", "Efilm" and "Vitrea" modality manufacturers
+* New "AgfaImpax", "EFilm2" and "Vitrea" modality manufacturers
 * Upgrade to Boost 1.59.0 for static builds
 
 
diff -r aa95aea0a352 -r 36ab170733d6 OrthancServer/OrthancFindRequestHandler.cpp
--- a/OrthancServer/OrthancFindRequestHandler.cpp	Tue Dec 01 16:34:24 2015 +0100
+++ b/OrthancServer/OrthancFindRequestHandler.cpp	Tue Dec 01 16:57:03 2015 +0100
@@ -96,7 +96,7 @@
   {
     switch (manufacturer)
     {
-      case ModalityManufacturer_Efilm:
+      case ModalityManufacturer_EFilm2:
         // Following Denis Nesterov's mail on 2015-11-30
         if (tag == DicomTag(0x0008, 0x0000) ||  // "GenericGroupLength"
             tag == DicomTag(0x0010, 0x0000) ||  // "GenericGroupLength"
diff -r aa95aea0a352 -r 36ab170733d6 OrthancServer/ServerEnumerations.cpp
--- a/OrthancServer/ServerEnumerations.cpp	Tue Dec 01 16:34:24 2015 +0100
+++ b/OrthancServer/ServerEnumerations.cpp	Tue Dec 01 16:57:03 2015 +0100
@@ -340,8 +340,8 @@
       case ModalityManufacturer_AgfaImpax:
         return "AgfaImpax";
       
-      case ModalityManufacturer_Efilm:
-        return "Efilm";
+      case ModalityManufacturer_EFilm2:
+        return "EFilm2";
       
       case ModalityManufacturer_Vitrea:
         return "Vitrea";
@@ -417,9 +417,9 @@
     {
       return ModalityManufacturer_Vitrea;
     }
-    else if (manufacturer == "Efilm")
+    else if (manufacturer == "EFilm2")
     {
-      return ModalityManufacturer_Efilm;
+      return ModalityManufacturer_EFilm2;
     }
     else
     {
diff -r aa95aea0a352 -r 36ab170733d6 OrthancServer/ServerEnumerations.h
--- a/OrthancServer/ServerEnumerations.h	Tue Dec 01 16:34:24 2015 +0100
+++ b/OrthancServer/ServerEnumerations.h	Tue Dec 01 16:57:03 2015 +0100
@@ -64,7 +64,7 @@
     ModalityManufacturer_Dcm4Chee,
     ModalityManufacturer_SyngoVia,
     ModalityManufacturer_AgfaImpax,
-    ModalityManufacturer_Efilm,
+    ModalityManufacturer_EFilm2,
     ModalityManufacturer_Vitrea
   };
 
diff -r aa95aea0a352 -r 36ab170733d6 Resources/Configuration.json
--- a/Resources/Configuration.json	Tue Dec 01 16:34:24 2015 +0100
+++ b/Resources/Configuration.json	Tue Dec 01 16:57:03 2015 +0100
@@ -151,8 +151,8 @@
      * specific PACS manufacturer. The allowed values are currently
      * "Generic" (default value), "StoreScp" (storescp tool from
      * DCMTK), "ClearCanvas", "MedInria", "Dcm4Chee", "SyngoVia",
-     * "AgfaImpax", "Efilm" and "Vitrea". This parameter is
-     * case-sensitive.
+     * "AgfaImpax" (Agfa IMPAX), "EFilm2" (eFilm version 2), and
+     * "Vitrea". This parameter is case-sensitive.
      **/
     // "clearcanvas" : [ "CLEARCANVAS", "192.168.1.1", 104, "ClearCanvas" ]
   },
diff -r aa95aea0a352 -r 36ab170733d6 UnitTestsSources/UnitTestsMain.cpp
--- a/UnitTestsSources/UnitTestsMain.cpp	Tue Dec 01 16:34:24 2015 +0100
+++ b/UnitTestsSources/UnitTestsMain.cpp	Tue Dec 01 16:57:03 2015 +0100
@@ -530,7 +530,7 @@
   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("EFilm2", EnumerationToString(StringToModalityManufacturer("EFilm2")));
   ASSERT_STREQ("Vitrea", EnumerationToString(StringToModalityManufacturer("Vitrea")));
 }