BUG: Remove the Print indent mess. Please only one Print per class default paramater...

diff --git a/ChangeLog b/ChangeLog
index 19903257c4101d862f9964be97f521f440b09f95..56181890d76bf7e431f1d24b37d51990e74340c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-15 Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
+   * Removed the Print/indent/default parameter mess. There is absolutely no
+        reason to have to methods, moreover with the second takeing the ostream as
+        *SECOND* parameter. This was clearly a bad hack to get things compile.
+
 2005-01-15 Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
    * Complete rewrite of the GetMacAddress code. Now the code is *much*
         smaller (no more MacOSX specific crap). A lot more POSIX oriented.

diff --git a/src/gdcmBase.cxx b/src/gdcmBase.cxx
index 4e3753a6ed90415a7f23b78b1457c2e9da1dd0f0..2b068043bfc9b4d5a4489032d3459343b69a9f62 100644 (file)
--- a/src/gdcmBase.cxx
+++ b/src/gdcmBase.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBase.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/06 20:25:17 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2005/01/16 04:50:40 $
+  Version:   $Revision: 1.6 $
                                                                                 
   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 @@ Base::~Base()
  * \brief   Print all the object
  * @param   os The output stream to be written to.
  */
-void Base::Print(std::ostream &)
+void Base::Print(std::ostream &, std::string const & )
 {
 }
 

diff --git a/src/gdcmBase.h b/src/gdcmBase.h
index 455897303e5227a9ad37e9f97f35b8065c996af9..35198eb9f2127c197015bc3fd7b45128737a7e9c 100644 (file)
--- a/src/gdcmBase.h
+++ b/src/gdcmBase.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBase.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/11 15:15:37 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2005/01/16 04:50:40 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,7 +38,7 @@ public:
    Base( );
    virtual ~Base();
 
-   virtual void Print(std::ostream &os = std::cout); 
+   virtual void Print(std::ostream &os = std::cout, std::string const & indent = "" ); 
 
    /// \brief Sets the print level for the Dicom Header Elements
    /// \note 0 for Light Print; 1 for 'medium' Print, 2 for Heavy

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 1d6a7c567b33f45d408e0583e29e8b81d83e127c..19ac4d6553a8bfec46cb12edc0e5d934d1096a11 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: 2005/01/14 17:40:04 $
-  Version:   $Revision: 1.52 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.53 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -76,7 +76,7 @@ BinEntry::~BinEntry()
  * \brief   canonical Printer
  */
  
