X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=e06fcd1a429a796bef2775fc495fe19e354fa800;hb=e3b1014c07e783d2b54604b47bd0e6453656832b;hp=3eb1b625fa05a962bb7a3983e593141eafb410dd;hpb=fae5f95ae8cf044c024b1793b94032c9368f0f4b;p=gdcm.git

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index 3eb1b625..e06fcd1a 100644
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -6,11 +6,15 @@
 #include "gdcmHeader.h"
 #include "gdcmCommon.h"
 #include "gdcmPatient.h"
+#include "gdcmMeta.h"
 #include "gdcmDicomDirElement.h"
 
+#include <list>
+#include <vector>
+
 //-----------------------------------------------------------------------------
-typedef std::list<gdcmPatient *> ListPatient;
-typedef std::list<gdcmHeader *>  ListHeader;
+typedef std::list<gdcmPatient *>   ListPatient;
+typedef std::vector<gdcmHeader *>  ListHeader;
 
 //-----------------------------------------------------------------------------
 /*
@@ -21,20 +25,28 @@ typedef std::list<gdcmHeader *>  ListHeader;
 class GDCM_EXPORT gdcmDicomDir: public gdcmParser
 {
 public:
-   gdcmDicomDir(ListTag *l,           bool exception_on_error = false);
-   gdcmDicomDir(const char *FileName,bool exception_on_error = false);
+//   gdcmDicomDir(ListTag *l,         bool exception_on_error = false);
+   gdcmDicomDir(const char *FileName, 
+                bool parseDir = false,
+                bool exception_on_error = false);
    
    ~gdcmDicomDir(void);
 
    void SetPrintLevel(int level) { printLevel = level; };
    virtual void Print(std::ostream &os = std::cout);
 
+   inline gdcmMeta   *GetMeta()      {return metaelems;};
    inline ListPatient &GetPatients() {return patients;};
-   bool   Write(std::string fileName);
 
+// Write
+   bool Write(std::string fileName);
+   void ParseDirectory(void);
+
+// Types
    typedef enum
    {
       GDCM_NONE,
+      GDCM_META,
       GDCM_PATIENT,
       GDCM_STUDY,
       GDCM_SERIE,
@@ -43,18 +55,24 @@ public:
    
 protected:
    void NewDicomDir(std::string path);
+   std::string GetPath(void);
 
 private:
    void CreateDicomDir(void);
-   void AddObjectToEnd(gdcmDicomDirType type,ListTag::iterator begin,ListTag::iterator end);
+   void AddObjectToEnd(gdcmDicomDirType type,
+                        ListTag::iterator begin,ListTag::iterator end);
+   void AddMetaToEnd   (ListTag::iterator begin,ListTag::iterator end);
    void AddPatientToEnd(ListTag::iterator begin,ListTag::iterator end);
-   void AddStudyToEnd(ListTag::iterator begin,ListTag::iterator end);
-   void AddSerieToEnd(ListTag::iterator begin,ListTag::iterator end);
-   void AddImageToEnd(ListTag::iterator begin,ListTag::iterator end);
+   void AddStudyToEnd  (ListTag::iterator begin,ListTag::iterator end);
+   void AddSerieToEnd  (ListTag::iterator begin,ListTag::iterator end);
+   void AddImageToEnd  (ListTag::iterator begin,ListTag::iterator end);
 
    void SetElements(std::string &path,ListHeader &list);
-   void SetElement(std::string &path,gdcmDicomDirType type,gdcmHeader *header);
+   void SetElement (std::string &path,gdcmDicomDirType type,gdcmHeader *header);
+
+   static bool HeaderLessThan(gdcmHeader *header1,gdcmHeader *header2);
 
+   gdcmMeta *metaelems;
    ListPatient patients;
 };