X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirObject.h;h=3643bf0148cdcd21a9061658163f6afd13b83e8a;hb=f2dd0107ba49eda3386b34715cdc0c046d12397f;hp=8997df873c6d4930a9bbfa17b14a2e32888b264a;hpb=ab0aa4fa11e3ac7ec236d1aceb6f0cf89fe83eae;p=gdcm.git

diff --git a/src/gdcmDicomDirObject.h b/src/gdcmDicomDirObject.h
index 8997df87..3643bf01 100644
--- a/src/gdcmDicomDirObject.h
+++ b/src/gdcmDicomDirObject.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirObject.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/23 10:47:10 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.20 $
                                                                                 
   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.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -16,51 +16,43 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMOBJECT_H
-#define GDCMOBJECT_H
+#ifndef _GDCMDICOMDIROBJECT_H_
+#define _GDCMDICOMDIROBJECT_H_
+
+#include "gdcmSQItem.h"
+#include "gdcmDicomDirElement.h"
 
 #include <string>
 #include <list>
-#include "gdcmCommon.h"
-#include "gdcmDocEntry.h"
-#include "gdcmDocument.h"
-#include "gdcmDicomDirElement.h"
-#include "gdcmSQItem.h"
 
+namespace GDCM_NAME_SPACE 
+{
 //-----------------------------------------------------------------------------
-class gdcmDicomDirObject;
-typedef std::list<gdcmDicomDirObject *> ListContent;
+class DicomDirObject;
 
+//-----------------------------------------------------------------------------
+typedef std::list<DicomDirObject *> ListContent;
 //-----------------------------------------------------------------------------
 /**
- * \ingroup gdcmDicomDirObject
- * \brief   Base object
+ * \brief   Parent object for DicomDirPatient, DicomDirStudy, 
+ *                            DicomDirSerie, DicomDirImage, of a DicomDir
  */
-class GDCM_EXPORT gdcmDicomDirObject : public gdcmSQItem
+class GDCM_EXPORT DicomDirObject : public SQItem
 {
-public:
+   gdcmTypeMacro(DicomDirObject);
 
-   gdcmDicomDirObject(TagDocEntryHT *ptagHT, int depth = 0);
-   virtual ~gdcmDicomDirObject();
-   /**
-    * \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; };
-   
-   TagDocEntryHT GetEntry();
-   void FillObject(std::list<gdcmElement> elemList);
+public:
 
 protected:
-
    // Constructor and destructor are protected to avoid end user to
    // instanciate from this class. 
-   // NO ! gdcmDicomDir needs to instanciate it!
+   DicomDirObject(int depth = 1);
+   ~DicomDirObject();
+
+   void FillObject(ListDicomDirMetaElem const &elemList);
 
-// Members :
-   ///\brief detail level to be printed 
-   int PrintLevel;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif