ENH: * Huge cleanup:

[gdcm.git] / src / gdcmDocument.h

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 26cca8c810869e2505bd9dc560e20c6bb97f1dfe..2df5f0bedcb205dcfdee6acdc49820168b3e529e 100644 (file)
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/15 16:12:30 $
-  Version:   $Revision: 1.58 $
+  Date:      $Date: 2004/12/03 20:16:58 $
+  Version:   $Revision: 1.67 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,30 +19,26 @@
 #ifndef GDCMDOCUMENT_H
 #define GDCMDOCUMENT_H
 
-#include "gdcmCommon.h"
 #include "gdcmVR.h"
-#include "gdcmTS.h"
-#include "gdcmException.h"
-#include "gdcmDictSet.h"
-#include "gdcmDocEntry.h"
-#include "gdcmRLEFramesInfo.h"
-#include "gdcmJPEGFragmentsInfo.h"
-#include "gdcmDocEntrySet.h"
+#include "gdcmDict.h"
 #include "gdcmElementSet.h"
 
-class ValEntry;
-class BinEntry;
-class SeqEntry;
-
 #include <map>
 #include <list>
 #include <fstream>
 
 namespace gdcm 
 {
+class ValEntry;
+class BinEntry;
+class SeqEntry;
+class Dict;
+class RLEFramesInfo;
+class JPEGFragmentsInfo;
 
 enum TransferSyntaxType {
   ImplicitVRLittleEndian = 0,
+  ImplicitVRLittleEndianDLXGE,
   ExplicitVRLittleEndian,
   DeflatedExplicitVRLittleEndian,
   ExplicitVRBigEndian,
@@ -149,15 +145,15 @@ public:
    std::ifstream * OpenFile();
    bool CloseFile();
 
-   void Write( std::ofstream* fp, FileType type );
+   void WriteContent( std::ofstream* fp, FileType type );
 
    ValEntry* ReplaceOrCreateByNumber(std::string const & value,
                                      uint16_t group, uint16_t elem,
-                                     std::string const & vr = "unkn");
+                                     TagName const & vr = "unkn");
    
    BinEntry* ReplaceOrCreateByNumber(uint8_t* binArea, int lgth,
                                      uint16_t group, uint16_t elem,
-                                     std::string const & vr = "unkn");
+                                     TagName const & vr = "unkn");
 
    SeqEntry* ReplaceOrCreateByNumber(uint16_t group, uint16_t elem);
 
@@ -173,6 +169,8 @@ public:
    uint16_t UnswapShort(uint16_t); // needed by File
    uint32_t UnswapLong(uint32_t);  // needed by File
 
+   static std::string GetTransferSyntaxValue(TransferSyntaxType type);
+
 protected:
    // Constructor and destructor are protected to forbid end user 
    // to instanciate from this class Document (only Header and
@@ -194,24 +192,33 @@ public:
    virtual int     GetEntryLengthByNumber(uint16_t group, uint16_t elem);
 //protected:
    virtual bool SetEntryByName  (std::string const & content, 
-                                 std::string const & tagName);
+                                 TagName const & tagName );
    virtual bool SetEntryByNumber(std::string const & content,
                                  uint16_t group, uint16_t element);
    virtual bool SetEntryByNumber(uint8_t* content, int lgth,
                                  uint16_t group, uint16_t element);
-   virtual bool SetEntryLengthByNumber(uint32_t length,
-                                       uint16_t group, uint16_t element);
-
-   virtual size_t GetEntryOffsetByNumber (uint16_t group, uint16_t elem);
+   // FIXME
+   // Verify the usefull of this method... otherwise remove it
+   // It's body is commented in the .xx
+   //virtual bool SetEntryLengthByNumber(uint32_t length,
+   //                                    uint16_t group, uint16_t element);
+
+   // FIXME
+   // Verify the usefull of this method... otherwise remove it
+   // It's body is commented in the .xx
+   // virtual size_t GetEntryOffsetByNumber(uint16_t group, uint16_t elem);
    virtual void* GetEntryBinAreaByNumber(uint16_t group, uint16_t elem);   
-   virtual bool  SetEntryBinAreaByNumber(uint8_t* a, uint16_t group,
-                                                   uint16_t elem);
+   // FIXME
+   // Verify the usefull of this method... otherwise remove it
+   // It's body is commented in the .xx
+   //virtual bool  SetEntryBinAreaByNumber(uint8_t* a, uint16_t group,
+   //                                                uint16_t elem);
 
    virtual void UpdateShaEntries();
 
    // Header entry
    DocEntry* GetDocEntryByNumber(uint16_t group, uint16_t element); 
-   DocEntry* GetDocEntryByName  (std::string const & tagName);
+   DocEntry* GetDocEntryByName  (TagName const & tagName);
 
    ValEntry* GetValEntryByNumber(uint16_t group, uint16_t element); 
    //BinEntry* GetBinEntryByNumber(uint16_t group, uint16_t element); 
@@ -261,7 +268,7 @@ private:
    void BuildFlatHashTableRecurse( TagDocEntryHT& builtHT,
                                    DocEntrySet* set );
 
-   void HandleBrokenEndian(uint16_t group, uint16_t elem);
+   void HandleBrokenEndian(uint16_t  group, uint16_t  elem);
 public:
 // Accessors:
    /// Accessor to \ref PrintLevel
@@ -276,9 +283,6 @@ public:
    /// 'Swap code' accessor (see \ref SwapCode )
    int GetSwapCode() { return SwapCode; }
    
-   /// File pointer
-   std::ifstream * GetFP() { return Fp; }
-
    bool operator<(Document &document);
 
 };