Mercurial > hg > orthanc
diff OrthancServer/FromDcmtkBridge.h @ 788:7ebe4bf87196
refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 05 May 2014 18:39:36 +0200 |
parents | efd0215736d9 |
children | 55dae8c5a6ab |
line wrap: on
line diff
--- a/OrthancServer/FromDcmtkBridge.h Mon May 05 15:52:14 2014 +0200 +++ b/OrthancServer/FromDcmtkBridge.h Mon May 05 18:39:36 2014 +0200 @@ -43,24 +43,16 @@ namespace Orthanc { - enum DicomRootLevel - { - DicomRootLevel_Patient, - DicomRootLevel_Study, - DicomRootLevel_Series, - DicomRootLevel_Instance - }; - - enum DicomReplaceMode - { - DicomReplaceMode_InsertIfAbsent, - DicomReplaceMode_ThrowIfAbsent, - DicomReplaceMode_IgnoreIfAbsent - }; - class FromDcmtkBridge { public: + enum ReplaceMode + { + ReplaceMode_InsertIfAbsent, + ReplaceMode_ThrowIfAbsent, + ReplaceMode_IgnoreIfAbsent + }; + static void Convert(DicomMap& target, DcmDataset& dataset); static DicomTag GetTag(const DcmElement& element); @@ -119,7 +111,7 @@ static void ToJson(Json::Value& result, const DicomMap& values); - static std::string GenerateUniqueIdentifier(DicomRootLevel level); + static std::string GenerateUniqueIdentifier(ResourceType level); static bool SaveToMemoryBuffer(std::string& buffer, DcmDataset* dataSet); @@ -177,7 +169,7 @@ void Replace(const DicomTag& tag, const std::string& value, - DicomReplaceMode mode = DicomReplaceMode_InsertIfAbsent); + FromDcmtkBridge::ReplaceMode mode = FromDcmtkBridge::ReplaceMode_InsertIfAbsent); void RemovePrivateTags();