diff OrthancServer/ServerEnumerations.h @ 546:0e510ea3de31 laaw

merge mainline -> laaw
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 13 Sep 2013 11:25:08 +0200
parents 1b2cdc855bd3
children e0cfb413c86b
line wrap: on
line diff
--- a/OrthancServer/ServerEnumerations.h	Fri Sep 13 11:10:58 2013 +0200
+++ b/OrthancServer/ServerEnumerations.h	Fri Sep 13 11:25:08 2013 +0200
@@ -51,6 +51,12 @@
     StoreStatus_FilteredOut     // Removed by NewInstanceFilter
   };
 
+  enum ModalityManufacturer
+  {
+    ModalityManufacturer_Generic,
+    ModalityManufacturer_ClearCanvas
+  };
+
 
   /**
    * WARNING: Do not change the explicit values in the enumerations
@@ -100,7 +106,10 @@
     ChangeType_ModifiedStudy = 8,
     ChangeType_ModifiedSeries = 9,
     ChangeType_AnonymizedPatient = 10,
-    ChangeType_ModifiedPatient = 11
+    ChangeType_ModifiedPatient = 11,
+    ChangeType_StablePatient = 12,
+    ChangeType_StableStudy = 13,
+    ChangeType_StableSeries = 14
   };
 
   void InitializeServerEnumerations();
@@ -123,6 +132,10 @@
 
   const char* EnumerationToString(ChangeType type);
 
+  const char* EnumerationToString(ModalityManufacturer manufacturer);
+
+  ModalityManufacturer StringToModalityManufacturer(const std::string& manufacturer);
+
   ResourceType GetParentResourceType(ResourceType type);
 
   ResourceType GetChildResourceType(ResourceType type);