-void BinEntry::Print(std::ostream &os)
+void BinEntry::Print(std::ostream &os, std::string const & )
 {
    os << "B ";
    DocEntry::Print(os);

diff --git a/src/gdcmBinEntry.h b/src/gdcmBinEntry.h
index e04dcf1fdefbf0500deb27fad7c44a3da9aaf1e8..e1f3c045d8671863b78d41ca13165feb4734b7ff 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: 2005/01/11 15:15:37 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -42,7 +42,7 @@ public:
 
    ~BinEntry();
    
-   void Print( std::ostream &os = std::cout );
+   void Print( std::ostream &os = std::cout, std::string const & indent = "" );
    void WriteContent( std::ofstream *fp, FileType ft);
 
    /// \brief Returns the area value of the current Dicom Header Entry

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 541273ab337ed12d842bfb82bec4633e43c5b258..fa16153d718e160de3cecb95fc67fb94b130d084 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: 2005/01/14 22:20:11 $
-  Version:   $Revision: 1.101 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.102 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -163,7 +163,7 @@ DicomDir::~DicomDir()
 /**
  * \brief  Canonical Printer 
  */
-void DicomDir::Print(std::ostream &os)
+void DicomDir::Print(std::ostream &os, std::string const & )
 {
    if( MetaElems )
    {

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index 07b099eabb2f2c1b3e05e36a7e5e36f54891b6a5..9aaad605f5e9b634048b2bd384fb868177c678b6 100644 (file)
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.45 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.46 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -58,7 +58,7 @@ public:
    ~DicomDir();
 
    /// \brief   canonical Printer 
-   void Print(std::ostream &os = std::cout);
+   void Print(std::ostream &os = std::cout, std::string const & indent = "" );
 
    /// Informations contained in the parser
    virtual bool IsReadable();

diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx
index 036dc71576b90998c9976a9678fa9a3658084236..e1f201ff4a3be39f96a5d105cf9ae8736ddf9d04 100644 (file)
--- a/src/gdcmDicomDirImage.cxx
+++ b/src/gdcmDicomDirImage.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirImage.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/06 15:43:18 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.16 $
                                                                                 
   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 @@ DicomDirImage::~DicomDirImage()
  * \brief   Prints the Object
  * @return
  */ 
-void DicomDirImage::Print(std::ostream &os)
+void DicomDirImage::Print(std::ostream &os, std::string const & )
 {
    os << "IMAGE : ";
    for(ListDocEntry::iterator i = DocEntries.begin();

diff --git a/src/gdcmDicomDirImage.h b/src/gdcmDicomDirImage.h
index 29204297b0a9fc9e7c6deaa2a1d6ad6d5052380d..cb5026dfea303ec0c24172f0a826be688c625b97 100644 (file)
--- a/src/gdcmDicomDirImage.h
+++ b/src/gdcmDicomDirImage.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirImage.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -35,7 +35,7 @@ public:
    DicomDirImage(); 
    ~DicomDirImage();
 
-   void Print(std::ostream &os = std::cout);
+   void Print(std::ostream &os = std::cout, std::string const & indent = "" );
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------

diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx
index 05ef4358200a760dea52a7614129167390432077..b1e40f543df216e2f677d1e95de7b775780d431d 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: 2005/01/06 20:03:27 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -48,7 +48,7 @@ DicomDirMeta::~DicomDirMeta()
 /**
  * \brief   Prints the Meta Elements
  */ 
-void DicomDirMeta::Print(std::ostream &os)
+void DicomDirMeta::Print(std::ostream &os, std::string const & )
 {
    os << "META" << std::endl;
    // warning : META doesn't behave exactly like a Objet 

diff --git a/src/gdcmDicomDirMeta.h b/src/gdcmDicomDirMeta.h
index 334e52fb5c23ca44b7874c97219a61c2efb5f67d..9e530882462f140c4642b2fecb328cce63e43115 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: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -35,7 +35,7 @@ public:
    DicomDirMeta(); 
    ~DicomDirMeta();
 
-   virtual void Print(std::ostream &os = std::cout);
+   virtual void Print(std::ostream &os = std::cout, std::string const & indent = "" );
    virtual void WriteContent(std::ofstream *fp, FileType t);
 };
 } // end namespace gdcm

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index 815cdc1a901c249aa9d0e5482e3e233edc14588c..9a26b4fc9ca21da230f0a377ac215131e1c0144b 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: 2005/01/06 20:03:27 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -53,7 +53,7 @@ DicomDirPatient::~DicomDirPatient()
  * \brief   Prints the Object
  * @param os ostream to write to 
  */ 
-void DicomDirPatient::Print(std::ostream &os)
+void DicomDirPatient::Print(std::ostream &os, std::string const & )
 {
    os << "PATIENT" << std::endl;
    DicomDirObject::Print(os);

diff --git a/src/gdcmDicomDirPatient.h b/src/gdcmDicomDirPatient.h
index e33d4e15135a5c24fc1ec7c9f646eba286ec6e8c..80a535e101a3483533f4f8f1a1309a3fcb10a65e 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: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -40,7 +40,7 @@ public:
    DicomDirPatient(); 
    ~DicomDirPatient();
 
-   void Print(std::ostream &os = std::cout);
+   void Print(std::ostream &os = std::cout, std::string const & indent = "" );
    void WriteContent(std::ofstream *fp, FileType t);
 
    /// Returns the STUDY chained List for this PATIENT.

diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx
index 2edbf5ea285b4d57c8636a6d6252de9f3dbb21b1..b78fc9fdde2aa92067bf979cd496826982eefe45 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: 2005/01/06 20:03:27 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -52,7 +52,7 @@ DicomDirSerie::~DicomDirSerie()
  * \brief   Prints the Object
  * @param os ostream to write to
  */ 
-void DicomDirSerie::Print(std::ostream &os)
+void DicomDirSerie::Print(std::ostream &os, std::string const &)
 {
    os << "SERIE" << std::endl;
    DicomDirObject::Print(os);

diff --git a/src/gdcmDicomDirSerie.h b/src/gdcmDicomDirSerie.h
index 4f2f0749c7e829610bf46792ed5befb6b1cf9a62..d86e5e49f1a75de5657d2792378d973622f92079 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: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -39,7 +39,7 @@ public:
    DicomDirSerie(); 
    ~DicomDirSerie();
 
-   void Print( std::ostream &os = std::cout );
+   void Print( std::ostream &os = std::cout, std::string const & indent = "" );
    void WriteContent( std::ofstream *fp, FileType t );
 
    /**

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index e817e7340c52133fbc21ea62658018bf9edbb626..5ac40f93fdddfaf6da441cf0803692bf2d0550c4 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: 2005/01/06 20:03:27 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -53,7 +53,7 @@ DicomDirStudy::~DicomDirStudy()
  * @param os ostream to write to 
  * @return
  */ 
-void DicomDirStudy::Print(std::ostream &os)
+void DicomDirStudy::Print(std::ostream &os, std::string const & )
 {
    os << "STUDY" << std::endl;
    DicomDirObject::Print(os);

diff --git a/src/gdcmDicomDirStudy.h b/src/gdcmDicomDirStudy.h
index 214ba2d9daaa4030e2d8eac912de0fe47ef9a2e9..aad51502c0db209410f3b9c75c873f2f6707ae8e 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: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.17 $
                                                                                 
   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:
    DicomDirStudy(); 
    ~DicomDirStudy();
 
-   void Print(std::ostream &os = std::cout);
+   void Print(std::ostream &os = std::cout, std::string const & indent = "" );
    void WriteContent(std::ofstream *fp, FileType t);
 
    /**

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 027ce31a3653d6d097ad19863e5eb863c166d62b..e8ad7f977f691e96c78eacccf63dbdc93437a588 100644 (file)
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/14 11:28:30 $
-  Version:   $Revision: 1.63 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -92,7 +92,7 @@ Dict::~Dict()
  *          Entries will be sorted by tag i.e. the couple (group, element).
  * @param   os The output stream to be written to.
  */
-void Dict::Print(std::ostream &os)
+void Dict::Print(std::ostream &os, std::string const & )
 {
    os << "Dict file name : " << Filename << std::endl;
    std::ostringstream s;

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index ca31531e5e1687c1dbdf6b946205899386724625..ee039f56d966b378e8fb41906cc4e1415a90c1e2 100644 (file)
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/14 11:28:30 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -54,7 +54,7 @@ public:
    ~Dict();
 
 // Print
-   void Print(std::ostream &os = std::cout);
+   void Print(std::ostream &os = std::cout, std::string const & indent = "");
 
 // Entries
    void ClearEntry  ();

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 615708c4c80dbb850e7e2b8c0e9d99c1c5341c90..7699a4a872272c3a8743ef76f640932cf0460510 100644 (file)
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/14 11:28:30 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -52,7 +52,7 @@ DictEntry::DictEntry(uint16_t group, uint16_t element,
 
 //-----------------------------------------------------------------------------
 // Print
-void DictEntry::Print(std::ostream &os)
+void DictEntry::Print(std::ostream &os, std::string const & )
 {
    std::string vr;
    std::ostringstream s;

diff --git a/src/gdcmDictEntry.h b/src/gdcmDictEntry.h
index 89a85c0c704cff8a5490dc9b5d85eb1e90f833cf..5fc005d980b959f5f8e49d89798e027d84ec3984 100644 (file)
--- a/src/gdcmDictEntry.h
+++ b/src/gdcmDictEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/13 16:35:37 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -47,7 +47,7 @@ public:
              TagName const &name   = GDCM_UNKNOWN);
 
 // Print
-   void Print(std::ostream &os = std::cout);
+   void Print(std::ostream &os = std::cout, std::string const &indent = "");
 
 // Key creation
    static TagKey TranslateToKey(uint16_t group, uint16_t element);

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 787cba2655fbf4fa19ba996f088275ea068b468b..f5c4f65bed0722cb6a91b60a6edf74c145560ecd 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/07 22:03:30 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.50 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -69,7 +69,7 @@ DictSet::~DictSet()
  *          contained is this DictSet, along with their respective content.
  * @param   os Output stream used for printing.
  */
-void DictSet::Print(std::ostream &os) 
+void DictSet::Print(std::ostream &os, std::string const & )
 {
    for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict)
    {

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 54c8b0fcc97b457a1c5cc790a22ab67474c8f658..414ef9900b374e8ac90e5de6d3a01937b1217882 100644 (file)
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/13 16:35:37 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -44,7 +44,7 @@ public:
    DictSet();
    ~DictSet();
 
-   void Print(std::ostream &os = std::cout);
+   void Print(std::ostream &os = std::cout, std::string const & indent = "" );
 
    // Probabely useless !
    //EntryNamesList *GetPubDictEntryNames();

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index b1c276d20ea4158691ae4c55c29697c7a06cf3c4..9021e931fa3b6083f38a1764cc9643ae46866c86 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: 2005/01/07 22:19:48 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -58,7 +58,7 @@ DocEntry::DocEntry(DictEntry *in)
  * \brief   Prints the common part of ValEntry, BinEntry, SeqEntry
  * @param   os ostream we want to print in
  */
-void DocEntry::Print(std::ostream &os)
+void DocEntry::Print(std::ostream &os, std::string const & )
 {
    size_t o;
    std::string st;

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 5f434ca0d2d12efabb30cf9525dda966bef0b5e9..269c50de5fb2dffc716db2713dfb4aeff9a38374 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: 2005/01/07 16:45:51 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -140,7 +140,7 @@ public:
    bool IsItemDelimitor();
    bool IsSequenceDelimitor();   
 
-   virtual void Print (std::ostream &os = std::cout); 
+   virtual void Print (std::ostream &os = std::cout, std::string const & indent = ""); 
 
 protected:
 // Variables

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 397e4e1b2424a06075df24038e4135e913e3e69e..afabc9af283024ab1be792978e7aca7055c828ee 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: 2005/01/14 11:28:30 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  Version:   $Revision: 1.42 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -61,7 +61,7 @@ ElementSet::~ElementSet()
   *          from the H Table
   * @return
   */ 
-void ElementSet::Print(std::ostream &os)
+void ElementSet::Print(std::ostream &os, std::string const & )
 {
    for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index fff8f72375867ee5bd16406fb0e6cf855832dc05..7a4e5124430e67d41ada5c01f0c4bc8354e127f2 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: 2005/01/14 11:28:31 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2005/01/16 04:50:41 $
+  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
@@ -47,7 +47,7 @@ public:
    ElementSet(int);
    ~ElementSet();
 
-   virtual void Print(std::ostream &os = std::cout); 
+   virtual void Print(std::ostream &os = std::cout, std::string const & indent = "" ); 
 
    bool AddEntry(DocEntry *Entry);
    bool RemoveEntry(DocEntry *EntryToRemove);

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 7766e1029290a158188a2b3b785122ccad393c75..593a0998dddb740408e43b48807ec1b358e7aefa 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: 2005/01/13 22:30:11 $
-  Version:   $Revision: 1.192 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.193 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -127,7 +127,7 @@ File::~File()
 
 //-----------------------------------------------------------------------------
 // Print
-void File::Print(std::ostream &os)
+void File::Print(std::ostream &os, std::string const &)
 {
    HeaderInternal->SetPrintLevel(PrintLevel);
    HeaderInternal->Print(os);

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 219eddbbeddbc2bf900aa1d02f39b613e760279c..f958d9a29a6d3b26c94c627f05868470a2501b59 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: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.93 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.94 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -52,7 +52,7 @@ public:
  
    virtual ~File();
 
-   void Print(std::ostream &os = std::cout); 
+   void Print(std::ostream &os = std::cout, std::string const & indent = ""); 
 
    /// Accessor to \ref Header
    Header *GetHeader() { return HeaderInternal; }

diff --git a/src/gdcmJPEGFragment.cxx b/src/gdcmJPEGFragment.cxx
index 621134002588133871f51e8039581f1426c29c12..0af4944ddecbbc1fe21fd47b4fdf4facb2065f72 100644 (file)
--- a/src/gdcmJPEGFragment.cxx
+++ b/src/gdcmJPEGFragment.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragment.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/20 14:31:44 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -35,7 +35,7 @@ JPEGFragment::JPEGFragment()
  * @param indent Indentation string to be prepended during printing.
  * @param os     Stream to print to.
  */
-void JPEGFragment::Print( std::string indent, std::ostream &os )
+void JPEGFragment::Print( std::ostream &os, std::string indent )
 {
    os << indent
       << "JPEG fragment: offset : " <<  Offset

diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h
index a446d9c77f098befd64f4d4c5ec586658183f63f..4047d2b8520b1ad7de8d7648917daaf3e9174d24 100644 (file)
--- a/src/gdcmJPEGFragment.h
+++ b/src/gdcmJPEGFragment.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragment.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:58 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.7 $
                                                                                 
   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 @@ class GDCM_EXPORT JPEGFragment
 {
 public:
    JPEGFragment();
-   void Print( std::string indent = "", std::ostream &os = std::cout );
+   void Print( std::ostream &os = std::cout, std::string indent = "" );
 
 private:
    long    Offset;

diff --git a/src/gdcmJPEGFragmentsInfo.cxx b/src/gdcmJPEGFragmentsInfo.cxx
index 7a1ad3972eb2b29e534b0973295d3fe620433f48..88725b92aa4553fdafc1272bca55ef38ce1ec885 100644 (file)
--- a/src/gdcmJPEGFragmentsInfo.cxx
+++ b/src/gdcmJPEGFragmentsInfo.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragmentsInfo.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/28 22:21:57 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -40,7 +40,7 @@ JPEGFragmentsInfo::~JPEGFragmentsInfo()
  * @param indent Indentation string to be prepended during printing.
  * @param os     Stream to print to.
  */
-void JPEGFragmentsInfo::Print( std::string indent, std::ostream &os )
+void JPEGFragmentsInfo::Print( std::ostream &os, std::string const & indent )
 {
    os << indent
       << "----------------- JPEG fragments --------------------------------"
@@ -55,7 +55,7 @@ void JPEGFragmentsInfo::Print( std::string indent, std::ostream &os )
    {
       os << indent
          << "   fragment number :" << fragmentNumber++;
-      (*it)->Print( indent + "   ", os );
+      (*it)->Print( os, indent + "   ");
       os << std::endl;
    }
 }

diff --git a/src/gdcmJPEGFragmentsInfo.h b/src/gdcmJPEGFragmentsInfo.h
index 4f445b7d1f61f406ae365678e0f5cdc387d71718..55ad8f999167cc517488010b66d15d241bc525f0 100644 (file)
--- a/src/gdcmJPEGFragmentsInfo.h
+++ b/src/gdcmJPEGFragmentsInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragmentsInfo.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:58 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -49,7 +49,7 @@ private:
    JPEGFragmentsList Fragments;
 public:
    ~JPEGFragmentsInfo();
-   void Print( std::string indent = "", std::ostream &os = std::cout );
+   void Print( std::ostream &os = std::cout, std::string const & indent = "" );
 };
 } // end namespace gdcm
 

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index 3cddb493b164d9839283df1ad8d2a06111f56a3d..126552704b313add803ff445b0db9539599174f3 100644 (file)
--- a/src/gdcmPixelReadConvert.cxx
+++ b/src/gdcmPixelReadConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/14 15:06:37 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1278,21 +1278,12 @@ bool PixelReadConvert::BuildRGBImage()
    return true;
 }
 
-/**
- * \brief        Print self.
- * @param os     Stream to print to.
- */
-void PixelReadConvert::Print( std::ostream &os )
-{
-   Print("",os);
-}
-
 /**
  * \brief        Print self.
  * @param indent Indentation string to be prepended during printing.
  * @param os     Stream to print to.
  */
-void PixelReadConvert::Print( std::string indent, std::ostream &os )
+void PixelReadConvert::Print( std::ostream &os, std::string const & indent )
 {
    os << indent
       << "--- Pixel information -------------------------"
@@ -1308,7 +1299,7 @@ void PixelReadConvert::Print( std::string indent, std::ostream &os )
    {
       if ( RLEInfo )
       {
-         RLEInfo->Print( indent, os );
+         RLEInfo->Print( os, indent );
       }
       else
       {
@@ -1320,7 +1311,7 @@ void PixelReadConvert::Print( std::string indent, std::ostream &os )
    {
       if ( JPEGInfo )
       {
-         JPEGInfo->Print( indent, os );
+         JPEGInfo->Print( os, indent );
       }
       else
       {

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index 1938f8906caae36001452032294e6492a97742f6..1372220154dbff8bb686a8cc16c668a835eb1d68 100644 (file)
--- a/src/gdcmPixelReadConvert.h
+++ b/src/gdcmPixelReadConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  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
@@ -50,8 +50,7 @@ public:
    //// Predicates:
    bool IsRawRGB();
 
-   void Print( std::ostream &os = std::cout );
-   void Print( std::string indent = "", std::ostream &os = std::cout );
+   void Print( std::ostream &os = std::cout, std::string const & indent = "" );
 
 // In progress
    void GrabInformationsFromHeader( Header *header );

diff --git a/src/gdcmRLEFrame.cxx b/src/gdcmRLEFrame.cxx
index 72d2a1c347eba172e0097b33ddaff1e3ef75789e..8ebb8f61d4619a69604b9da3705bfb30f0ac7c92 100644 (file)
--- a/src/gdcmRLEFrame.cxx
+++ b/src/gdcmRLEFrame.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFrame.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/20 14:31:44 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,7 +26,7 @@ namespace gdcm
  * @param indent Indentation string to be prepended during printing.
  * @param os     Stream to print to.
  */
-void RLEFrame::Print( std::string indent, std::ostream &os )
+void RLEFrame::Print( std::ostream &os, std::string indent )
 {
    os << indent
       << "--- fragments"

diff --git a/src/gdcmRLEFrame.h b/src/gdcmRLEFrame.h
index 21b2dd30c1ec01fc09d3fd65d8124cb6cc49bd98..bffdbea862b38e34eaf0c2c1187b6827949be4ce 100644 (file)
--- a/src/gdcmRLEFrame.h
+++ b/src/gdcmRLEFrame.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFrame.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:58 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  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
@@ -51,7 +51,7 @@ friend class PixelReadConvert;
    long    Length[15];
 public:
    RLEFrame() { NumberFragments = 0; }
-   void Print( std::string indent = "", std::ostream &os = std::cout );
+   void Print( std::ostream &os = std::cout, std::string indent = "" );
    
 };
 } // end namespace gdcm

diff --git a/src/gdcmRLEFramesInfo.cxx b/src/gdcmRLEFramesInfo.cxx
index 0286031e671ef22c33a7a1c16cb7aad5c6bb5303..55241b812c62183918f22d5748eb3c1090943306 100644 (file)
--- a/src/gdcmRLEFramesInfo.cxx
+++ b/src/gdcmRLEFramesInfo.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFramesInfo.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/20 14:30:40 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -35,7 +35,7 @@ RLEFramesInfo::~RLEFramesInfo()
  * @param indent Indentation string to be prepended during printing.
  * @param os     Stream to print to.
  */
-void RLEFramesInfo::Print( std::string indent, std::ostream &os )
+void RLEFramesInfo::Print( std::ostream &os, std::string indent )
 {
    os << indent
       << "----------------- RLE frames --------------------------------"
@@ -49,7 +49,7 @@ void RLEFramesInfo::Print( std::string indent, std::ostream &os )
       os << indent
          << "   frame number :" << frameNumber++
          << std::endl;
-      (*it)->Print( indent + "   ", os );
+      (*it)->Print( os, indent + "   " );
    }
 }
 

diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h
index d8cb65effef8f04d332f463aa9074fdd2f6b41d1..fb35513e592ebaa89a723cf53a5873c893381d7c 100644 (file)
--- a/src/gdcmRLEFramesInfo.h
+++ b/src/gdcmRLEFramesInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFramesInfo.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:58 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -50,7 +50,7 @@ friend class PixelReadConvert;
    RLEFrameList Frames;
 public:
    ~RLEFramesInfo();
-   void Print( std::string indent = "", std::ostream &os = std::cout );
+   void Print( std::ostream &os = std::cout, std::string indent = "" );
 };
 } // end namespace gdcm
 

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index d4055914663513f5960d2dbeceea8ac0f551c0ed..85a6cd675fbcc0bf45fe59f8b9ec6feba9e5ee10 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: 2005/01/11 00:21:48 $
-  Version:   $Revision: 1.50 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.51 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -60,7 +60,7 @@ SQItem::~SQItem()
 /*
  * \brief   canonical Printer
  */
-void SQItem::Print(std::ostream &os)
+void SQItem::Print(std::ostream &os, std::string const &)
 {
    std::ostringstream s;
 

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index 58d5e86f1424217294742826d0cb86936c00a9d2..61ef33366decd8cff1734edb599d70a0da0f08c4 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: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  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
@@ -43,7 +43,7 @@ public:
    SQItem(int depthLevel);
    ~SQItem();
 
-   virtual void Print(std::ostream &os = std::cout); 
+   virtual void Print(std::ostream &os = std::cout, std::string const & indent = "" ); 
    void WriteContent(std::ofstream *fp, FileType filetype);
 
    /// \brief   returns the DocEntry chained List for this SQ Item.

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 9f2c4d195f3f622047720f68595af5b92c86cbf4..08465ea8dabbbf04a496c308922882faf1584a29 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: 2005/01/07 16:45:52 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.43 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -81,7 +81,7 @@ SeqEntry::~SeqEntry()
 /**
  * \brief   canonical Printer
  */
-void SeqEntry::Print( std::ostream &os )
+void SeqEntry::Print( std::ostream &os, std::string const & )
 {
    // First, Print the Dicom Element itself.
    os << "S ";

diff --git a/src/gdcmSeqEntry.h b/src/gdcmSeqEntry.h
index 901b33e6bf8d27081fd0ac064c55a07d392e4ea9..91b5b8b8fac3ab48ee59c3fb22922ca9a3a09b05 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: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -43,7 +43,7 @@ public:
    SeqEntry( DocEntry *d, int depth );
    ~SeqEntry();
    
-   void Print(std::ostream &os = std::cout); 
+   void Print(std::ostream &os = std::cout, std::string const & indent = "" ); 
    void WriteContent(std::ofstream *fp, FileType filetype);
 
    /// returns the SQITEM chained List for this SeQuence.

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 0ffc80910084d99d343c6216c4564c289c400f96..314368d26816a07781e2a4b5fbdf63b6185b1471 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: 2005/01/12 17:10:15 $
-  Version:   $Revision: 1.45 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.46 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -68,7 +68,7 @@ ValEntry::~ValEntry ()
 /**
  * \brief   canonical Printer
  */
-void ValEntry::Print(std::ostream &os)
+void ValEntry::Print(std::ostream &os, std::string const &)
 {
    uint16_t g = GetGroup();
    uint16_t e = GetElement();

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index d40e4f0d76087cc13c9d3dd4904913def386d587..a7ea3f5c5579d4a8e3e60279f4235da92fc80d14 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: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/01/16 04:50:42 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -48,7 +48,7 @@ public:
    /// The size is updated
    virtual void SetValue(std::string const &val);
 
-   virtual void Print(std::ostream &os = std::cout); 
+   virtual void Print(std::ostream &os = std::cout, std::string const & indent = ""); 
 
    virtual void WriteContent(std::ofstream *fp, FileType filetype);