doxygenation + modif in Header printing

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index ffb3d848027124d12c7a97f93e5e25448d7522e7..4ead10ad6f3e742d1e0c4552dded5c23ca4d011a 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -23,8 +23,7 @@
  * @return     
  */
  
-gdcmFile::gdcmFile(gdcmHeader *header)
-{
+gdcmFile::gdcmFile(gdcmHeader *header) {
    Header=header;
    SelfHeader=false;
 
@@ -48,8 +47,7 @@ gdcmFile::gdcmFile(gdcmHeader *header)
  *
  * @return     
  */
-gdcmFile::gdcmFile(std::string & filename)
-{
+gdcmFile::gdcmFile(std::string & filename) {
    Header=new gdcmHeader(filename.c_str());
    SelfHeader=true;
 
@@ -57,8 +55,7 @@ gdcmFile::gdcmFile(std::string & filename)
       SetPixelDataSizeFromHeader();
 }
 
-gdcmFile::gdcmFile(const char * filename)
-{
+gdcmFile::gdcmFile(const char * filename) {
    Header=new gdcmHeader(filename);
    SelfHeader=true;
 
@@ -70,14 +67,11 @@ gdcmFile::gdcmFile(const char * filename)
  * \ingroup   gdcmFile
  * \brief Destructor dedicated to writing a new DICOMV3 part10 compliant
  *        file (see SetFileName, SetDcmTag and Write)
- *        Opens (in read only and when possible) an existing file and checks
- *        for DICOM compliance. Returns NULL on failure.
  * \Note  If the gdcmHeader is created by the gdcmFile, it is destroyed
  *        by the gdcmFile
  * *
  */
-gdcmFile::~gdcmFile(void)
-{
+gdcmFile::~gdcmFile(void) {
    if(SelfHeader)
       delete Header;
    Header=NULL;
@@ -93,8 +87,7 @@ gdcmFile::~gdcmFile(void)
  * \brief     
  * @return     
  */
-gdcmHeader *gdcmFile::GetHeader(void)
-{
+gdcmHeader *gdcmFile::GetHeader(void) {
    return(Header);
 }
 

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index a8ca36fbcdb4bbfbbc86e36aa6e447fd96c83f7f..49933b6895ca9f63351abbf8b714166e448b86b2 100644 (file)
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -1839,9 +1839,11 @@ void gdcmHeader::FixHeaderEntryFoundLength(gdcmHeaderEntry * ElVal, guint32 Foun
     // if we don't, we lost 28800 characters from the Header :-(
                                                  
    else if(ElVal->GetGroup() == 0xfffe){ 
-      //printf("========================= %08x %d\n",FoundLength,FoundLength);
-                         // sometimes, length seems to be wrong                                      
-      //FoundLength =0;  // some more clever checking to be done !                                                     
+                       // sometimes, length seems to be wrong                                      
+      FoundLength =0;  // some more clever checking to be done !
+                       // I give up!
+                      // only  gdcm-MR-PHILIPS-16-Multi-Seq.dcm
+                      // causes troubles :-(                                                     
    }     
     
    ElVal->SetUsableLength(FoundLength);

diff --git a/src/gdcmHeaderEntrySet.cxx b/src/gdcmHeaderEntrySet.cxx
index acbefa4243b112e236565a416d8a61ea1ab225b0..7bea7efa3c1307702a4e5e1e4192b47d94e9eeb5 100644 (file)
--- a/src/gdcmHeaderEntrySet.cxx
+++ b/src/gdcmHeaderEntrySet.cxx
@@ -10,6 +10,8 @@
 #  include <sstream>
 #endif
 
+#include <iomanip> //la bibli qui va bien
+
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -76,14 +78,15 @@ void gdcmHeaderEntrySet::Print(std::ostream & os) {
       }              
       s << std::endl;
    }
+   os<<s.str();
 
    // List element
    guint32 lgth;
    char greltag[10];  //group element tag
-   
-
-   s << "------------ using listEntries -------------------" << std::endl; 
+ 
+   std::cout << "------------ using listEntries ----------------" << std::endl; 
 
+   char st[11];
    for (ListTag::iterator i = listEntries.begin();  
           i != listEntries.end();
           ++i){
@@ -93,29 +96,36 @@ void gdcmHeaderEntrySet::Print(std::ostream & os) {
       o = (*i)->GetOffset();
       sprintf(greltag,"%04x|%04x",g,e);           
       d2 = _CreateCleanString(v);  // replace non printable characters by '.'
-      s << greltag << ": lgth : ";
-      lgth = (*i)->GetReadLength();
-      
-      s << std::hex << "x(" << lgth << ") "<< std::dec << lgth;         
-      s << ",\t Offset : " << o;
-      s << " x(" << std::hex << o << std::dec << ") ";
-      s << "\t[" << (*i)->GetVR()    << "]";
-      s << "\t[" << (*i)->GetName()  << "]";       
-      s << "\t[" << d2 << "]";
-      
-      // Display the UID value (instead of displaying the rough code)  
+      cout << greltag << " lg : ";
+      lgth = (*i)->GetReadLength(); 
+      sprintf(st,"x(%x)",lgth);
+      std::cout.setf(ios::left);
+      std::cout << setw(10-strlen(st)) << " ";  
+      std::cout << st << " ";
+      std::cout.setf(ios::left);
+      std::cout << setw(8) << lgth; 
+      std::cout << " Off.: ";
+      sprintf(st,"x(%x)",o); 
+      std::cout << setw(10-strlen(st)) << " ";       
+      std::cout << st << " ";
+      std::cout << setw(8) << o; 
+      std::cout << "[" << (*i)->GetVR()  << "] ";
+      std::cout.setf(ios::left);
+      std::cout << setw(66-(*i)->GetName().length()) << " ";
+      std::cout << "[" << (*i)->GetName()<< "] ";       
+      std::cout << "[" << d2 << "]";
+       // Display the UID value (instead of displaying the rough code)  
       if (g == 0x0002) {  // Any more to be displayed ?
          if ( (e == 0x0010) || (e == 0x0002) )            
-            s << "  ==>\t[" << ts->GetValue(v) << "]";   
+            std::cout << "  ==>\t[" << ts->GetValue(v) << "]";   
       } else {
          if (g == 0x0008) {
             if ( (e == 0x0016) || (e == 0x1150)  )        
-               s << "  ==>\t[" << ts->GetValue(v) << "]"; 
+               std::cout << "  ==>\t[" << ts->GetValue(v) << "]"; 
          }
-      }              
-      s << std::endl;
-   }
-   os<<s.str();
+      }                        
+      std::cout << std::endl;
+   } 
 } 
 
 //-----------------------------------------------------------------------------