* Update Windows projects and .cvsignore files

[gdcm.git] / src / gdcmHeader.h

diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h
index 684054b5e2bfa1ed66c57c59eb1b0be6733f5933..9d704b5ae8d87cea8c974fbd869f5f87b9fffc5f 100644 (file)
--- a/src/gdcmHeader.h
+++ b/src/gdcmHeader.h
@@ -1,9 +1,8 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.36 2003/07/29 09:35:51 malaterre Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.44 2003/11/13 10:23:40 malaterre Exp $
 
 #ifndef GDCMHEADER_H
 #define GDCMHEADER_H
 
-#include <map>
 #include "gdcmCommon.h"
 #include "gdcmVR.h"
 #include "gdcmTS.h"
@@ -11,6 +10,7 @@
 #include "gdcmDictSet.h"
 #include "gdcmElValue.h"
 #include "gdcmElValSet.h"
+#include <map>
 
 typedef std::string VRKey;
 typedef std::string VRAtr;
@@ -40,12 +40,12 @@ private:
    /// the VR of the DICOM version3 public dictionary. 
    gdcmVR *dicom_vr;     // Not a class member for thread-safety reasons
    /// Pointer to global dictionary container
-   gdcmDictSet* Dicts;   // Not a class member for thread-safety reasons
+   gdcmDictSet *Dicts;   // Not a class member for thread-safety reasons
    /// Public dictionary used to parse this header
-   gdcmDict* RefPubDict;
+   gdcmDict *RefPubDict;
    /// Optional "shadow dictionary" (private elements) used to parse this
    /// header
-   gdcmDict* RefShaDict;
+   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
@@ -56,7 +56,9 @@ private:
    gdcmElValSet ShaElValSet;
    /// Refering underlying filename.
    std::string filename; 
-   
+  
+   int enableSequences;
+     
    // FIXME sw should be an enum e.g.
    //enum EndianType {
       //LittleEndian, 
@@ -85,20 +87,20 @@ 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 *);
-   void LoadElementValue(gdcmElValue *);
+   void FindLength          (gdcmElValue *);
+   void FindVR              (gdcmElValue *);
+   void LoadElementValue    (gdcmElValue *);
    void LoadElementValueSafe(gdcmElValue *);
-   void SkipElementValue(gdcmElValue *);
-   void FixFoundLength(gdcmElValue*, guint32);
-   bool IsAnInteger(gdcmElValue *);
+   void SkipElementValue    (gdcmElValue *);
+   void FixFoundLength      (gdcmElValue*, guint32);
+   bool IsAnInteger         (gdcmElValue *);
    void LoadElements(void);
    
 protected:
@@ -132,13 +134,19 @@ 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);
+   gdcmHeader(const char *filename, 
+              bool  exception_on_error = false, 
+             bool  enable_sequences   = false);
+             
    virtual ~gdcmHeader();
 
    std::string GetFileName(void) {return filename;}
    
    size_t GetPixelOffset(void);
+   size_t GetPixelAreaLength(void);
+
    int    GetSwapCode(void) { return sw; }
 
    // TODO Swig int SetPubDict(std::string filename);
@@ -155,6 +163,8 @@ public:
    void * GetPubElValVoidAreaByNumber(guint16 Group, guint16 Elem);   
    void * LoadElementVoidArea(guint16 Group, guint16 Element);
    
+   ListTag & GetListElem(void) { return PubElValSet.GetListElem(); };
+
    TagElValueHT & GetPubElVal(void) { return PubElValSet.GetTagHt(); };
    void   PrintPubElVal(std::ostream & os = std::cout);
    void   PrintPubDict (std::ostream & os = std::cout);
@@ -190,6 +200,7 @@ public:
    int GetYSize(void);
    int GetZSize(void);
    int GetBitsStored(void);
+   int GetBitsAllocated(void);
    int GetSamplesPerPixel(void);
    
    int GetPlanarConfiguration(void);
@@ -197,21 +208,10 @@ public:
    int GetPixelSize(void);       
    std::string GetPixelType(void);  
    
-   float GetXSpacing(void);
-   float GetYSpacing(void);  
-   float GetZSpacing(void);  
-  
-   float GetXImagePosition(void);
-   float GetYImagePosition(void);
-   float GetZImagePosition(void);
-   
    std::string GetTransferSyntaxName(void);
-   int    GetLUTLength(void);
+   int    HasLUT(void);
    int    GetLUTNbits(void);
-   void * GetLUTRed(void);
-   void * GetLUTGreen(void);
-   void * GetLUTBlue(void);
-   void * GetLUTRGB(void);
+   unsigned char * GetLUTRGBA(void);
            
 
 };