* src/gdcmDict.cxx, gdcmElValSet.cxx : bug fix under windows for prints.

[gdcm.git] / src / gdcmElValSet.h

diff --git a/src/gdcmElValSet.h b/src/gdcmElValSet.h
index 5def2edc274fe29f42706071eb02466c6e492366..889f37bf3c13c2a4df05e7493203f0310ef47fcb 100644 (file)
--- a/src/gdcmElValSet.h
+++ b/src/gdcmElValSet.h
@@ -1,31 +1,37 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmElValSet.h,v 1.12 2003/05/21 14:42:46 frog Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmElValSet.h,v 1.20 2004/01/12 13:12:28 regrain Exp $
 
 #ifndef GDCMELVALSET_H
 #define GDCMELVALSET_H
 
-#include <stdio.h>    // FIXME For FILE on GCC only
-#include <map>
 #include "gdcmCommon.h"
 #include "gdcmElValue.h"
 
-////////////////////////////////////////////////////////////////////////////
-// Container for a set of successfully parsed ElValues.
-typedef std::map<TagKey, gdcmElValue*> TagElValueHT;
+#include <stdio.h>
+#include <map>
+#include <list>       // for linking together *all* the Dicom Elements
+
+/*
+ * Container for a set of successfully parsed ElValues.
+ */
+typedef std::map<TagKey,      gdcmElValue*> TagElValueHT;
 typedef std::map<std::string, gdcmElValue*> TagElValueNameHT;
+   
+typedef std::string GroupKey;
+typedef std::map<GroupKey, int> GroupHT;
+
+typedef std::list<gdcmElValue*> ListTag; // for linking together the Elements
 
 class GDCM_EXPORT gdcmElValSet {
    TagElValueHT tagHt;             // Both accesses with a TagKey or with a
    TagElValueNameHT NameHt;        // the DictEntry.Name are required.
-   
-   typedef std::string GroupKey;
-   typedef std::map<GroupKey, int> GroupHT; 
-   
+   ListTag listElem;
+
 public:        
    ~gdcmElValSet();
    void Add(gdcmElValue*);
                        
-   void Print(ostream &);
-   void PrintByName(ostream &);
+   void Print(std::ostream &);
+   void PrintByName(std::ostream &);
    int  Write(FILE *fp, FileType type);
 
    gdcmElValue* GetElementByNumber(guint16 group, guint16 element);
@@ -33,15 +39,19 @@ public:
    std::string  GetElValueByNumber(guint16 group, guint16 element);
    std::string  GetElValueByName  (std::string);
        
-   TagElValueHT & GetTagHt(void);      
+   TagElValueHT & GetTagHt(void)     {return tagHt;};  
+   ListTag      & GetListElem(void)  {return listElem;};       
        
    int SetElValueByNumber(std::string content, guint16 group, guint16 element);
    int SetElValueByName  (std::string content, std::string TagName);
        
    int SetElValueLengthByNumber(guint32 l, guint16 group, guint16 element);
    int SetElValueLengthByName  (guint32 l, std::string TagName);
+   
+   int SetVoidAreaByNumber(void *a, guint16 Group, guint16 Elem );
 
    guint32 GenerateFreeTagKeyInGroup(guint16 group);
+   int CheckIfExistByNumber(guint16 Group, guint16 Elem );
        
 private:
    void UpdateGroupLength(bool SkipSequence = false, FileType type = ImplicitVR);