comparison 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
comparison
equal deleted inserted replaced
543:fe796b053863 546:0e510ea3de31
49 StoreStatus_AlreadyStored, 49 StoreStatus_AlreadyStored,
50 StoreStatus_Failure, 50 StoreStatus_Failure,
51 StoreStatus_FilteredOut // Removed by NewInstanceFilter 51 StoreStatus_FilteredOut // Removed by NewInstanceFilter
52 }; 52 };
53 53
54 enum ModalityManufacturer
55 {
56 ModalityManufacturer_Generic,
57 ModalityManufacturer_ClearCanvas
58 };
59
54 60
55 /** 61 /**
56 * WARNING: Do not change the explicit values in the enumerations 62 * WARNING: Do not change the explicit values in the enumerations
57 * below this point. This would result in incompatible databases 63 * below this point. This would result in incompatible databases
58 * between versions of Orthanc! 64 * between versions of Orthanc!
98 ChangeType_AnonymizedStudy = 6, 104 ChangeType_AnonymizedStudy = 6,
99 ChangeType_AnonymizedSeries = 7, 105 ChangeType_AnonymizedSeries = 7,
100 ChangeType_ModifiedStudy = 8, 106 ChangeType_ModifiedStudy = 8,
101 ChangeType_ModifiedSeries = 9, 107 ChangeType_ModifiedSeries = 9,
102 ChangeType_AnonymizedPatient = 10, 108 ChangeType_AnonymizedPatient = 10,
103 ChangeType_ModifiedPatient = 11 109 ChangeType_ModifiedPatient = 11,
110 ChangeType_StablePatient = 12,
111 ChangeType_StableStudy = 13,
112 ChangeType_StableSeries = 14
104 }; 113 };
105 114
106 void InitializeServerEnumerations(); 115 void InitializeServerEnumerations();
107 116
108 void RegisterUserMetadata(int metadata, 117 void RegisterUserMetadata(int metadata,
121 130
122 const char* EnumerationToString(StoreStatus status); 131 const char* EnumerationToString(StoreStatus status);
123 132
124 const char* EnumerationToString(ChangeType type); 133 const char* EnumerationToString(ChangeType type);
125 134
135 const char* EnumerationToString(ModalityManufacturer manufacturer);
136
137 ModalityManufacturer StringToModalityManufacturer(const std::string& manufacturer);
138
126 ResourceType GetParentResourceType(ResourceType type); 139 ResourceType GetParentResourceType(ResourceType type);
127 140
128 ResourceType GetChildResourceType(ResourceType type); 141 ResourceType GetChildResourceType(ResourceType type);
129 } 142 }