X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValidator.cxx;h=a8f1b507a370434e85aa350e086a805062854192;hb=4297b237d3010e089a89e0242d4151168553778f;hp=f4cac4767a216a777d4bd81057a53564541876d8;hpb=bc69950a406d06c50f0fb75a96572784965cb534;p=gdcm.git

diff --git a/src/gdcmValidator.cxx b/src/gdcmValidator.cxx
index f4cac476..a8f1b507 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/10/18 08:35:51 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2005/11/03 08:28:40 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,6 +19,7 @@
 #include "gdcmValidator.h"
 #include "gdcmElementSet.h"
 #include "gdcmDataEntry.h"
+#include "gdcmUtil.h"
 
 #include <sstream>
 
@@ -37,18 +38,33 @@ Validator::~Validator()
 // compare to the one from the dictionary
 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)
+  
+  if ( entry->GetVR() == "OB" ||  entry->GetVR() == "OW" )
+     return true;
+     
   const std::string &s = entry->GetString();
-  std::string::size_type n = s.find("\\");
+
+/*  std::string::size_type n = s.find("\\");
   if ( n == s.npos ) // none found
   {
     n = 0;
   }
+*/
+
+  int n = Util::CountSubstring( s , "\\");
+  
   n++; // number of '\' + 1 == Value Multiplicity
 
+  std::string vmFromDict = entry->GetVM();
+  if ( vmFromDict == "1-n" || vmFromDict == "2-n" || vmFromDict == "3-n" )
+     return true;
+     
   unsigned int m;
-  std::istringstream os;
-  os.str( entry->GetVM());
-  os >> m;
+  std::istringstream is;
+  is.str( vmFromDict );
+  is >> m;
 
   return n == m;
 }
@@ -57,16 +73,32 @@ void Validator::SetInput(ElementSet *input)
 {
   // berk for now SetInput do two things at the same time
   DocEntry *d=input->GetFirstEntry();
-  while(d)
+  if (!d)
   {
+     std::cout << "No Entry found" << std::endl;
+     return;
+  }
+  while(d)
+  { 
     if ( DataEntry *v = dynamic_cast<DataEntry *>(d) )
-    {   
-      if ( !CheckVM(v) )
+    { 
+      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->GetReadLength() % 2 )
       {
-        std::cout << "Rah this DICOM contains one wrong tag:" << 
-        v->GetString() << " " <<
-        v->GetGroup() << "," << v->GetElement() << "," <<
-        v->GetVR() << " " << v->GetVM() << " " << v->GetName() << std::endl;
+        std::cout << "Tag (" <<  v->GetKey() 
+                  << ")-> [" << v->GetName() << "] has an uneven length :"
+                  << v->GetReadLength()
+                  << " [" << v->GetString() << "] " 
+                  << std::endl;         
       }
     }
     else