ENH: Refactor some code

[gdcm.git] / src / gdcmObject.h

diff --git a/src/gdcmObject.h b/src/gdcmObject.h
index e3be05aa2a031f2ab7c922a28418181b4490bc18..04363a85a1341179f5ad7e47df3f824b1f848278 100644 (file)
--- a/src/gdcmObject.h
+++ b/src/gdcmObject.h
@@ -1,14 +1,32 @@
-// gdcmObject.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmObject.h,v $
+  Language:  C++
+  Date:      $Date: 2004/08/26 15:29:53 $
+  Version:   $Revision: 1.19 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #ifndef GDCMOBJECT_H
 #define GDCMOBJECT_H
 
 #include <string>
 #include <list>
 #include "gdcmCommon.h"
-#include "gdcmHeaderEntry.h"
-#include "gdcmParser.h"
+#include "gdcmDocEntry.h"
+#include "gdcmDocument.h"
 #include "gdcmDicomDirElement.h"
+#include "gdcmSQItem.h"
+
 //-----------------------------------------------------------------------------
 class gdcmObject;
 typedef std::list<gdcmObject *> ListContent;
@@ -18,89 +36,30 @@ typedef std::list<gdcmObject *> ListContent;
  * \ingroup gdcmObject
  * \brief   Base object
  */
-class GDCM_EXPORT gdcmObject 
+class GDCM_EXPORT gdcmObject : public gdcmSQItem
 {
 public:
+
+   gdcmObject(TagDocEntryHT *ptagHT, int depth = 0);
+   virtual ~gdcmObject();
    /**
-    * \ingroup gdcmParser
     * \brief   Sets the print level for the Dicom Header 
     * \note    0 for Light Print; 1 for 'medium' Print, 2 for Heavy
     */
-   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 SetPrintLevel(int level) { PrintLevel = level; };
    
-   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);  }
-
-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);
-
-
+   TagDocEntryHT GetEntry();
    void FillObject(std::list<gdcmElement> elemList);
 
-/**
-* \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
-*/   
-   int printLevel;
-   
-   /**
-   * \brief used to pass variables to FillObject function
-   *        Works as 'global' variable
-   */
-   std::list<gdcmHeaderEntry *>::iterator debInsertion, finInsertion, i,j;
+protected:
 
-private:
+   // Constructor and destructor are protected to avoid end user to
+   // instanciate from this class. 
+   // NO ! gdcmDicomDir needs to instanciate it!
 
+// Members :
+   ///\brief detail level to be printed 
+   int PrintLevel;
 };
 
 //-----------------------------------------------------------------------------