X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmValidator.cxx;h=ff1b532fc1d8c62ee22bb492972ef3b13f4ab806;hb=209f09716365d35c7cdc5b94684d1d1fb00335c7;hp=d156d02aa418d936748c58d311c53863cb2eb565;hpb=041172b2cbe77450f121c1fa082928d799fdbe53;p=gdcm.git diff --git a/src/gdcmValidator.cxx b/src/gdcmValidator.cxx index d156d02a..ff1b532f 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/09 08:36:47 $ - Version: $Revision: 1.12 $ + Date: $Date: 2006/02/16 20:06:15 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,20 +20,20 @@ #include "gdcmElementSet.h" #include "gdcmDataEntry.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" // hidden way to include sstream #include -#include namespace gdcm { //----------------------------------------------------------------------------- typedef std::map GroupHT; // Hash Table //----------------------------------------------------------------------------- - +/// \brief Constructor Validator::Validator() { } - +///\brief Canonical Destructor Validator::~Validator() { } @@ -43,11 +43,11 @@ Validator::~Validator() bool CheckVM(DataEntry *entry) { // Don't waste time checking tags where VM is OB and OW, since we know - // it's allways 1, whatever the actual length (found on disc) + // it's always 1, whatever the actual length (found on disc) if ( entry->GetVR() == "OB" || entry->GetVR() == "OW" ) return true; - + const std::string &s = entry->GetString(); unsigned int n = Util::CountSubstring( s , "\\"); @@ -99,15 +99,15 @@ DocEntry *d; if ( v->GetVM() != gdcm::GDCM_UNKNOWN ) if ( !CheckVM(v) ) { - if (v->GetVM() == "FIXME" ) - std::cout << "For Tag " << v->GetKey() << " VM = [" + 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() << "] " - << std::endl; + std::cout << "Tag (" << v->GetKey() + << ")-> [" << v->GetName() << "] VR :" << v->GetVR() + << " contains an illegal VM. Expected VM :[" + << v->GetVM() << "], value [" << v->GetString() << "]" + << std::endl; } if ( v->GetReadLength() % 2 )