X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestSerieHelper.cxx;h=800a0c175854f94931501c847a04d71b18b3bf9e;hb=c556c62e38ad8f5b0423a91d919c13ac85a23f32;hp=291d5c41a4465de324b323bf507d6f7fd559e1b7;hpb=c4fa2e74a4ce56a0a8db54e4a70d404bec9fc8dd;p=gdcm.git

diff --git a/Testing/TestSerieHelper.cxx b/Testing/TestSerieHelper.cxx
index 291d5c41..800a0c17 100644
--- a/Testing/TestSerieHelper.cxx
+++ b/Testing/TestSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/30 14:40:30 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/10/17 09:55:36 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,7 +39,7 @@ int TestSerieHelper(int argc, char *argv[])
    std::cout << "Dir Name :[" << dirName << "]" << std::endl;
 
    s = new gdcm::SerieHelper();
-   s->SetLoadMode(GDCM_LD_ALL);     // Load everything for each File
+   s->SetLoadMode(gdcm::LD_ALL);     // Load everything for each File
    //s->AddRestriction(tagKey, valueToCheck); // Keep only files where
                                               // restriction is true
    s->SetDirectory(dirName, true); // true : recursive exploration
@@ -51,8 +51,8 @@ int TestSerieHelper(int argc, char *argv[])
              << std::endl;
 
    int nbFiles;
-   // For all the Coherent Files lists of the gdcm::Serie
-   gdcm::FileList *l = s->GetFirstCoherentFileList();
+   // For all the SingleSerieUID filesets of the gdcm::Serie
+   gdcm::FileList *l = s->GetFirstSingleSerieUIDFileSet();
    while (l)
    { 
       nbFiles = l->size() ;
@@ -61,21 +61,21 @@ int TestSerieHelper(int argc, char *argv[])
          std::cout << "Sort list : " << nbFiles << " long" << std::endl;
          s->OrderFileList(l);  // sort the list
       }
-      l = s->GetNextCoherentFileList();
+      l = s->GetNextSingleSerieUIDFileSet();
    } 
    std::cout << " -------------------------------------------- Finish sorting"
              << std::endl;
-   s->Print(); // Prints all the Coherent Files lists (sorted or not)
+   s->Print(); // Prints all the SingleSerieUID filesets (sorted or not)
    std::cout << " -------------------------------------------- Finish printing"
              << std::endl;
 
 
-   // Only for the first Coherent File List 
+   // Only for the first SingleSerieUID fileset 
    // ( Why not ? Just an example, for testing )
    // Display all the file names
 
    std::string fileName; 
-   l = s->GetFirstCoherentFileList();
+   l = s->GetFirstSingleSerieUIDFileSet();
    for (std::vector<gdcm::File* >::iterator it =  l->begin();
                                             it != l->end();
                                           ++it)