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

diff --git a/Testing/TestSerieHelper.cxx b/Testing/TestSerieHelper.cxx
index 800a0c17..c31129ec 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/10/17 09:55:36 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2008/02/13 19:08:34 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,7 +22,7 @@
 
 int TestSerieHelper(int argc, char *argv[])
 {  
-   gdcm::SerieHelper *s;
+   GDCM_NAME_SPACE::SerieHelper *s;
   
    std::string dirName; 
    if (argc > 1) 
@@ -36,10 +36,10 @@ int TestSerieHelper(int argc, char *argv[])
    //   gdcm::Debug::DebugOn();
 
   
-   std::cout << "Dir Name :[" << dirName << "]" << std::endl;
+   std::cout << "-------------- Dir Name :[" << dirName << "]" << std::endl;
 
-   s = new gdcm::SerieHelper();
-   s->SetLoadMode(gdcm::LD_ALL);     // Load everything for each File
+   s = GDCM_NAME_SPACE::SerieHelper::New();
+   s->SetLoadMode(GDCM_NAME_SPACE::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
@@ -52,7 +52,7 @@ int TestSerieHelper(int argc, char *argv[])
 
    int nbFiles;
    // For all the SingleSerieUID filesets of the gdcm::Serie
-   gdcm::FileList *l = s->GetFirstSingleSerieUIDFileSet();
+   GDCM_NAME_SPACE::FileList *l = s->GetFirstSingleSerieUIDFileSet();
    while (l)
    { 
       nbFiles = l->size() ;
@@ -76,7 +76,7 @@ int TestSerieHelper(int argc, char *argv[])
 
    std::string fileName; 
    l = s->GetFirstSingleSerieUIDFileSet();
-   for (std::vector<gdcm::File* >::iterator it =  l->begin();
+   for (std::vector<GDCM_NAME_SPACE::File* >::iterator it =  l->begin();
                                             it != l->end();
                                           ++it)
    {
@@ -87,7 +87,7 @@ int TestSerieHelper(int argc, char *argv[])
    } 
      
 
-   delete s;
+   s->Delete();
 
    return 0;
 }