* src/ : fix compilation warnings for the Write method (2 different

     proto). So Rename 'Write(ifstream* fp' into 'WriteContent(ifstream* fp'
   -- BeNours

diff --git a/ChangeLog b/ChangeLog
index 2a5ed92ab46f9f25dacf97ee46aa931d64511e1d..8cb9721c7e164cc7493818b75458c757918dda5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+   * src/ : fix compilation warnings for the Write method (2 different 
+     proto). So Rename 'Write(ifstream* fp' into 'WriteContent(ifstream* fp'
+
 2004-11-25 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
    * src/gdcmDocument.[h|cxx] : set the Transfert Syntax values to the header
      file, to be accessed by other files (like gdcmFile). Remove commented

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 10fc9898cad6e9e771fdb386fc02348c407dccad..d92bf991fad9f2e0a5af7755654300d52928e147 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 16:39:18 $
-  Version:   $Revision: 1.38 $
+  Date:      $Date: 2004/11/25 15:46:10 $
+  Version:   $Revision: 1.39 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -105,9 +105,9 @@ void BinEntry::Print(std::ostream &os)
  * @param fp already open file pointer
  * @param filetype type of the file to be written
 */
-void BinEntry::Write(std::ofstream* fp, FileType filetype)
+void BinEntry::WriteContent(std::ofstream* fp, FileType filetype)
 {
-   DocEntry::Write(fp, filetype);
+   DocEntry::WriteContent(fp, filetype);
    void* binArea = GetBinArea();
    int lgr = GetLength();
    if (binArea)

diff --git a/src/gdcmBinEntry.h b/src/gdcmBinEntry.h
index f79e3e34438c427f22cfb7a3ec0026fd95f29b35..3f1c865b169116e36b8254ec38287cade7114348 100644 (file)
--- a/src/gdcmBinEntry.h
+++ b/src/gdcmBinEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 16:20:23 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2004/11/25 15:46:10 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -42,7 +42,7 @@ public:
    ~BinEntry();
    
    void Print( std::ostream &os = std::cout );
-   void Write( std::ofstream*, FileType );
+   void WriteContent( std::ofstream*, FileType );
 
    /// \brief Returns the area value of the current Dicom Header Entry
    ///  when it's not string-translatable (e.g : a LUT table)         

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 28160d5c3c4aedb045a16bde682cb4e8ed19a4ad..a3681e01a79d267ef26f23e23463631b2a3e7825 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 16:20:23 $
-  Version:   $Revision: 1.81 $
+  Date:      $Date: 2004/11/25 15:46:10 $
+  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
@@ -363,7 +363,7 @@ bool DicomDir::WriteDicomDir(std::string const& fileName)
    binary_write( *fp, "DICM");
  
    DicomDirMeta *ptrMeta = GetDicomDirMeta();
-   ptrMeta->Write(fp, ExplicitVR);
+   ptrMeta->WriteContent(fp, ExplicitVR);
    
    // force writing 0004|1220 [SQ ], that CANNOT exist within DicomDirMeta
    for(i=0;i<4;++i)
@@ -375,7 +375,7 @@ bool DicomDir::WriteDicomDir(std::string const& fileName)
                                      cc != Patients.end();
                                    ++cc )
    {
-      (*cc)->Write( fp, ExplicitVR );
+      (*cc)->WriteContent( fp, ExplicitVR );
    }
    
    // force writing Sequence Delimitation Item

diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx
index 985d7516e08cd220f590ea70b0c30e0237085773..64ff145978a9e942e7f96765e196a9b24ab00494 100644 (file)
--- a/src/gdcmDicomDirMeta.cxx
+++ b/src/gdcmDicomDirMeta.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirMeta.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/25 03:35:19 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2004/11/25 15:46:10 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -68,13 +68,13 @@ void DicomDirMeta::Print(std::ostream& os)
  * \brief   Writes the Meta Elements
  * @return
  */ 
-void DicomDirMeta::Write(std::ofstream* fp, FileType t)
+void DicomDirMeta::WriteContent(std::ofstream* fp, FileType t)
 {   
    for (ListDocEntry::iterator i = DocEntries.begin();  
                               i != DocEntries.end();
                               ++i)
    {
-      (*i)->Write(fp, t);
+      (*i)->WriteContent(fp, t);
    }
 }
 

diff --git a/src/gdcmDicomDirMeta.h b/src/gdcmDicomDirMeta.h
index a15732047dcfee641f08a5833dcbc8f558567e6b..5a3059cbed8773b66882932bb5f0ade69a693818 100644 (file)
--- a/src/gdcmDicomDirMeta.h
+++ b/src/gdcmDicomDirMeta.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirMeta.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/22 03:05:41 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -32,7 +32,7 @@ public:
    ~DicomDirMeta();
 
    virtual void Print(std::ostream &os = std::cout);
-   virtual void Write(std::ofstream * fp, FileType t);
+   virtual void WriteContent(std::ofstream * fp, FileType t);
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index 66f58f0529f115ea7ddedb41468332b808183a28..f6a149a9441bae6430f4df28ad29e610d447270f 100644 (file)
--- a/src/gdcmDicomDirPatient.cxx
+++ b/src/gdcmDicomDirPatient.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirPatient.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/25 04:08:20 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -81,15 +81,15 @@ void DicomDirPatient::Print(std::ostream& os)
  * \brief   Writes the Object
  * @return
  */ 
-void DicomDirPatient::Write(std::ofstream* fp, FileType t)
+void DicomDirPatient::WriteContent(std::ofstream* fp, FileType t)
 {
-   DicomDirObject::Write(fp, t);
+   DicomDirObject::WriteContent(fp, t);
 
    for(ListDicomDirStudy::iterator cc = Studies.begin();
                                    cc!= Studies.end();
                                  ++cc )
    {
-      (*cc)->Write( fp, t );
+      (*cc)->WriteContent( fp, t );
    }
 }
 //-----------------------------------------------------------------------------

diff --git a/src/gdcmDicomDirPatient.h b/src/gdcmDicomDirPatient.h
index c9f2b4c5b9dfb1cb3d7875f1cc53de6919c1f981..f5e7ebfc4a4fb835e9f6120f4af32c3a2ef1d26d 100644 (file)
--- a/src/gdcmDicomDirPatient.h
+++ b/src/gdcmDicomDirPatient.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirPatient.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/25 04:08:20 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,7 +39,7 @@ public:
    ~DicomDirPatient();
 
    void Print(std::ostream &os = std::cout);
-   void Write(std::ofstream *fp, FileType t);
+   void WriteContent(std::ofstream *fp, FileType t);
 
    /// Returns the STUDY chained List for this PATIENT.
    ListDicomDirStudy const & GetDicomDirStudies() const { return Studies; };

diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx
index 9a0a991d68848afc01399f3fda792a87ceea9df5..13c3108059a531afec0558a35deb89000f8ae032 100644 (file)
--- a/src/gdcmDicomDirSerie.cxx
+++ b/src/gdcmDicomDirSerie.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirSerie.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/25 04:08:20 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -86,15 +86,15 @@ void DicomDirSerie::Print(std::ostream& os)
  * \brief   Writes the Object
  * @return
  */ 
-void DicomDirSerie::Write(std::ofstream* fp, FileType t)
+void DicomDirSerie::WriteContent(std::ofstream* fp, FileType t)
 {
-   DicomDirObject::Write(fp, t);
+   DicomDirObject::WriteContent(fp, t);
 
    for(ListDicomDirImage::iterator cc = Images.begin();
                                    cc!= Images.end();
                                  ++cc )
    {
-      (*cc)->Write( fp, t );
+      (*cc)->WriteContent( fp, t );
    }
 }
 

diff --git a/src/gdcmDicomDirSerie.h b/src/gdcmDicomDirSerie.h
index e4d57b33aa1d0f59ec806533a5a60e838fc8bfde..8021d859a0f5c3e072247833993a951edd2a03c4 100644 (file)
--- a/src/gdcmDicomDirSerie.h
+++ b/src/gdcmDicomDirSerie.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirSerie.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/25 04:08:20 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,7 +37,7 @@ public:
    ~DicomDirSerie();
 
    void Print( std::ostream& os = std::cout );
-   void Write( std::ofstream* fp, FileType t );
+   void WriteContent( std::ofstream* fp, FileType t );
 
    /**
     * \ingroup DicomDirSerie

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index a9ebc4f8c3c26dec8ad8884d72c4d94bc9c6f7f7..d15c62efa8c92aab7728a43a197614042599417b 100644 (file)
--- a/src/gdcmDicomDirStudy.cxx
+++ b/src/gdcmDicomDirStudy.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirStudy.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/25 04:08:20 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -89,15 +89,15 @@ void DicomDirStudy::Print(std::ostream& os)
  * \brief   Writes the Object
  * @return
  */ 
-void DicomDirStudy::Write(std::ofstream* fp, FileType t)
+void DicomDirStudy::WriteContent(std::ofstream* fp, FileType t)
 {
-   DicomDirObject::Write(fp, t);
+   DicomDirObject::WriteContent(fp, t);
 
    for(ListDicomDirSerie::iterator cc = Series.begin();
                                    cc!= Series.end();
                                  ++cc )
    {
-      (*cc)->Write( fp, t );
+      (*cc)->WriteContent( fp, t );
    }
 }
 

diff --git a/src/gdcmDicomDirStudy.h b/src/gdcmDicomDirStudy.h
index a71685e7423d61abb5e2e5c81335ec0f85cf5a42..5a083f28ff76d39f7dd20f9e189371da621cbd1d 100644 (file)
--- a/src/gdcmDicomDirStudy.h
+++ b/src/gdcmDicomDirStudy.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirStudy.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/25 04:08:20 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,7 +37,7 @@ public:
    ~DicomDirStudy();
 
    void Print(std::ostream &os = std::cout);
-   void Write(std::ofstream *fp, FileType t);
+   void WriteContent(std::ofstream *fp, FileType t);
 
    /**
     * \ingroup DicomDirStudy

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 9a1f41123adeb8caf68f83b6505fcc22357138d8..b6d8f0ad51c669fb6a1af01df1d094e43b9d3fba 100644 (file)
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/19 18:49:39 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -120,7 +120,7 @@ void DocEntry::Print(std::ostream& os)
  * @param fp already open file pointer
  * @param filetype type of the file to be written
  */
