X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmObject.h;h=13eff6806b7b8cb72d4e8a3a3d426b76a5fa7610;hb=801fe2221ca70b34c5c644b6f522aa1b7233945b;hp=a7b0665b20fd19e138714add5bbb89c2f484ad6e;hpb=6b175e1ed8a183e2fc43fa93df394159a461c07f;p=gdcm.git

diff --git a/src/gdcmObject.h b/src/gdcmObject.h
index a7b0665b..13eff680 100644
--- a/src/gdcmObject.h
+++ b/src/gdcmObject.h
@@ -6,9 +6,12 @@
 #include <string>
 #include <list>
 #include "gdcmCommon.h"
-#include "gdcmHeaderEntry.h"
-#include "gdcmParser.h"
+#include "gdcmDocEntry.h"
+//#include "gdcmParser.h"
+#include "gdcmDocument.h"
 #include "gdcmDicomDirElement.h"
+#include "gdcmSQItem.h"
+
 //-----------------------------------------------------------------------------
 class gdcmObject;
 typedef std::list<gdcmObject *> ListContent;
@@ -18,9 +21,10 @@ typedef std::list<gdcmObject *> ListContent;
  * \ingroup gdcmObject
  * \brief   Base object
  */
-class GDCM_EXPORT gdcmObject 
+class GDCM_EXPORT gdcmObject : public gdcmSQItem
 {
 public:
+
    /**
     * \ingroup gdcmParser
     * \brief   Sets the print level for the Dicom Header 
@@ -28,78 +32,22 @@ public:
     */
    void SetPrintLevel(int level) 
       { printLevel = level; };
-   virtual void Print(std::ostream &os = std::cout);
-
-   std::string GetEntryByNumber(guint16 group, guint16 element);
-   std::string GetEntryByName(TagName name);
-   bool SetEntryByNumber(std::string val,guint16 group,guint16 element);
    
-   TagHeaderEntryHT GetEntry(void);
-   ListTag GetListEntry(void);
-   
-   void ResetBoundaries(int flag);
-/**
- * \ingroup gdcmObject
- * \brief   returns an iterator on the first Header Entry (i.e Dicom Element),
- *          inside the DICOMDIR chained list,
- *          related to this 'Object' 
- * @return
- */
-   ListTag::iterator debut(void) 
-      { return(beginObj);}
-   /**
-    * \ingroup gdcmObject
-    * \brief   returns an iterator on the last Header Entry (i.e Dicom Element),
-    *          inside the DICOMDIR chained list,
-    *          related to this 'Object' 
-    * @return
-    */
-    ListTag::iterator fin  (void) 
-       { return(endObj);  }
+   TagDocEntryHT GetEntry(void);
+   void FillObject(std::list<gdcmElement> elemList);
 
 protected:
+
  // constructor and destructor are protected to avoid end user to instanciate this class.
-   gdcmObject(ListTag::iterator begin,ListTag::iterator end,
-              TagHeaderEntryHT *ptagHT, ListTag *plistEntries); 
-   ~gdcmObject(void);
+   gdcmObject(TagDocEntryHT *ptagHT, int depth = 0);
+   virtual ~gdcmObject(void);
 
-   void FillObject(std::list<gdcmElement> elemList);
+// variables :
 
-/**
-* \brief iterator on the first Header Entry (i.e Dicom Element), 
-*       inside the DICOMDIR chained list,
-*       related to this 'Object'
-*/   
-   ListTag::iterator beginObj;
-/**
-* \brief iterator on the last Header Entry (i.e Dicom Element), 
-*       inside the DICOMDIR chained list,
-*       related to this 'Object'
-*/
-   ListTag::iterator endObj;
-/**
-* \brief pointer to the HTable of the gdcmParser,
-*        (because we don't know it within any gdcmObject) 
-*/
-  TagHeaderEntryHT *ptagHT;
-/**
-* \brief pointer to the Chained List of the gdcmParser,
-*        (because we don't know it within any gdcmObject)  
-*/  
-   ListTag *plistEntries;
-/**
-* \brief detail level to be printed
-*/   
+///\brief detail level to be printed 
    int printLevel;
-   
-   /**
-   * \brief used to pass variables to FillObject function
-   *        Works as 'global' variable
-   */
-   std::list<gdcmHeaderEntry *>::iterator debInsertion, finInsertion, i,j;
 
 private:
-
 };
 
 //-----------------------------------------------------------------------------