X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestAllVM.cxx;h=0abb80701e060e599e57c2475cba0f17a11c832f;hb=9d461db5c5d954548cd07d1fa095e9bad43a0cac;hp=425567e2ced1cb50dd08ca86bb48ba09646033b6;hpb=9e3f678ba17cc24e8ee3972a6367b53bcd4d23d4;p=gdcm.git

diff --git a/Testing/TestAllVM.cxx b/Testing/TestAllVM.cxx
index 425567e2..0abb8070 100644
--- a/Testing/TestAllVM.cxx
+++ b/Testing/TestAllVM.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestAllVM.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/21 15:16:22 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2007/06/21 14:59:06 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,36 +24,48 @@
 
 int DoTheVMTest(std::string const &filename)
 {
-      gdcm::File file;
-      // Do not test unknow VM ...
-      file.SetLoadMode( gdcm::LD_NOSHADOW | gdcm::LD_NOSHADOWSEQ );
-      file.SetFileName( filename );
-      if( !file.Load() ) //would be really bad...
-        return 1;
+   GDCM_NAME_SPACE::File *file = GDCM_NAME_SPACE::File::New();
+   // - Do not test unknow VM in shadow groups (if element 0x0000 is present)
+   // - Skip Sequences (if they are 'True Length'); loading will be quicker
+   //                  (anyway, Sequences are skipped at processing time ...)
+   file->SetLoadMode( GDCM_NAME_SPACE::LD_NOSHADOW | GDCM_NAME_SPACE::LD_NOSEQ );
+
+   file->SetFileName( filename );
+   if( !file->Load() ) //would be really bad...
+      return 1;
 
-      gdcm::DocEntry *d = file.GetFirstEntry();
-      std::cerr << "Testing file : " << filename << std::endl;
-      while(d)
+   GDCM_NAME_SPACE::DocEntry *d = file->GetFirstEntry();
+   std::cerr << "Testing file : " << filename << std::endl;
+   GDCM_NAME_SPACE::DataEntry *de;
+   while(d)
+   {
+      if ( (de = dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(d)) )
       {
-         if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
-         {
-           if( !de->IsValueCountValid() )
-             {
-             std::cerr << "Element: " << de->GetKey() <<
-               " (" << de->GetName() << ") " <<
-               "Contains a wrong VM: " << de->GetValueCount() 
-               << " should be: " << de->GetVM() << std::endl;;
-             }
+         if ( !(de->GetGroup() % 2) ) // Don't check shadow elements. Righ now,
+                                      // Private Dictionnary are not dealt with
+         {    
+            // We know OB and OW VM is always 1, whatever the actual
+            //  found value is.
+     
+            if (de->GetVR() != "OB" && de->GetVR() != "OW" )
+               if( !de->IsValueCountValid() )
+               {
+                  std::cerr << "Element: " << de->GetKey() <<
+                    " (" << de->GetName() << ") " <<
+                    "Contains a wrong VM: " << de->GetValueCount() 
+                    << " should be: " << de->GetVM() << std::endl;;
+               }
          }
-         else
-         {
+      }
+      else
+      {
           // We skip pb of SQ recursive exploration
-         }
-
-         d = file.GetNextEntry();
       }
+      d = file->GetNextEntry();
+   }
+   file->Delete();
 
-      return 0;
+   return 0;
 }
 
 int TestAllVM(int argc, char *argv[])
@@ -73,6 +85,11 @@ int TestAllVM(int argc, char *argv[])
       std::string filename = GDCM_DATA_ROOT;
       filename += "/";
       filename += gdcmDataImages[i];
+      
+      if (!strcmp(gdcmDataImages[i],"00191113.dcm")) // Track bug on Darwin
+          GDCM_NAME_SPACE::Debug::DebugOn();
+      else
+         GDCM_NAME_SPACE::Debug::DebugOff();
 
       if( DoTheVMTest( filename ) )
         return 1;