Mercurial > hg > orthanc
diff OrthancServer/FromDcmtkBridge.cpp @ 991:2f76b92addd4
keep private tags during anonymization
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 02 Jul 2014 11:56:08 +0200 |
parents | 63973b76a51f |
children | a226e0959d8b |
line wrap: on
line diff
--- a/OrthancServer/FromDcmtkBridge.cpp Tue Jul 01 17:17:45 2014 +0200 +++ b/OrthancServer/FromDcmtkBridge.cpp Wed Jul 02 11:56:08 2014 +0200 @@ -168,12 +168,32 @@ } + DicomTag FromDcmtkBridge::Convert(const DcmTag& tag) + { + return DicomTag(tag.getGTag(), tag.getETag()); + } + + DicomTag FromDcmtkBridge::GetTag(const DcmElement& element) { return DicomTag(element.getGTag(), element.getETag()); } + bool FromDcmtkBridge::IsPrivateTag(DcmTag& tag) + { + return (tag.getPrivateCreator() != NULL || + !strcmp("PrivateCreator", tag.getTagName())); // TODO - This may change with future versions of DCMTK + } + + + bool FromDcmtkBridge::IsPrivateTag(const DicomTag& tag) + { + DcmTag tmp(tag.GetGroup(), tag.GetElement()); + return IsPrivateTag(tmp); + } + + DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element, Encoding encoding) { @@ -516,7 +536,7 @@ isxdigit(name[1]) && isxdigit(name[2]) && isxdigit(name[3]) && - name[4] == '-' && + (name[4] == '-' || name[4] == ',') && isxdigit(name[5]) && isxdigit(name[6]) && isxdigit(name[7]) &&