X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocument.h;h=4166b318315212890507a498e458598a19f81144;hb=016aa39f27667edc2756025e2630b09f229664fc;hp=6ebc79c9fb5041e30ebca1054c4655f49b5cfd73;hpb=c094e185dd6404df031524ccae8e1b51e3b84871;p=gdcm.git

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 6ebc79c9..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/21 11:40:55 $
-  Version:   $Revision: 1.96 $
+  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>
@@ -48,8 +49,9 @@ public:
    FileType GetFileType();
 
    std::string GetTransferSyntax();
- 
+   /// returns RLEFramesInfo 
    RLEFramesInfo *GetRLEInfo() { return RLEInfo; }
+   /// returns JPEGFragmentsInfo
    JPEGFragmentsInfo *GetJPEGInfo() { return JPEGInfo; }
 
 // Dictionaries
@@ -86,46 +88,16 @@ public:
 
 // Content entries
 
-// Oops ! Python is gonna cry : 
-// 4 methods with same name and different parameters ...
-// Only C++ is aware!
-
-   virtual bool SetEntry(std::string const &content,
-                         uint16_t group, uint16_t elem);
-   virtual bool SetEntry(uint8_t *content, int lgth,
-                         uint16_t group, uint16_t elem);
-   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);
-
-   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
@@ -227,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
@@ -254,8 +226,9 @@ private:
    uint32_t MaxSizePrintEntry;   
 
 private:
-   friend class FileHelper;
+
 };
+
 } // end namespace gdcm
 
 //-----------------------------------------------------------------------------