* src/gdcmFile.cxx : bug fix under Window after JPR commit

[gdcm.git] / src / gdcmHeader.h

diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h
index 5ee21488d96cffacc019d4f86fe71b061743d912..1657e70c0c343a32ef64e957a85a83d0b560f429 100644 (file)
--- a/src/gdcmHeader.h
+++ b/src/gdcmHeader.h
@@ -1,11 +1,12 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.25 2003/05/21 16:26:28 regrain Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.32 2003/07/02 16:47:22 jpr Exp $
 
 #ifndef GDCMHEADER_H
 #define GDCMHEADER_H
 
 #include <map>
 #include "gdcmCommon.h"
-#include "gdcmUtil.h"
+#include "gdcmVR.h"
+#include "gdcmTS.h"
 #include "gdcmException.h"
 #include "gdcmDictSet.h"
 #include "gdcmElValue.h"
@@ -45,6 +46,9 @@ private:
    /// Optional "shadow dictionary" (private elements) used to parse this
    /// header
    gdcmDict* RefShaDict;
+   /// Pointer to the Transfert Syntax Hash Table which contains all
+   /// the TS of the DICOM version3 public dictionary. 
+   gdcmTS *dicom_ts;     // Not a class member for thread-safety reasons
 
    /// ELement VALueS parsed with the PUBlic dictionary.
    gdcmElValSet PubElValSet;
@@ -81,12 +85,12 @@ private:
    void SetMaxSizeLoadElementValue(long);
 
    gdcmDictEntry * GetDictEntryByNumber(guint16, guint16);
-   gdcmDictEntry * GetDictEntryByName(std::string name);
+   gdcmDictEntry * GetDictEntryByName(std::string Name);
 
    // ElValue related utilities
    gdcmElValue * ReadNextElement(void);
    gdcmElValue * NewElValueByNumber(guint16 group, guint16 element);
-   gdcmElValue * NewElValueByName(std::string name);
+   gdcmElValue * NewElValueByName(std::string Name);
 
    void FindLength(gdcmElValue *);
    void FindVR(gdcmElValue *);
@@ -102,6 +106,7 @@ protected:
    FileType filetype;
    
    gdcmElValue * GetElValueByNumber(guint16 group, guint16 element);
+   int CheckIfExistByNumber(guint16 Group, guint16 Elem );
 
    guint16 SwapShort(guint16); // needed by gdcmFile
    guint32 SwapLong(guint32);  // for JPEG Files :-(
@@ -126,6 +131,7 @@ public:
    virtual void ParseHeader(bool exception_on_error = false)
      throw(gdcmFormatError);
    gdcmHeader(const char *filename, bool exception_on_error = false);
+   gdcmHeader( bool exception_on_error = false);
    virtual ~gdcmHeader();
    
    size_t GetPixelOffset(void);
@@ -136,9 +142,9 @@ public:
    // an additional specific dictionary to access extra information.
    // TODO Swig int SetShaDict(std::string filename);
 
-   std::string GetPubElValByName(std::string TagName);
-   std::string GetPubElValByNumber(guint16 group, guint16 element);
-   std::string GetPubElValRepByName(std::string TagName);
+   std::string GetPubElValByName     (std::string TagName);
+   std::string GetPubElValRepByName  (std::string TagName);
+   std::string GetPubElValByNumber   (guint16 group, guint16 element);
    std::string GetPubElValRepByNumber(guint16 group, guint16 element);
 
    TagElValueHT & GetPubElVal(void) { return PubElValSet.GetTagHt(); };
@@ -146,30 +152,49 @@ public:
    void   PrintPubDict (std::ostream & os = std::cout);
      
    // TODO Swig std::string* GetShaTagNames(); 
-   std::string GetShaElValByName(std::string TagName);
-   std::string GetShaElValByNumber(guint16 group, guint16 element);
-   std::string GetShaElValRepByName(std::string TagName);
+   std::string GetShaElValByName     (std::string TagName);
+   std::string GetShaElValRepByName  (std::string TagName);
+   std::string GetShaElValByNumber   (guint16 group, guint16 element);
    std::string GetShaElValRepByNumber(guint16 group, guint16 element);
 
-   std::string GetElValByName(std::string TagName);
-   std::string GetElValByNumber(guint16 group, guint16 element);
-   std::string GetElValRepByName(std::string TagName);
+   std::string GetElValByName     (std::string TagName);
+   std::string GetElValRepByName  (std::string TagName);
+   std::string GetElValByNumber   (guint16 group, guint16 element);
    std::string GetElValRepByNumber(guint16 group, guint16 element);
 
-   int SetPubElValByName(std::string content, std::string TagName);
+   int SetPubElValByName  (std::string content, std::string TagName);
+   int SetShaElValByName  (std::string content, std::string ShadowTagName);
+   
    int SetPubElValByNumber(std::string content, guint16 group, guint16 element);
-   int SetShaElValByName(std::string content, std::string ShadowTagName);
    int SetShaElValByNumber(std::string content, guint16 group, guint16 element);
    
    int SetPubElValLengthByNumber(guint32 lgr, guint16 group, guint16 element);                                   
-   int ReplaceOrCreateByNumber(std::string Value, guint16 Group, guint16 Elem);                                
+
+   int ReplaceOrCreateByNumber(std::string Value, guint16 Group, guint16 Elem); 
+   int ReplaceOrCreateByNumber(     char * Value, guint16 Group, guint16 Elem);                                
+                               
    int GetXSize(void);  
    int GetYSize(void);
-   int GetZSize(void);       
+   int GetZSize(void);
+   int GetBitsStored(void);
+   int GetSamplesPerPixel(void);
+   
+/* ================ COMMENT OUT after unfreeze
+   int GetPlanarConfiguration(void);
+   ======================================= */
+
    int GetPixelSize(void);       
    std::string GetPixelType(void);  
-   int Write(FILE *, FileType);
    
+   float GetXSpacing(void);
+   float GetYSpacing(void);  
+   float GetZSpacing(void);  
+  
+   float GetXImagePosition(void);
+   float GetYImagePosition(void);
+   float GetZImagePosition(void);
+   
+   int Write(FILE *, FileType);
 };
 
 #endif