* src/gdcmFile.[h|cxx] : now use FileType instead of TWriteType.

   -- BeNours

diff --git a/ChangeLog b/ChangeLog
index a8ec06e0dadca9fc85f6c698bb536bf36cd0f315..30933f92bcbfcfd093d86a023ece6a13d56452b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2004-12-03 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+   * src/gdcmFile.[h|cxx] : now use FileType instead of TWriteType.
+
 2004-12-03 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
    * src/gdcmPixelWriteConvert.[h|cxx] : new class to write datas (and in the
      future, with convertion)

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index f582c483d5074b45d051bc97d5c7a68689322d05..45aaa81e3d3e3d4ca439c7244654e43417acff68 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 11:55:38 $
-  Version:   $Revision: 1.169 $
+  Date:      $Date: 2004/12/03 14:22:40 $
+  Version:   $Revision: 1.170 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -77,7 +77,7 @@ File::File(std::string const & filename )
 void File::Initialise()
 {
    WriteMode = WMODE_DECOMPRESSED;
-   WriteType = WTYPE_IMPL_VR;
+   WriteType = ImplicitVR;
 
    PixelReadConverter = new PixelReadConvert;
    PixelWriteConverter = new PixelWriteConvert;
@@ -372,16 +372,7 @@ bool File::WriteAcr (std::string const & fileName)
 
 bool File::Write(std::string const& fileName)
 {
-   switch(WriteType)
-   {
-      case WTYPE_IMPL_VR:
-         return WriteBase(fileName,ImplicitVR);
-      case WTYPE_EXPL_VR:
-         return WriteBase(fileName,ExplicitVR);
-      case WTYPE_ACR:
-         return WriteBase(fileName,ACR);
-   }
-   return(false);
+   return WriteBase(fileName);
 }
 
 /**
@@ -402,9 +393,9 @@ uint8_t* File::GetLutRGBA()
  * @param  type file type (ExplicitVR, ImplicitVR, ...)
  * @return false if write fails
  */
-bool File::WriteBase (std::string const & fileName, FileType type)
+bool File::WriteBase (std::string const & fileName)
 {
-   switch(type)
+   switch(WriteType)
    {
       case ImplicitVR:
          SetWriteFileTypeToImplicitVR();
@@ -428,7 +419,7 @@ bool File::WriteBase (std::string const & fileName, FileType type)
    // just before writting ...
    /// \todo the best trick would be *change* the recognition code
    ///       but pb expected if user deals with, e.g. COMPLEX images
-   if( type == ACR_LIBIDO )
+   if( WriteType == ACR_LIBIDO )
    {
       SetWriteToLibido();
    }
@@ -451,7 +442,7 @@ bool File::WriteBase (std::string const & fileName, FileType type)
    bool check = CheckWriteIntegrity();
    if(check)
    {
-      check = HeaderInternal->Write(fileName,type);
+      check = HeaderInternal->Write(fileName,WriteType);
    }
 
    RestoreWrite();

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index c9bb596e3170cc4658e8ac2f4ca12b28c5d3cff3..f87a1a9e548a05420957fc491514d984ed0c3962 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/12/03 11:55:38 $
-  Version:   $Revision: 1.81 $
+  Date:      $Date: 2004/12/03 14:22:40 $
+  Version:   $Revision: 1.82 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -36,19 +36,12 @@ namespace gdcm
 class GDCM_EXPORT File
 {
 public:
-   enum TWriteMode
+   enum WriteMode
    {
       WMODE_DECOMPRESSED,
       WMODE_RGB
    };
      
-   enum TWriteType
-   {
-      WTYPE_IMPL_VR,
-      WTYPE_EXPL_VR,
-      WTYPE_ACR
-   };
-     
 public:
    File( Header* header );
    File( std::string const& filename );
@@ -85,20 +78,21 @@ public:
    uint8_t* GetLutRGBA();
 
    // Write mode
-   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(WriteMode mode) { WriteMode = mode; };
+   WriteMode 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 SetWriteToDecompressed();
@@ -145,8 +139,8 @@ private:
    DocEntryArchive *Archive;
 
    // Write variables
-   unsigned int WriteMode;
-   unsigned int WriteType;
+   WriteMode WriteMode;
+   FileType WriteType;
 };
 } // end namespace gdcm