From 4ae5f29bc5a2fa48c38fe43d331e5099aad4ed0f Mon Sep 17 00:00:00 2001 From: jpr Date: Fri, 14 Sep 2007 08:22:19 +0000 Subject: [PATCH] Print --- src/gdcmDataEntry.cxx | 12 ++++++------ src/gdcmDocEntry.cxx | 8 ++++---- src/gdcmSeqEntry.cxx | 9 +++++---- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx index 3504fee1..10631044 100644 --- a/src/gdcmDataEntry.cxx +++ b/src/gdcmDataEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDataEntry.cxx,v $ Language: C++ - Date: $Date: 2007/08/29 15:30:48 $ - Version: $Revision: 1.47 $ + Date: $Date: 2007/09/14 08:22:19 $ + Version: $Revision: 1.48 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -82,9 +82,6 @@ DataEntry::~DataEntry () } -//----------------------------------------------------------------------------- -// Print - //----------------------------------------------------------------------------- // Public /** @@ -654,6 +651,7 @@ uint32_t DataEntry::ComputeFullLength() //----------------------------------------------------------------------------- // Protected + /// \brief Creates a DataEntry owned BinArea /// (remove previous one if any and relevant StrArea if any) void DataEntry::NewBinArea( ) @@ -691,7 +689,9 @@ void DataEntry::DeleteBinArea(void) */ void DataEntry::Print(std::ostream &os, std::string const & ) { - os << "D "; + //os << "D "; + + // First, Print the common part (vr [length offset] name). DocEntry::Print(os); uint16_t g = GetGroup(); diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 8d5f308b..e64c5690 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.cxx,v $ Language: C++ - Date: $Date: 2007/08/29 15:30:49 $ - Version: $Revision: 1.93 $ + Date: $Date: 2007/09/14 08:22:19 $ + 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 @@ -256,7 +256,7 @@ void DocEntry::Copy(DocEntry *doc) //----------------------------------------------------------------------------- // Print /** - * \brief Prints the common part of DataEntry, SeqEntry + * \brief Prints the common part (vr [length offset] name) of DataEntry, SeqEntry * @param os ostream we want to print in * @param indent Indentation string to be prepended during printing */ @@ -305,7 +305,7 @@ void DocEntry::Print(std::ostream &os, std::string const & ) s << st << " "; s << std::setw(8) << o; } - if (PrintLevel >= 1) + //if (PrintLevel >= 1) s << " "; s << "[" << vr << "] "; diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 4957fe94..afb8f04a 100644 --- a/src/gdcmSeqEntry.cxx +++ b/src/gdcmSeqEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.cxx,v $ Language: C++ - Date: $Date: 2007/08/29 15:30:50 $ - Version: $Revision: 1.70 $ + Date: $Date: 2007/09/14 08:22:19 $ + Version: $Revision: 1.71 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -275,8 +275,9 @@ void SeqEntry::Copy(DocEntry *doc) */ void SeqEntry::Print( std::ostream &os, std::string const & ) { - // First, Print the Dicom Element itself. - os << "S "; + // os << "S "; + + // First, Print the common part (vr [length offset] name). DocEntry::Print(os); os << std::endl; -- 2.45.1