X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmElValue.h;h=9dec12ca15419b8e93f75bb64f9b0c5f23bf4217;hb=3e78befc911eac2ecc70747854911d1f803797b5;hp=b1305bc6b1590c347f5df32a88984de54af716c2;hpb=565a47ec4e037897aaf770aeccc5d67d7ad7b478;p=gdcm.git

diff --git a/src/gdcmElValue.h b/src/gdcmElValue.h
index b1305bc6..9dec12ca 100644
--- a/src/gdcmElValue.h
+++ b/src/gdcmElValue.h
@@ -1,15 +1,17 @@
-// gdcmElValue.h
+// $Header: /cvs/public/gdcm/src/Attic/gdcmElValue.h,v 1.5 2003/05/21 14:42:46 frog Exp $
 
 #ifndef GDCMELVALUE_H
 #define GDCMELVALUE_H
 
 #include "gdcmDictEntry.h"
+class gdcmHeader;
 
+#include <stdio.h>
 
 ///////////////////////////////////////////////////////////////////////////
 // The dicom header of a Dicom file contains a set of such ELement VALUES
 // (when successfuly parsed against a given Dicom dictionary)
-class GDCM_EXPORT ElValue {
+class GDCM_EXPORT gdcmElValue {
 private:
 	gdcmDictEntry *entry;
 	guint32 LgrElem;
@@ -17,37 +19,35 @@ private:
 	                       // elements happen to be implicit. Flag them here
 	                       // since we can't use the entry->vr without breaking
 	                       // the underlying dictionary.
+	void SetOffset(size_t of){ Offset = of; };
+   // FIXME: In fact we should be more specific and use :
+   //friend gdcmElValue * gdcmHeader::ReadNextElement(void);
+   friend class gdcmHeader;
 public:
-	string  value;
+   std::string  value;
 	size_t Offset;     // Offset from the begining of file for direct user access
 	
-	ElValue(gdcmDictEntry*);
+	gdcmElValue(gdcmDictEntry*);
 	void SetDictEntry(gdcmDictEntry *NewEntry) { entry = NewEntry; };
 	bool   IsVrUnknown(void) { return entry->IsVrUnknown(); };
 	void SetImplicitVr(void) { ImplicitVr = true; };
 	bool  IsImplicitVr(void) { return ImplicitVr; };
 	
-	guint16 GetGroup(void)   { return entry->GetGroup();  };
-	guint16 GetElement(void) { return entry->GetElement();};
-	string  GetKey(void)     { return entry->GetKey();    };
-	string  GetName(void)    { return entry->GetName();   };
-	string  GetVR(void)      { return entry->GetVR();     };
-	void    SetVR(string v)  { entry->SetVR(v);           }; 
-	void SetLength(guint32 l){ LgrElem = l;               };
-	guint32 GetLength(void)  { return LgrElem;            };
+	gdcmDictEntry * GetDictEntry(void) { return entry;    };
+	guint16      GetGroup(void)   { return entry->GetGroup();  };
+	guint16      GetElement(void) { return entry->GetElement();};
+   std::string  GetKey(void)     { return entry->GetKey();    };
+   std::string  GetName(void)    { return entry->GetName();   };
+   std::string  GetVR(void)      { return entry->GetVR();     };
+	void         SetVR(std::string v)  { entry->SetVR(v);      }; 
+	void         SetLength(guint32 l){ LgrElem = l;            };
+	guint32      GetLength(void)  { return LgrElem;            };
 	
-	// Question : SetLength est public 
-	// (sinon, on ne pourrait pas l'appeler dans ElValSet)
-	// alors que *personne* ne devrait s'en servir !
-	// c'est *forcément* la lgr de la string 'value', non?
-
-	void SetValue(string val){ value = val; };
-	string  GetValue(void)   { return value;};
+	void         SetValue(std::string val){ value = val; };
+   std::string  GetValue(void)    { return value;};
 
-	void SetOffset(size_t of){ Offset = of; };
 	size_t  GetOffset(void)  { return Offset;};
-	// Question : SetOffset est public ...
-	// Quel utilisateur serait ammené à modifier l'Offset ?
 };
 
+
 #endif