-void DocEntry::Write(std::ofstream* fp, FileType filetype)
+void DocEntry::WriteContent(std::ofstream* fp, FileType filetype)
 {
    uint32_t ffff  = 0xffffffff;
    uint16_t group = GetGroup();

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 7399e23c67632e00418c81a6ffe31202cd913e75..d6d3a5b6d8ca8bd9546edf052e85bad70bb8a6a2 100644 (file)
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 14:48:19 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -126,7 +126,7 @@ public:
    int GetPrintLevel() { return PrintLevel; };
    
    virtual void Print (std::ostream & os = std::cout); 
-   virtual void Write(std::ofstream *fp, FileType filetype);
+   virtual void WriteContent(std::ofstream *fp, FileType filetype);
    
    uint32_t GetFullLength();
    

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index dc057ac18d781a7557473eeb0252b16d1d3bd17d..32bf2ef4e492fa6575ffba045b02520fb808e018 100644 (file)
--- a/src/gdcmDocEntrySet.h
+++ b/src/gdcmDocEntrySet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntrySet.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 10:25:53 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -66,7 +66,7 @@ public:
    virtual void Print (std::ostream & os = std::cout) = 0;// pure virtual
 
    /// \brief write any type of entry to the entry set
-   virtual void Write (std::ofstream *fp, FileType filetype) = 0;// pure virtual
+   virtual void WriteContent (std::ofstream *fp, FileType filetype) = 0;// pure virtual
 
    virtual DocEntry* GetDocEntryByNumber(uint16_t group,
                                          uint16_t element) = 0;

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 48a0a32deb01f685b41c8a09efb30eed5aa0e06b..ba76c1e9f79fbc89914956dcda9d7170a925f675 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/25 13:12:02 $
-  Version:   $Revision: 1.139 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.140 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -446,7 +446,7 @@ bool Document::CloseFile()
  *          (ACR-NEMA, ExplicitVR, ImplicitVR)
  * \return Always true.
  */
-void Document::Write(std::ofstream* fp, FileType filetype)
+void Document::WriteContent(std::ofstream* fp, FileType filetype)
 {
    /// \todo move the following lines (and a lot of others, to be written)
    /// to a future function CheckAndCorrectHeader  
@@ -474,7 +474,7 @@ void Document::Write(std::ofstream* fp, FileType filetype)
  *    UpdateGroupLength(true,ACR);
  */
  
-   ElementSet::Write(fp, filetype); // This one is recursive
+   ElementSet::WriteContent(fp, filetype); // This one is recursive
 }
 
 /**

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 411d7d31859a98e519ef93d55976b38b035a40b5..b3129904415ebf245f9f041b740a2d4d487934f7 100644 (file)
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/25 13:12:02 $
-  Version:   $Revision: 1.63 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.64 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -185,7 +185,7 @@ public:
    std::ifstream * OpenFile();
    bool CloseFile();
 
-   void Write( std::ofstream* fp, FileType type );
+   void WriteContent( std::ofstream* fp, FileType type );
 
    ValEntry* ReplaceOrCreateByNumber(std::string const & value,
                                      uint16_t group, uint16_t elem,

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 42639f89265d435529a3f93397bd236d102c28ee..0b60c37da9f498b6d40d225a8b0945cec9d40a2c 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 10:23:47 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.32 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -87,13 +87,13 @@ void ElementSet::Print(std::ostream& os)
   *          from the H Table
   * @return
   */ 
-void ElementSet::Write(std::ofstream* fp, FileType filetype)
+void ElementSet::WriteContent(std::ofstream* fp, FileType filetype)
 {
    for (TagDocEntryHT::const_iterator i = TagHT.begin(); 
                                      i != TagHT.end(); 
                                     ++i)
    {
-      i->second->Write(fp, filetype);
+      i->second->WriteContent(fp, filetype);
    } 
 }
 //-----------------------------------------------------------------------------

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 6d93e2c056f56c1f09aec816b02da99dffad02cd..6e96cb77d16e5fc3d4220e8e38e462755a4b5558 100644 (file)
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 10:23:47 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -45,7 +45,7 @@ public:
    bool RemoveEntryNoDestroy(DocEntry *EntryToRemove);
    
    void Print(std::ostream &os = std::cout); 
-   void Write(std::ofstream *fp, FileType filetype); 
+   void WriteContent(std::ofstream *fp, FileType filetype); 
    
    /// Accessor to \ref TagHT
    // Do not expose this to user (public API) ! 

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index 8371f3ce4a612286fe0f98b9564d146f33e9e5b7..6e43c2bc97799b803ec597040f832ddd09f1052b 100644 (file)
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmHeader.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/25 13:12:02 $
-  Version:   $Revision: 1.206 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.207 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -171,7 +171,7 @@ bool Header::Write(std::string fileName,FileType filetype)
           RemoveEntryNoDestroy(e);
       }
    }
-   Document::Write(fp,filetype);
+   Document::WriteContent(fp,filetype);
 
    fp->close();
    delete fp;

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 01f783325508d62fe67b9b8686a5ec8a0f42f3f2..073093641b8136986ca139f6472152158983c87b 100644 (file)
--- a/src/gdcmSQItem.cxx
+++ b/src/gdcmSQItem.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 16:39:19 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.38 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -97,7 +97,7 @@ SQItem::~SQItem()
  * \ingroup SQItem
  * \brief   canonical Writer
  */
-void SQItem::Write(std::ofstream* fp, FileType filetype)
+void SQItem::WriteContent(std::ofstream* fp, FileType filetype)
 {
    int j;
    uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff };
@@ -129,7 +129,7 @@ void SQItem::Write(std::ofstream* fp, FileType filetype)
          break; // FIXME : continue; ?!?
       }
 
