Program: gdcm
Module: $RCSfile: gdcmValidator.cxx,v $
Language: C++
- Date: $Date: 2005/06/14 20:53:19 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2005/10/18 08:35:51 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmValidator.h"
#include "gdcmElementSet.h"
-#include "gdcmBinEntry.h"
-#include "gdcmValEntry.h"
+#include "gdcmDataEntry.h"
#include <sstream>
{
}
-// Function to compare the VM found while parsing d->GetValue()
+// Function to compare the VM found while parsing d->GetString()
// compare to the one from the dictionary
-bool CheckVM(ValEntry *v)
+bool CheckVM(DataEntry *entry)
{
- const std::string &s = v->GetValue();
+ const std::string &s = entry->GetString();
std::string::size_type n = s.find("\\");
- if (n == s.npos) // none found
- {
+ if ( n == s.npos ) // none found
+ {
n = 0;
- }
+ }
n++; // number of '\' + 1 == Value Multiplicity
unsigned int m;
std::istringstream os;
- os.str( v->GetVM());
+ os.str( entry->GetVM());
os >> m;
return n == m;
void Validator::SetInput(ElementSet *input)
{
// berk for now SetInput do two things at the same time
- gdcm::DocEntry *d=input->GetFirstEntry();
+ DocEntry *d=input->GetFirstEntry();
while(d)
- {
- if ( gdcm::BinEntry *b = dynamic_cast<gdcm::BinEntry*>(d) )
+ {
+ if ( DataEntry *v = dynamic_cast<DataEntry *>(d) )
+ {
+ if ( !CheckVM(v) )
{
-// copyH->InsertBinEntry( b->GetBinArea(),b->GetLength(),
-// b->GetGroup(),b->GetElement(),
-// b->GetVR() );
- (void)b;
- }
- else if ( gdcm::ValEntry *v = dynamic_cast<gdcm::ValEntry*>(d) )
- {
- if( !CheckVM(v))
- {
- std::cout << "Rah this DICOM contains one wrong tag:" <<
- v->GetValue() << " " <<
+ std::cout << "Rah this DICOM contains one wrong tag:" <<
+ v->GetString() << " " <<
v->GetGroup() << "," << v->GetElement() << "," <<
v->GetVR() << " " << v->GetVM() << " " << v->GetName() << std::endl;
- }
}
+ }
else
- {
+ {
// We skip pb of SQ recursive exploration
- }
- d=input->GetNextEntry();
}
+ d=input->GetNextEntry();
+ }
}
} // end namespace gdcm