Clean up with JPR. Frog

[gdcm.git] / src / gdcmElValSet.h

diff --git a/src/gdcmElValSet.h b/src/gdcmElValSet.h
index e59c9fe3875208497803614dd805fd42cdb9b254..c5b59ed53cb990f1363aaa560ff832910450ac12 100644 (file)
--- a/src/gdcmElValSet.h
+++ b/src/gdcmElValSet.h
@@ -1,4 +1,4 @@
-// gdcmElValSet.h
+// $Header: /cvs/public/gdcm/src/Attic/gdcmElValSet.h,v 1.10 2003/04/09 14:04:53 jpr Exp $
 
 #ifndef GDCMELVALSET_H
 #define GDCMELVALSET_H
@@ -10,30 +10,41 @@
 
 ////////////////////////////////////////////////////////////////////////////
 // Container for a set of successfully parsed ElValues.
-typedef map<TagKey, ElValue*> TagElValueHT;
-typedef map<string, ElValue*> TagElValueNameHT;
+typedef map<TagKey, gdcmElValue*> TagElValueHT;
+typedef map<string, gdcmElValue*> TagElValueNameHT;
 
-class GDCM_EXPORT ElValSet {
-       TagElValueHT tagHt;             // Both accesses with a TagKey or with a
-       TagElValueNameHT NameHt;        // the DictEntry.Name are required.
+class GDCM_EXPORT gdcmElValSet {
+   TagElValueHT tagHt;             // Both accesses with a TagKey or with a
+   TagElValueNameHT NameHt;        // the DictEntry.Name are required.
+   
+   typedef string GroupKey;
+   typedef map<GroupKey, int> GroupHT; 
+   
 public:        
-       void Add(ElValue*);             
-       void Print(ostream &);
-       void PrintByName(ostream &);
-       int  Write(FILE *fp);
-       ElValue* GetElementByNumber(guint32 group, guint32 element);
-       ElValue* GetElementByName  (string);
-       string   GetElValueByNumber(guint32 group, guint32 element);
-       string   GetElValueByName  (string);
+   void Add(gdcmElValue*);
+                       
+   void Print(ostream &);
+   void PrintByName(ostream &);
+   int  Write(FILE *fp, FileType type);
+
+   gdcmElValue* GetElementByNumber(guint16 group, guint16 element);
+   gdcmElValue* GetElementByName  (string);
+   string   GetElValueByNumber(guint16 group, guint16 element);
+   string   GetElValueByName  (string);
        
-       TagElValueHT & GetTagHt(void);  
+   TagElValueHT & GetTagHt(void);      
        
-       int SetElValueByNumber(string content, guint32 group, guint32 element);
-       int SetElValueByName  (string content, string TagName);
+   int SetElValueByNumber(string content, guint16 group, guint16 element);
+   int SetElValueByName  (string content, string TagName);
        
-       int SetElValueLengthByNumber(guint32 l, guint32 group, guint32 element);
-       int SetElValueLengthByName  (guint32 l, string TagName);
+   int SetElValueLengthByNumber(guint32 l, guint16 group, guint16 element);
+   int SetElValueLengthByName  (guint32 l, string TagName);
 
+   guint32 GenerateFreeTagKeyInGroup(guint16 group);
+       
+private:
+   void UpdateGroupLength(bool SkipSequence = false, FileType type = ImplicitVR);
+   void WriteElements(FileType type, FILE *);
 };
 
 #endif