Print

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index 3504fee1ee98e9a52cf5eb43a5bab9f25151cc43..106310443eca7167723e73e1f45ff1da4ff8cdc3 100644 (file)
--- 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 8d5f308b2ce1875733c6ec9c91942d20e9d8ebc7..e64c56900151ef6caad71c15afdd588eb9cc2695 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: 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 4957fe9447d39ea42bdfbae87c849401c14f52cb..afb8f04a515072ca148d6fad9b493338f14ac566 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: 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;