X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDirList.cxx;h=f9b7ecb18bfc0574486a3e91d788c86973646f29;hb=d93bdc3a545dc713354ab0c8ad9558ee11dfe0e9;hp=c2e6a8abe0414100214a51c56ca17bfdc25c9d89;hpb=327ad94af0b7e8bce9c8931789133757b318132b;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index c2e6a8ab..f9b7ecb1 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/05/12 09:36:09 $
-  Version:   $Revision: 1.59 $
+  Date:      $Date: 2008/02/13 18:53:33 $
+  Version:   $Revision: 1.65 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,20 +20,22 @@
 #include "gdcmUtil.h"
 #include "gdcmDebug.h"
 
+#include "gdcmDicomDirImage.h"
+
 #include <iterator>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>  //stat function
 
 #ifdef _MSC_VER
-   #include <windows.h> 
+   #include <windows.h>
    #include <direct.h>
 #else
    #include <dirent.h>   
    #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,16 +88,64 @@ bool DirList::IsDirectory(std::string const &dirName)
    }
    else
    {
-      gdcmStaticErrorMacro( strerror(errno) );
+      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