* Reorder source code

[gdcm.git] / src / gdcmBinEntry.h

diff --git a/src/gdcmBinEntry.h b/src/gdcmBinEntry.h
index e04dcf1fdefbf0500deb27fad7c44a3da9aaf1e8..1901cdaa17cffbb9f2e07ddfc54ddf31c7c027b1 100644 (file)
--- a/src/gdcmBinEntry.h
+++ b/src/gdcmBinEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/11 15:15:37 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2005/02/02 16:18:48 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,7 +19,7 @@
 #ifndef GDCMBINENTRY_H
 #define GDCMBINENTRY_H
 
-#include "gdcmValEntry.h"
+#include "gdcmContentEntry.h"
 #include <iostream>
 
 namespace gdcm 
@@ -27,14 +27,15 @@ namespace gdcm
 
 //-----------------------------------------------------------------------------
 /**
- * \brief   Any Dicom Document (File Header or DicomDir) contains 
- *           a set of DocEntry entries 
- *          (when successfuly parsed against a given Dicom dictionary)
- *          BinEntry is a specialisation of ValEntry (for non std::string
- *          representable values)
+ * \brief   Any Dicom Document (File or DicomDir) contains 
+ *           a set of DocEntry - Dicom entries - 
+ *          BinEntry is an elementary DocEntry (i.e. a ContentEntry, 
+ *           as opposite to SeqEntry) whose content is non std::string
+ *          representable
+ *          BinEntry is a specialisation of ContentEntry
  */
  
-class GDCM_EXPORT BinEntry  : public ValEntry
+class GDCM_EXPORT BinEntry  : public ContentEntry
 {
 public:
    BinEntry( DictEntry *e );
@@ -42,22 +43,28 @@ public:
 
    ~BinEntry();
    
-   void Print( std::ostream &os = std::cout );
+   void Print( std::ostream &os = std::cout, std::string const & indent = "" );
+
    void WriteContent( std::ofstream *fp, FileType ft);
 
-   /// \brief Returns the area value of the current Dicom Header Entry
-   ///  when it's not string-translatable (e.g : a LUT table)         
+   /// \brief Returns the area value of the current Dicom Entry
+   ///  when it's not string-translatable (e.g : LUT table, overlay, icon)         
    uint8_t *GetBinArea()  { return BinArea; }
    void  SetBinArea( uint8_t *area, bool self = true );
 
-   /// Sets the value (string) of the current Dicom Document Entry
-   virtual void SetValue(std::string const &val) { SetValueOnly(val); };
+   /// \brief Sets SelfArea
+   void SetSelfArea(bool area) { SelfArea = area; };
+   /// \brief Returns SelfArea
+   bool IsSelfArea() { return SelfArea; };
+
 private:
-   /// \brief unsecure memory area to hold 'non string' values 
+   /// \brief memory area to hold 'non std::string' representable values 
    ///       (ie : Lookup Tables, overlays, icons)   
    uint8_t *BinArea;
+   /// \brief Whether BinEntry has its own BinArea or not
    bool SelfArea;
 };
+
 } // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif