X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=005700a72a42f06499352524bad89c62a5dd9dc4;hb=df832cf7f90b4ca5aca2f628c1756fb276779fac;hp=e6c0523913c1334044bf7642b851d055611517b4;hpb=78819730153743a96f6a7e4a0fab0d2a7ea2537c;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index e6c05239..005700a7 100644
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/10 15:54:03 $
-  Version:   $Revision: 1.58 $
+  Date:      $Date: 2007/09/20 07:43:35 $
+  Version:   $Revision: 1.64 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,8 @@
 #include "gdcmUtil.h"
 #include "gdcmDebug.h"
 
+#include "gdcmDicomDirImage.h"
+
 #include <iterator>
 #include <assert.h>
 #include <errno.h>
@@ -33,7 +35,7 @@
    #include <sys/types.h>
 #endif
 
-namespace gdcm
+namespace GDCM_NAME_SPACE
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -48,6 +50,14 @@ DirList::DirList(std::string const &dirName, bool recursive)
    Explore(dirName, recursive);
 }
 
+/**
+ * \brief Constructor  
+ * @param  se DicomDirSerie we want to explore
+ */
+DirList::DirList(DicomDirSerie *se)
+{
+   Explore(se);
+}
 /**
  * \brief  Destructor
  */
@@ -78,17 +88,64 @@ bool DirList::IsDirectory(std::string const &dirName)
    }
    else
    {
-      const char *str = strerror(errno);
-      gdcmStaticErrorMacro( str );
+      gdcmStaticWarningMacro("[" << dirName << "] not found or is not a Directory");
+      //gdcmStaticErrorMacro( strerror(errno) );
       return false;
    }
 }
 
+/**
+ * \brief   Get the first entry while visiting Filenames
+ * \return  The first  if found, otherwhise ""
+ */ 
+std::string DirList::GetFirst()
+{
+   ItDirList = Filenames.begin();
+   if (ItDirList != Filenames.end())
+      return *ItDirList;
+   return "";
+} 
+
+/**
+ * \brief   Get the next entry while visiting Filenames
+ * \return  The next  if found, otherwhise ""
+ */ 
+std::string DirList::GetNext()
+{
+   gdcmAssertMacro (ItDirList != Filenames.end())
+   {
+      ++ItDirList;
+      if (ItDirList != Filenames.end())
+         return *ItDirList;      
+   }
+   return "";
+} 
+
 //-----------------------------------------------------------------------------
 // Protected
 
 //-----------------------------------------------------------------------------
 // Private
+
+/**
+ * \brief   Explores a DicomDirSerie
+ *          return number of files found
+ * @param  se DicomDirSerie to explore
+ */
+int DirList::Explore(DicomDirSerie *se)
+{
+   int numberOfFiles = 0;
+
+   DicomDirImage *im = se->GetFirstImage();
+   while ( im ) 
+   { 
+      Filenames.push_back( im->GetEntryString(0x0004, 0x1500) );// File name (Referenced File ID)
+      numberOfFiles++;           
+      im = se->GetNextImage();   
+   }
+   return numberOfFiles;
+}   
+   
 /**
  * \brief   Explore a directory with possibility of recursion
  *          return number of files read
@@ -163,8 +220,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
       fileName = dirName + d->d_name;
       if( stat(fileName.c_str(), &buf) != 0 )
       {
-         const char *str = strerror(errno);
-         gdcmErrorMacro( str );
+         gdcmErrorMacro( strerror(errno) );
       }
       if ( S_ISREG(buf.st_mode) )    //is it a regular file?
       {
@@ -186,8 +242,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    }
    if( closedir(dir) != 0 )
    {
-      const char *str = strerror(errno);
-      gdcmErrorMacro( str );
+      gdcmErrorMacro( strerror(errno) );
    }
 #endif