X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFileHelper.h;h=979292bd5794805475beb7a460ae3895a778f93f;hb=3f237ae109aef22eb58b91efe64af240e0c0d63b;hp=39348bf7ee2c82d0c7f8ed4c63de6154d35361f9;hpb=d41e99ad73d7727f9d5d50bbb976331c94564567;p=gdcm.git

diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h
index 39348bf7..979292bd 100644
--- a/src/gdcmFileHelper.h
+++ b/src/gdcmFileHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFileHelper.h,v $
   Language:  C++
-  Date:      $Date: 2005/08/19 13:15:05 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2005/10/23 15:24:47 $
+  Version:   $Revision: 1.27 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,15 +21,12 @@
 
 #include "gdcmDebug.h"
 #include "gdcmBase.h"
-//#include <iostream>
-
 
 
 namespace gdcm 
 {
 class File;
-class ValEntry;
-class BinEntry;
+class DataEntry;
 class SeqEntry;
 class PixelReadConvert;
 class PixelWriteConvert;
@@ -68,19 +65,19 @@ public:
    void SetLoadMode(int loadMode);
    void SetFileName(std::string const &fileName);
    bool Load();
-   /// to allow user to modify pixel order (e.g. Mirror, TopDown, 90°Rotate,...)
+   /// to allow user to modify pixel order (e.g. Mirror, TopDown,...)
    void SetUserFunction( VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc ) 
                         { UserFunction = userFunc; }   
    // File methods
-   bool SetValEntry(std::string const &content,
-                    uint16_t group, uint16_t elem);
-   bool SetBinEntry(uint8_t *content, int lgth,
-                    uint16_t group, uint16_t elem);
-
-   ValEntry *InsertValEntry(std::string const &content,
-                            uint16_t group, uint16_t elem);
-   BinEntry *InsertBinEntry(uint8_t *binArea, int lgth,
+   bool SetEntryString(std::string const &content,
+                           uint16_t group, uint16_t elem);
+   bool SetEntryBinArea(uint8_t *content, int lgth,
                             uint16_t group, uint16_t elem);
+
+   DataEntry *InsertEntryString(std::string const &content,
+                                       uint16_t group, uint16_t elem);
+   DataEntry *InsertEntryBinArea(uint8_t *binArea, int lgth,
+                                        uint16_t group, uint16_t elem);
    SeqEntry *InsertSeqEntry(uint16_t group, uint16_t elem);
 
    // File helpers
@@ -114,31 +111,33 @@ public:
 
    /// \brief Tells the writer we want to keep 'Grey pixels + Palettes color'
    ///        when possible (as opposed to convert 'Palettes color' to RGB)
-   void SetWriteModeToRaw()           { SetWriteMode(WMODE_RAW);  };
+   void SetWriteModeToRaw()           { SetWriteMode(WMODE_RAW);  }
    /// \brief Tells the writer we want to write RGB image when possible
    ///        (as opposed to 'Grey pixels + Palettes color')
-   void SetWriteModeToRGB()           { SetWriteMode(WMODE_RGB);  };
+   void SetWriteModeToRGB()           { SetWriteMode(WMODE_RGB);  }
    /// \brief Sets the Write Mode ( )
-   void SetWriteMode(FileMode mode)   { WriteMode = mode;         };
+   void SetWriteMode(FileMode mode)   { WriteMode = mode;         }
    /// \brief Gets the Write Mode ( )
-   FileMode GetWriteMode()            { return WriteMode;         };
+   FileMode GetWriteMode()            { return WriteMode;         }
 
    // Write format
 
    /// \brief Tells the writer we want to write as Implicit VR
-   void SetWriteTypeToDcmImplVR()     { SetWriteType(ImplicitVR); };
+   void SetWriteTypeToDcmImplVR()     { SetWriteType(ImplicitVR); }
    /// \brief Tells the writer we want to write as Explicit VR
-   void SetWriteTypeToDcmExplVR()     { SetWriteType(ExplicitVR); };
+   void SetWriteTypeToDcmExplVR()     { SetWriteType(ExplicitVR); }
    /// \brief Tells the writer we want to write as ACR-NEMA
-   void SetWriteTypeToAcr()           { SetWriteType(ACR);        };
+   void SetWriteTypeToAcr()           { SetWriteType(ACR);        }
    /// \brief Tells the writer we want to write as LibIDO
-   void SetWriteTypeToAcrLibido()     { SetWriteType(ACR_LIBIDO); };
+   void SetWriteTypeToAcrLibido()     { SetWriteType(ACR_LIBIDO); }
+   /// \brief Tells the writer we want to write as JPEG   
+   void SetWriteTypeToJPEG()          { SetWriteType(JPEG);       }
    /// \brief Tells the writer which format we want to write
    /// (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO)
-   void SetWriteType(FileType format) { WriteType = format;       };
+   void SetWriteType(FileType format) { WriteType = format;       }
    /// \brief Gets the format we talled the write we wanted to write
-   ///   (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO)
-   FileType GetWriteType()            { return WriteType;         };
+   /// (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO)
+   FileType GetWriteType()            { return WriteType;         }
 
    // Write pixels of ONE image on hard drive
    // No test is made on processor "endianness"
@@ -157,6 +156,7 @@ protected:
    void RestoreWrite();
 
    void SetWriteFileTypeToACR();
+   void SetWriteFileTypeToJPEG();
    void SetWriteFileTypeToExplicitVR();
    void SetWriteFileTypeToImplicitVR();
    void RestoreWriteFileType();
@@ -165,10 +165,12 @@ protected:
    void SetWriteToNoLibido();
    void RestoreWriteOfLibido();
 
-   ValEntry *CopyValEntry(uint16_t group, uint16_t elem);
-   BinEntry *CopyBinEntry(uint16_t group, uint16_t elem, 
-                          const std::string &vr);
+   DataEntry *CopyDataEntry(uint16_t group, uint16_t elem, 
+                               const TagName &vr = GDCM_VRUNKNOWN);
    void CheckMandatoryElements();
+   void CheckMandatoryEntry(uint16_t group, uint16_t elem, std::string value);
+   void SetMandatoryEntry(uint16_t group, uint16_t elem, std::string value);
+   void CopyMandatoryEntry(uint16_t group, uint16_t elem, std::string value);
    void RestoreWriteMandatory();
 
 private: