X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValidator.cxx;h=ff1b532fc1d8c62ee22bb492972ef3b13f4ab806;hb=209f09716365d35c7cdc5b94684d1d1fb00335c7;hp=a8f1b507a370434e85aa350e086a805062854192;hpb=06f3e8701e88357e66a9b82bb6031d8c1616a774;p=gdcm.git

diff --git a/src/gdcmValidator.cxx b/src/gdcmValidator.cxx
index a8f1b507..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/03 08:28:40 $
-  Version:   $Revision: 1.7 $
+  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,16 +20,20 @@
 #include "gdcmElementSet.h"
 #include "gdcmDataEntry.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h" // hidden way to include sstream
+#include <map>
 
-#include <sstream>
 
 namespace gdcm 
 {
-
+//-----------------------------------------------------------------------------
+typedef std::map<uint16_t, int> GroupHT;    //  Hash Table
+//-----------------------------------------------------------------------------
+/// \brief Constructor
 Validator::Validator()
 {
 }
-
+///\brief Canonical Destructor
 Validator::~Validator()
 {
 }
@@ -39,21 +43,14 @@ 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();
 
-/*  std::string::size_type n = s.find("\\");
-  if ( n == s.npos ) // none found
-  {
-    n = 0;
-  }
-*/
+  const std::string &s = entry->GetString();
 
-  int n = Util::CountSubstring( s , "\\");
+  unsigned int n = Util::CountSubstring( s , "\\");
   
   n++; // number of '\' + 1 == Value Multiplicity
 
@@ -71,8 +68,25 @@ bool CheckVM(DataEntry *entry)
 
 void Validator::SetInput(ElementSet *input)
 {
+
+DocEntry *d;
+/*
+// First stage to check group length
+  GroupHT grHT;
+  d=input->GetFirstEntry();
+  while(d)
+  {
+    grHT[d->GetGroup()] = 0;
+    d=input->GetNextEntry();
+  }
+  for (GroupHT::iterator it = grHT.begin(); it != grHT.end(); ++it)  
+  {
+      std::cout << std::hex << it->first << std::endl; 
+  } 
+*/
+
   // berk for now SetInput do two things at the same time
-  DocEntry *d=input->GetFirstEntry();
+  d=input->GetFirstEntry();
   if (!d)
   {
      std::cout << "No Entry found" << std::endl;
@@ -85,11 +99,15 @@ void Validator::SetInput(ElementSet *input)
       if ( v->GetVM() != gdcm::GDCM_UNKNOWN )
          if ( !CheckVM(v) )
          {
-           std::cout << "Tag (" <<  v->GetKey() 
-                     << ")-> [" << v->GetName() << "] contains an illegal VM. "
-                     << "value [" << v->GetString() << "] VR :"
-                     << v->GetVR() << ", Expected VM :" << v->GetVM() << " " 
-                     << std::endl;
+            if (v->GetVM() == "FIXME" )
+              std::cout << "For Tag " <<  v->GetKey() << " 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 )
@@ -105,7 +123,7 @@ void Validator::SetInput(ElementSet *input)
     {
       // We skip pb of SQ recursive exploration
     }
-      d=input->GetNextEntry();
+    d=input->GetNextEntry();
   }
 }