Mercurial > hg > orthanc

comparison OrthancServer/FromDcmtkBridge.cpp @ 991:2f76b92addd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
990:7cbcd580cd21 991:2f76b92addd4
166 } 166 }
167 } 167 }
168 } 168 }
169 169
170 170
171 DicomTag FromDcmtkBridge::Convert(const DcmTag& tag)
172 {
173 return DicomTag(tag.getGTag(), tag.getETag());
174 }
175
176
171 DicomTag FromDcmtkBridge::GetTag(const DcmElement& element) 177 DicomTag FromDcmtkBridge::GetTag(const DcmElement& element)
172 { 178 {
173 return DicomTag(element.getGTag(), element.getETag()); 179 return DicomTag(element.getGTag(), element.getETag());
180 }
181
182
183 bool FromDcmtkBridge::IsPrivateTag(DcmTag& tag)
184 {
185 return (tag.getPrivateCreator() != NULL ||
186 !strcmp("PrivateCreator", tag.getTagName())); // TODO - This may change with future versions of DCMTK
187 }
188
189
190 bool FromDcmtkBridge::IsPrivateTag(const DicomTag& tag)
191 {
192 DcmTag tmp(tag.GetGroup(), tag.GetElement());
193 return IsPrivateTag(tmp);
174 } 194 }
175 195
176 196
177 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element, 197 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element,
178 Encoding encoding) 198 Encoding encoding)
514 if (strlen(name) == 9 && 534 if (strlen(name) == 9 &&
515 isxdigit(name[0]) && 535 isxdigit(name[0]) &&
516 isxdigit(name[1]) && 536 isxdigit(name[1]) &&
517 isxdigit(name[2]) && 537 isxdigit(name[2]) &&
518 isxdigit(name[3]) && 538 isxdigit(name[3]) &&
519 name[4] == '-' && 539 (name[4] == '-' || name[4] == ',') &&
520 isxdigit(name[5]) && 540 isxdigit(name[5]) &&
521 isxdigit(name[6]) && 541 isxdigit(name[6]) &&
522 isxdigit(name[7]) && 542 isxdigit(name[7]) &&
523 isxdigit(name[8])) 543 isxdigit(name[8]))
524 { 544 {