-      (*it)->Write(fp, filetype);
+      (*it)->WriteContent(fp, filetype);
    }
       
     //we force the writting of an 'Item Delimitation' item

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index 22eaedb32a1e7cda2037a576591a7bed466ac93c..96ec2d3d42afa4c3b5b7ecfdeba06ecb9b6530f7 100644 (file)
--- a/src/gdcmSQItem.h
+++ b/src/gdcmSQItem.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/28 03:10:58 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.23 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,7 +37,7 @@ public:
    ~SQItem();
 
    void Print(std::ostream &os = std::cout); 
-   void Write(std::ofstream *fp, FileType filetype);
+   void WriteContent(std::ofstream *fp, FileType filetype);
 
    /// \brief   returns the DocEntry chained List for this SQ Item.
    ListDocEntry const & GetDocEntries() const { return DocEntries; };

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index a0e53cfe0043d24e5e66a396d56b49cd23731f9a..8ece4978a456d8d7a8526cee5e8b061a7d65e5de 100644 (file)
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 16:39:19 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -122,7 +122,7 @@ void SeqEntry::Print( std::ostream &os )
 /*
  * \brief   canonical Writer
  */
-void SeqEntry::Write(std::ofstream* fp, FileType filetype)
+void SeqEntry::WriteContent(std::ofstream* fp, FileType filetype)
 {
    uint16_t seq_term_gr = 0xfffe;
    uint16_t seq_term_el = 0xe0dd;
@@ -131,12 +131,12 @@ void SeqEntry::Write(std::ofstream* fp, FileType filetype)
    //uint16_t item_term_gr = 0xfffe;
    //uint16_t item_term_el = 0xe00d;
    
-   DocEntry::Write(fp, filetype);
+   DocEntry::WriteContent(fp, filetype);
    for(ListSQItem::iterator cc  = Items.begin();
                             cc != Items.end();
                           ++cc)
    {        
-      (*cc)->Write(fp, filetype);
+      (*cc)->WriteContent(fp, filetype);
    }
    
    // we force the writting of a Sequence Delimitation item

diff --git a/src/gdcmSeqEntry.h b/src/gdcmSeqEntry.h
index 5d0ca21b8febaa3fcabba6e399de32d706ada07d..d89632f2a11d7a93e378f061a23c146bcb9309cc 100644 (file)
--- a/src/gdcmSeqEntry.h
+++ b/src/gdcmSeqEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 02:54:35 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2004/11/25 15:46:12 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,7 +37,7 @@ public:
    ~SeqEntry();
    
    void Print(std::ostream &os = std::cout); 
-   void Write(std::ofstream *fp, FileType filetype);
+   void WriteContent(std::ofstream *fp, FileType filetype);
 
    /// returns the SQITEM chained List for this SeQuence.
    ListSQItem const & GetSQItems() const { return Items; }

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 673f9489ae023b6bdfbc1f2adc003998d0264af6..d6d7b89dfa23f7a20debac870ddd46f93eecc639 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 16:39:19 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2004/11/25 15:46:12 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -177,9 +177,9 @@ void ValEntry::Print(std::ostream & os)
 /*
  * \brief   canonical Writer
  */
-void ValEntry::Write(std::ofstream* fp, FileType filetype)
+void ValEntry::WriteContent(std::ofstream* fp, FileType filetype)
 {
-   DocEntry::Write(fp, filetype);
+   DocEntry::WriteContent(fp, filetype);
 
    //std::cout << "=====================================" << GetVR() << std::endl;
       

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index 84a1418e81055af2e392976f2cecb426f9599ac7..b3fc2081d26ef4272918f818da2cd300dc42f5a4 100644 (file)
--- a/src/gdcmValEntry.h
+++ b/src/gdcmValEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/05 20:23:14 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2004/11/25 15:46:12 $
+  Version:   $Revision: 1.31 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -46,7 +46,7 @@ public:
    void SetValue(std::string const & val) { Value = val; }; 
 
    virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(std::ofstream *fp, FileType filetype);
+   virtual void WriteContent(std::ofstream *fp, FileType filetype);
 
 protected: