From e8caac199c2683cb0f118c42c61dc6aec85b1eec Mon Sep 17 00:00:00 2001 From: malaterre Date: Sun, 16 Jan 2005 04:50:40 +0000 Subject: [PATCH] BUG: Remove the Print indent mess. Please only one Print per class default paramater are designed for this --- ChangeLog | 5 +++++ src/gdcmBase.cxx | 6 +++--- src/gdcmBase.h | 6 +++--- src/gdcmBinEntry.cxx | 6 +++--- src/gdcmBinEntry.h | 6 +++--- src/gdcmDicomDir.cxx | 6 +++--- src/gdcmDicomDir.h | 6 +++--- src/gdcmDicomDirImage.cxx | 6 +++--- src/gdcmDicomDirImage.h | 6 +++--- src/gdcmDicomDirMeta.cxx | 6 +++--- src/gdcmDicomDirMeta.h | 6 +++--- src/gdcmDicomDirPatient.cxx | 6 +++--- src/gdcmDicomDirPatient.h | 6 +++--- src/gdcmDicomDirSerie.cxx | 6 +++--- src/gdcmDicomDirSerie.h | 6 +++--- src/gdcmDicomDirStudy.cxx | 6 +++--- src/gdcmDicomDirStudy.h | 6 +++--- src/gdcmDict.cxx | 6 +++--- src/gdcmDict.h | 6 +++--- src/gdcmDictEntry.cxx | 6 +++--- src/gdcmDictEntry.h | 6 +++--- src/gdcmDictSet.cxx | 6 +++--- src/gdcmDictSet.h | 6 +++--- src/gdcmDocEntry.cxx | 6 +++--- src/gdcmDocEntry.h | 6 +++--- src/gdcmElementSet.cxx | 6 +++--- src/gdcmElementSet.h | 6 +++--- src/gdcmFile.cxx | 6 +++--- src/gdcmFile.h | 6 +++--- src/gdcmJPEGFragment.cxx | 6 +++--- src/gdcmJPEGFragment.h | 6 +++--- src/gdcmJPEGFragmentsInfo.cxx | 8 ++++---- src/gdcmJPEGFragmentsInfo.h | 6 +++--- src/gdcmPixelReadConvert.cxx | 19 +++++-------------- src/gdcmPixelReadConvert.h | 7 +++---- src/gdcmRLEFrame.cxx | 6 +++--- src/gdcmRLEFrame.h | 6 +++--- src/gdcmRLEFramesInfo.cxx | 8 ++++---- src/gdcmRLEFramesInfo.h | 6 +++--- src/gdcmSQItem.cxx | 6 +++--- src/gdcmSQItem.h | 6 +++--- src/gdcmSeqEntry.cxx | 6 +++--- src/gdcmSeqEntry.h | 6 +++--- src/gdcmValEntry.cxx | 6 +++--- src/gdcmValEntry.h | 6 +++--- 45 files changed, 141 insertions(+), 146 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19903257..56181890 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-15 Mathieu Malaterre + * 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 * 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 4e3753a6..2b068043 100644 --- 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 45589730..35198eb9 100644 --- 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 1d6a7c56..19ac4d65 100644 --- 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 e04dcf1f..e1f3c045 100644 --- 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 541273ab..fa16153d 100644 --- 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 07b099ea..9aaad605 100644 --- 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 036dc715..e1f201ff 100644 --- 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 29204297..cb5026df 100644 --- 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 05ef4358..b1e40f54 100644 --- 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 334e52fb..9e530882 100644 --- 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 815cdc1a..9a26b4fc 100644 --- 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 e33d4e15..80a535e1 100644 --- 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 2edbf5ea..b78fc9fd 100644 --- 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 4f2f0749..d86e5e49 100644 --- 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 e817e734..5ac40f93 100644 --- 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 214ba2d9..aad51502 100644 --- 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 027ce31a..e8ad7f97 100644 --- 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 ca31531e..ee039f56 100644 --- 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 615708c4..7699a4a8 100644 --- 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 89a85c0c..5fc005d9 100644 --- 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 787cba26..f5c4f65b 100644 --- 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 54c8b0fc..414ef990 100644 --- 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 b1c276d2..9021e931 100644 --- 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 5f434ca0..269c50de 100644 --- 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 397e4e1b..afabc9af 100644 --- 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 fff8f723..7a4e5124 100644 --- 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 7766e102..593a0998 100644 --- 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 219eddbb..f958d9a2 100644 --- 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 62113400..0af4944d 100644 --- 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 a446d9c7..4047d2b8 100644 --- 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 7a1ad397..88725b92 100644 --- 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 4f445b7d..55ad8f99 100644 --- 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 3cddb493..12655270 100644 --- 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 1938f890..13722201 100644 --- 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 72d2a1c3..8ebb8f61 100644 --- 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 21b2dd30..bffdbea8 100644 --- 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 0286031e..55241b81 100644 --- 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 d8cb65ef..fb35513e 100644 --- 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 d4055914..85a6cd67 100644 --- 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 58d5e86f..61ef3336 100644 --- 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 9f2c4d19..08465ea8 100644 --- 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 901b33e6..91b5b8b8 100644 --- 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 0ffc8091..314368d2 100644 --- 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 d40e4f0d..a7ea3f5c 100644 --- 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); -- 2.48.1