* src/gdcmFile.h : bug fix. Variable type and variable name had same name

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 7637b7bd8d489cc2bf98f3765737c67c5bccc5a2..f72484188d77d0a8363eaa7d4f457398996aed20 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/26 10:55:04 $
-  Version:   $Revision: 1.78 $
+  Date:      $Date: 2004/12/04 09:41:02 $
+  Version:   $Revision: 1.84 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,12 +20,15 @@
 #define GDCMFILE_H
 
 #include "gdcmCommon.h"
-#include "gdcmHeader.h"
-#include "gdcmPixelConvert.h"
-#include "gdcmDocEntryArchive.h"
 
 namespace gdcm 
 {
+class Header;
+class ValEntry;
+class BinEntry;
+class PixelReadConvert;
+class PixelWriteConvert;
+class DocEntryArchive;
 //-----------------------------------------------------------------------------
 /*
  * In addition to Dicom header exploration, this class is designed
@@ -35,20 +38,12 @@ namespace gdcm
 class GDCM_EXPORT File
 {
 public:
-   enum TWriteMode
+   enum FileMode
    {
-      WMODE_NATIVE,
       WMODE_DECOMPRESSED,
       WMODE_RGB
    };
      
-   enum TWriteType
-   {
-      WTYPE_IMPL_VR,
-      WTYPE_EXPL_VR,
-      WTYPE_ACR
-   };
-     
 public:
    File( Header* header );
    File( std::string const& filename );
@@ -61,9 +56,6 @@ public:
    size_t GetImageDataSize();
    size_t GetImageDataRawSize();
 
-   /// Accessor to \ref PixelConverter
-   PixelConvert* GetPixelConverter() { return PixelConverter; };
-
    uint8_t* GetImageData();
    uint8_t* GetImageDataRaw();
    size_t GetImageDataIntoVector(void* destination, size_t maxSize);
@@ -79,45 +71,40 @@ public:
    bool WriteAcr      (std::string const& fileName);
    bool Write(std::string const& fileName);
 
-   virtual bool SetEntryByNumber(std::string const& content,
-                                 uint16_t group, uint16_t element)
-   { 
-      HeaderInternal->SetEntryByNumber(content,group,element);
-      return true;
-   }
+   bool SetEntryByNumber(std::string const& content,
+                                uint16_t group, uint16_t element);
    uint8_t* GetLutRGBA();
 
    // Write mode
-   void SetWriteModeToNative()          { SetWriteMode(WMODE_NATIVE); };
-   void SetWriteModeToDecompressed()    { SetWriteMode(WMODE_DECOMPRESSED); };
-   void SetWriteModeToRGB()             { SetWriteMode(WMODE_RGB); };
-   void SetWriteMode(unsigned int mode) { WriteMode = mode; };
-   unsigned int GetWriteMode()          { return WriteMode; };
+   void SetWriteModeToDecompressed() { SetWriteMode(WMODE_DECOMPRESSED); };
+   void SetWriteModeToRGB()          { SetWriteMode(WMODE_RGB); };
+   void SetWriteMode(FileMode mode)  { WriteMode = mode; };
+   FileMode GetWriteMode()           { return WriteMode; };
 
    // Write format
-   void SetWriteTypeToDcmImplVR()         { SetWriteType(WTYPE_EXPL_VR); };
-   void SetWriteTypeToDcmExplVR()         { SetWriteType(WTYPE_EXPL_VR); };
-   void SetWriteTypeToAcr()               { SetWriteType(WTYPE_ACR); };
-   void SetWriteType(unsigned int format) { WriteType = format; };
-   unsigned int GetWriteType()            { return WriteType; };
+   void SetWriteTypeToDcmImplVR()     { SetWriteType(ImplicitVR); };
+   void SetWriteTypeToDcmExplVR()     { SetWriteType(ExplicitVR); };
+   void SetWriteTypeToAcr()           { SetWriteType(ACR); };
+   void SetWriteTypeToAcrLibido()     { SetWriteType(ACR_LIBIDO); };
+   void SetWriteType(FileType format) { WriteType = format; };
+   FileType GetWriteType()            { return WriteType; };
 
 protected:
-   bool WriteBase(std::string const& fileName, FileType type);
+   bool WriteBase(std::string const& fileName);
    bool CheckWriteIntegrity();
 
-   void SetWriteToNative();
    void SetWriteToDecompressed();
    void SetWriteToRGB();
    void RestoreWrite();
 
    void SetWriteFileTypeToACR();
-   void SetWriteFileTypeToACRLibido();
    void SetWriteFileTypeToExplicitVR();
    void SetWriteFileTypeToImplicitVR();
    void RestoreWriteFileType();
 
    void SetWriteToLibido();
-   void RestoreWriteFromLibido();
+   void SetWriteToNoLibido();
+   void RestoreWriteOfLibido();
 
    ValEntry* CopyValEntry(uint16_t group,uint16_t element);
    BinEntry* CopyBinEntry(uint16_t group,uint16_t element);
@@ -143,33 +130,15 @@ private:
    bool Parsed;
 
    /// Utility pixel converter
-   PixelConvert* PixelConverter;
+   PixelReadConvert* PixelReadConverter;
+   PixelWriteConvert* PixelWriteConverter;
 
    // Utility header archive
    DocEntryArchive *Archive;
 
    // Write variables
-   unsigned int WriteMode;
-   unsigned int WriteType;
-
-/// FIXME
-// --------------- Will be moved to a PixelData class
-//
-
-   /// \brief to hold the Pixels (when read)
-   uint8_t* Pixel_Data;  // (was PixelData)
-   
-   /// \brief Size (in bytes) of requited memory to hold the the pixels
-   ///        of this image in it's RGB convertion either from:
-   ///        - Plane R, Plane G, Plane B 
-   ///        - Grey Plane + Palette Color
-   ///        - YBR Pixels (or from RGB Pixels, as well) 
-   size_t ImageDataSize;
-       
-//
-// --------------- end of future PixelData class
-// 
-
+   FileMode WriteMode;
+   FileType WriteType;
 };
 } // end namespace gdcm