X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=src%2FgdcmValidator.cxx;h=d156d02aa418d936748c58d311c53863cb2eb565;hb=0e030c69b4fec60eaf0c92a6c1701a3e8de5e794;hp=045a95d193098ee128b2130a7aca1a21352fe05c;hpb=f556c218bc3bf673a0c19a0fc090440ab650cec9;p=gdcm.git diff --git a/src/gdcmValidator.cxx b/src/gdcmValidator.cxx index 045a95d1..d156d02a 100644 --- a/src/gdcmValidator.cxx +++ b/src/gdcmValidator.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmValidator.cxx,v $ Language: C++ - Date: $Date: 2005/11/05 13:25:26 $ - Version: $Revision: 1.9 $ + Date: $Date: 2005/11/09 08:36:47 $ + Version: $Revision: 1.12 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -68,9 +68,12 @@ bool CheckVM(DataEntry *entry) void Validator::SetInput(ElementSet *input) { + +DocEntry *d; +/* // First stage to check group length GroupHT grHT; - DocEntry *d=input->GetFirstEntry(); + d=input->GetFirstEntry(); while(d) { grHT[d->GetGroup()] = 0; @@ -80,7 +83,7 @@ void Validator::SetInput(ElementSet *input) { std::cout << std::hex << it->first << std::endl; } - +*/ // berk for now SetInput do two things at the same time d=input->GetFirstEntry(); @@ -96,10 +99,14 @@ void Validator::SetInput(ElementSet *input) if ( v->GetVM() != gdcm::GDCM_UNKNOWN ) if ( !CheckVM(v) ) { + if (v->GetVM() == "FIXME" ) + std::cout << "For Tag " << v->GetKey() << " VM = [" + << v->GetVM() << "]" << std::endl; + std::cout << "Tag (" << v->GetKey() << ")-> [" << v->GetName() << "] contains an illegal VM. " << "value [" << v->GetString() << "] VR :" - << v->GetVR() << ", Expected VM :" << v->GetVM() << " " + << v->GetVR() << ", Expected VM : [" << v->GetVM() << "] " << std::endl; }