X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=4166b318315212890507a498e458598a19f81144;hb=b1ab6f0e358f0fe1894b0198c7e0b57440e13c72;hp=d5ae4e04e80efc54e2521ed2737c21f17a831d1e;hpb=4210e3a97df19bf964da287698f8c7997755015a;p=gdcm.git

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index d5ae4e04..4166b318 100644
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/20 11:07:07 $
-  Version:   $Revision: 1.93 $
+  Date:      $Date: 2005/01/25 15:44:24 $
+  Version:   $Revision: 1.101 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,6 +22,7 @@
 #include "gdcmVR.h"
 #include "gdcmDict.h"
 #include "gdcmElementSet.h"
+#include "gdcmException.h"
 
 #include <map>
 #include <list>
@@ -38,18 +39,19 @@ class JPEGFragmentsInfo;
 
 //-----------------------------------------------------------------------------
 /**
- * \brief Derived by both Header and DicomDir
+ * \brief Derived by both gdcm::File and gdcm::DicomDir
  */
 class GDCM_EXPORT Document : public ElementSet
 {
 public:
-// Informations contained in the parser
+// Informations contained in the gdcm::Document
    virtual bool IsReadable();
    FileType GetFileType();
 
    std::string GetTransferSyntax();
- 
+   /// returns RLEFramesInfo 
    RLEFramesInfo *GetRLEInfo() { return RLEInfo; }
+   /// returns JPEGFragmentsInfo
    JPEGFragmentsInfo *GetJPEGInfo() { return JPEGInfo; }
 
 // Dictionaries
@@ -65,10 +67,10 @@ public:
    /// 'Swap code' accessor (see \ref SwapCode )
    int GetSwapCode() { return SwapCode; }
    // System access (meaning endian related !?)
-   uint16_t SwapShort(uint16_t);   // needed by File
-   uint32_t SwapLong(uint32_t);    // needed by File
-   uint16_t UnswapShort(uint16_t); // needed by File
-   uint32_t UnswapLong(uint32_t);  // needed by File
+   uint16_t SwapShort(uint16_t);   // needed by Document
+   uint32_t SwapLong(uint32_t);    // needed by Document
+   uint16_t UnswapShort(uint16_t); // needed by Document
+   uint32_t UnswapLong(uint32_t);  // needed by Document
    
 // Ordering of Documents
    bool operator<(Document &document);
@@ -86,53 +88,22 @@ public:
 
 // Content entries
 
-   virtual bool SetEntry(std::string const &content,
-                         uint16_t group, uint16_t element);
-   virtual bool SetEntry(uint8_t *content, int lgth,
-                         uint16_t group, uint16_t element);
-   virtual bool SetEntry(std::string const &content, ValEntry *entry);
-   virtual bool SetEntry(uint8_t *content, int lgth, BinEntry *entry);
-
-   virtual void *GetEntryBinArea(uint16_t group, uint16_t elem);   
-
-   virtual std::string GetEntry  (uint16_t group, uint16_t elem);
-   virtual std::string GetEntryVR(uint16_t group, uint16_t elem);
-   virtual int GetEntryLength(uint16_t group, uint16_t elem);
-
-   DocEntry *GetDocEntry(uint16_t group, uint16_t element);
-   ValEntry *GetValEntry(uint16_t group, uint16_t element);
-   BinEntry *GetBinEntry(uint16_t group, uint16_t element);
-   SeqEntry *GetSeqEntry(uint16_t group, uint16_t element);
-
-   ValEntry *ReplaceOrCreate(std::string const &value,
-                             uint16_t group, uint16_t elem,
-                             TagName const &vr = GDCM_UNKNOWN);
-   BinEntry *ReplaceOrCreate(uint8_t* binArea, int lgth,
-                             uint16_t group, uint16_t elem,
-                             TagName const &vr = GDCM_UNKNOWN);
-   SeqEntry *ReplaceOrCreate(uint16_t group, uint16_t elem);
-
-   bool ReplaceIfExist(std::string const &value,
-                       uint16_t group, uint16_t elem );
-
-   bool CheckIfEntryExist(uint16_t group, uint16_t elem );
-   
    virtual void LoadEntryBinArea(uint16_t group, uint16_t elem);
    virtual void LoadEntryBinArea(BinEntry *entry);
 
    void LoadDocEntrySafe(DocEntry *entry);
-   /*TagDocEntryHT *BuildFlatHashTable();*/
 
    /// Return the Transfer Syntax as a string
    std::string GetTransferSyntaxName();
 
    bool IsDicomV3();
+   bool IsPapyrus();
 
 protected:
 // Methods
    // Constructor and destructor are protected to forbid end user 
-   // to instanciate from this class Document (only Header and
-   // DicomDir are meaningfull).
+   // to instanciate from this class Document (only gdcm::File and
+   // gdcm::DicomDir are meaningfull).
    Document();
    Document( std::string const &filename );
    virtual ~Document();
@@ -162,13 +133,13 @@ protected:
    /// the well known 'Bad Big Endian' and 'Bad Little Endian' codes
    int SwapCode;
 
-   ///\brief whether we already parsed group 0002
+   ///\brief whether we already parsed group 0002 (Meta Elements)
    bool Group0002Parsed;
 
    ///\brief whether file has a DCM Preamble
    bool HasDCMPreamble;
 
-   /// File Pointer, opened during Header parsing.
+   /// File Pointer, opened during Document parsing.
    std::ifstream *Fp;
 
    /// ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown
@@ -228,11 +199,11 @@ private:
    // DocEntry related utilities
    DocEntry *ReadNextDocEntry();
 
-   uint32_t GenerateFreeTagKeyInGroup(uint16_t group);
-/*   void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT,
-                                   DocEntrySet* set );*/
+//  uint32_t GenerateFreeTagKeyInGroup(uint16_t group);
+//  void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT,
+//                                   DocEntrySet *set );
 
-   void HandleBrokenEndian(uint16_t &group, uint16_t &elem);
+   void HandleBrokenEndian  (uint16_t &group, uint16_t &elem);
    void HandleOutOfGroup0002(uint16_t &group, uint16_t &elem);
 
 // Variables
@@ -255,8 +226,9 @@ private:
    uint32_t MaxSizePrintEntry;   
 
 private:
-   friend class File;
+
 };
+
 } // end namespace gdcm
 
 //-----------------------------------------------------------------------------