X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FexXCoherentFileSet.cxx;h=5f0dcfb7f2bca0b856815ef6b74373cdad58e0f8;hb=70502c22fe6a622c3bf335f27f9db7ba553e8190;hp=c60915dd3deea2e7d555aa5d5b2ad6ad9536e4e4;hpb=1f4b804082d56e199031a5380165eff84750f8a8;p=gdcm.git

diff --git a/Example/exXCoherentFileSet.cxx b/Example/exXCoherentFileSet.cxx
index c60915dd..5f0dcfb7 100755
--- a/Example/exXCoherentFileSet.cxx
+++ b/Example/exXCoherentFileSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exXCoherentFileSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/08 16:40:02 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2006/07/26 17:05:25 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
          loadMode |= gdcm::LD_NOSEQ;
    }
 
-   char *dirName  = am->ArgMgrGetString("dirin",(char *)0);
+   const char *dirName  = am->ArgMgrGetString("dirin");
    if (dirName == 0)
    {
        std::cout <<std::endl
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
                  
    gdcm::SerieHelper *s;
   
-   s = new gdcm::SerieHelper();
+   s = gdcm::SerieHelper::New();
    s->SetLoadMode(gdcm::LD_ALL);     // Load everything for each File
    //gdcm::TagKey t(0x0020,0x0013);
    //s->AddRestriction(t, "340", gdcm::GDCM_LESS); // Keep only files where
@@ -168,15 +168,16 @@ int main(int argc, char *argv[])
     
              std::cout << "[" << (*i).first << "]" << std::endl;
     
-           // Nowadays OrderFileList() causes trouble, since some files
-           // (MIP views) don't have 'Position', now considered as mandatory
+           // Within a 'just to see' program, 
+           // OrderFileList() causes trouble, since some files
+           // (eg:MIP views) don't have 'Position', now considered as mandatory
            // Commented out for the moment.
    
            //s->OrderFileList((*i).second);  // sort the XCoherent Fileset
     
-            for (std::vector<gdcm::File* >::iterator it =  ((*i).second)->begin();
-                                                     it != ((*i).second)->end();
-                                                   ++it)
+            for (gdcm::FileList::iterator it =  ((*i).second)->begin();
+                                          it != ((*i).second)->end();
+                                        ++it)
             {
                fileName = (*it)->GetFileName();
                std::cout << "    " << fileName << std::endl;
@@ -187,7 +188,7 @@ int main(int argc, char *argv[])
       l = s->GetNextSingleSerieUIDFileSet();
    } 
   
-   delete s;
+   s->Delete();
 
    return 0;
 }