X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.h;h=81425d0e9f5db6b199088340ba12bf9fb2230800;hb=a832fc23a0f4bf56a74829c0306bc1d8587107a2;hp=4328fe1cc32013f99ddfdeab473146b5f1e1ec97;hpb=0f8bcdd7eb7538bda5c38c4587c0ae54cb0c3693;p=gdcm.git

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 4328fe1c..81425d0e 100644
--- a/src/gdcmDocEntrySet.h
+++ b/src/gdcmDocEntrySet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntrySet.h,v $
   Language:  C++
-  Date:      $Date: 2005/02/04 14:49:01 $
-  Version:   $Revision: 1.48 $
+  Date:      $Date: 2005/09/06 15:28:49 $
+  Version:   $Revision: 1.56 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,16 +31,16 @@ class BinEntry;
 class SeqEntry;
 class DictEntry;
 
-typedef std::string BaseTagKey;
+typedef TagKey BaseTagKey;
 
 //-----------------------------------------------------------------------------
 /**
  * \brief
  * \ref DocEntrySet is an abstract base class for \ref ElementSet
  * and \ref SQItem which are both containers for DocEntries.
- * \ref ElementSet is based on the STL map<> container
- * (see \ref ElementSet::TagHT), as opposed to \ref SQItem
- * which is based on an STL list container (see \ref ListDocEntry).
+ *  - \ref ElementSet is based on the STL map<> container
+ * (see \ref ElementSet::TagHT)
+ *  - \ref SQItem is based on an STL list container (see \ref ListDocEntry).
  * Since the syntax for adding a new element to a map<> or a list<>
  * differ, \ref DocEntrySet is designed as an adapter to unify the
  * interfaces of \ref DocEntrySet and \ref ElementSet.
@@ -60,9 +60,9 @@ class GDCM_EXPORT DocEntrySet : public Base
 {
 public:
    /// Canonical Constructor
-   DocEntrySet() {};
+   DocEntrySet();
    /// Canonical Destructor
-   virtual ~DocEntrySet() {};
+   virtual ~DocEntrySet() {}
 
    /// \brief write any type of entry to the entry set
    virtual void WriteContent (std::ofstream *fp, FileType filetype) = 0;
@@ -70,47 +70,45 @@ public:
    /// \brief Remove all Entry in the entry set
    virtual void ClearEntry() = 0;
    /// \brief adds any type of entry to the entry set
-   virtual bool AddEntry(DocEntry *Entry) = 0;
+   virtual bool AddEntry(DocEntry *entry) = 0;
    /// \brief Removes any type of entry out of the entry set, and destroys it
-   virtual bool RemoveEntry(DocEntry *EntryToRemove) = 0;
+   virtual bool RemoveEntry(DocEntry *entryToRemove) = 0;
    /// \brief Removes any type of entry out of the entry set, DOESN'T destroy it
-   virtual bool RemoveEntryNoDestroy(DocEntry *EntryToRemove) = 0;
+   virtual bool RemoveEntryNoDestroy(DocEntry *entryToRemove) = 0;
    /// Gets the first entry of any type of set
    virtual DocEntry *GetFirstEntry()=0;
    /// Gets the next entry of any type of set
    virtual DocEntry *GetNextEntry()=0;
-   /// Gets the first ValEntry of set (for Python users)
-   virtual ValEntry *GetFirstValEntry()=0;
-   /// Gets the next ValEntry of set  (for Python users)
-   virtual ValEntry *GetNextValEntry()=0;
+
    virtual std::string GetEntryValue(uint16_t group, uint16_t elem);
-   virtual void *GetEntryBinArea(uint16_t group, uint16_t elem);   
+   virtual void *GetEntryBinArea(uint16_t group, uint16_t elem);
+   
    virtual int GetEntryLength(uint16_t group, uint16_t elem);
    virtual std::string GetEntryVR(uint16_t group, uint16_t elem);
-
+   virtual std::string GetEntryForcedAsciiValue(uint16_t group, uint16_t elem);
    /// \brief Gets any type of DocEntry, identified by its (group,elem)
    virtual DocEntry *GetDocEntry(uint16_t group, uint16_t elem) = 0;
    /// \brief Gets a ValEntry, identified by its (group, elem)
-   virtual ValEntry *GetValEntry(uint16_t group, uint16_t elem);
+   ValEntry *GetValEntry(uint16_t group, uint16_t elem);
    /// \brief Gets a BinEntry, identified by its (group,elem)
-   virtual BinEntry *GetBinEntry(uint16_t group, uint16_t elem);
+   BinEntry *GetBinEntry(uint16_t group, uint16_t elem);
    /// \brief Gets a SeqEntry, identified by its (group,elem)
-   virtual SeqEntry *GetSeqEntry(uint16_t group, uint16_t elem);
+   SeqEntry *GetSeqEntry(uint16_t group, uint16_t elem);
 
-   virtual bool SetValEntry(std::string const &content,
+   bool SetValEntry(std::string const &content,
                             uint16_t group, uint16_t elem);
-   virtual bool SetBinEntry(uint8_t *content, int lgth,
+   bool SetBinEntry(uint8_t *content, int lgth,
                             uint16_t group, uint16_t elem);
-   virtual bool SetValEntry(std::string const &content, ValEntry *entry);
-   virtual bool SetBinEntry(uint8_t *content, int lgth, BinEntry *entry);
+   bool SetValEntry(std::string const &content, ValEntry *entry);
+   bool SetBinEntry(uint8_t *content, int lgth, BinEntry *entry);
 
-   virtual ValEntry *InsertValEntry(std::string const &value,
+   ValEntry *InsertValEntry(std::string const &value,
                                     uint16_t group, uint16_t elem,
                                     TagName const &vr = GDCM_UNKNOWN);
-   virtual BinEntry *InsertBinEntry(uint8_t *binArea, int lgth,
+   BinEntry *InsertBinEntry(uint8_t *binArea, int lgth,
                                     uint16_t group, uint16_t elem,
                                     TagName const &vr = GDCM_UNKNOWN);
-   virtual SeqEntry *InsertSeqEntry(uint16_t group, uint16_t elem);
+   SeqEntry *InsertSeqEntry(uint16_t group, uint16_t elem);
    /// tells us if the set contains no entry
    virtual bool IsEmpty() = 0;
    virtual bool CheckIfEntryExist(uint16_t group, uint16_t elem);
@@ -133,6 +131,8 @@ protected:
    DictEntry *GetDictEntry(uint16_t group, uint16_t elem);
    DictEntry *GetDictEntry(uint16_t group, uint16_t elem,
                            TagName const &vr);
+   /// To be able to backtrack (Private Sequence, Implicit VR related pb)
+   DocEntry *PreviousDocEntry;
 
 private:
 };