Add a few missing 'group length' Elements

[gdcm.git] / src / gdcmHeaderEntry.cxx

diff --git a/src/gdcmHeaderEntry.cxx b/src/gdcmHeaderEntry.cxx
index c74b8afb8415d246645e534f72dc4806af4d4a9d..0185b9157ce0844e180d81b6b669043a9b9d075b 100644 (file)
--- a/src/gdcmHeaderEntry.cxx
+++ b/src/gdcmHeaderEntry.cxx
@@ -13,6 +13,9 @@
 #endif
 #include <iomanip> // for std::ios::left, ...
 
+
+#define MAX_SIZE_PRINT_ELEMENT_VALUE 10000
+
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -22,6 +25,7 @@
  */
 gdcmHeaderEntry::gdcmHeaderEntry(gdcmDictEntry* in) {
        ImplicitVR = false;
+       voidArea = NULL; // unsecure memory area to hold 'non string' values
        entry = in;
 }
 
@@ -32,23 +36,23 @@ void gdcmHeaderEntry::Print(std::ostream & os) {
    unsigned short int g, e;
    char st[20];
    TSKey v;
-   std::string d2;
+   std::string d2, vr;
    gdcmTS * ts = gdcmGlobal::GetTS();
    std::ostringstream s;
    guint32 lgth;
    char greltag[10];  //group element tag
-      
-   g = GetGroup();
-   e = GetElement();
-   v = GetValue();
-   o = GetOffset();
+   g  = GetGroup();
+   e  = GetElement();
+   v  = GetValue();
+   o  = GetOffset();
+   vr = GetVR();
    sprintf(greltag,"%04x|%04x ",g,e);           
    s << greltag ;
        
    d2 = _CreateCleanString(v);  // replace non printable characters by '.'
    if (printLevel>=2) { 
       s << "lg : ";
-      lgth = GetReadLength();
+      lgth = GetReadLength(); // ReadLength, as opposed to UsableLength
       if (lgth == 0xffffffff) {
          sprintf(st,"x(ffff)");  // I said : "x(ffff)" !
          s.setf(std::ios::left);
@@ -71,16 +75,29 @@ void gdcmHeaderEntry::Print(std::ostream & os) {
       s << std::setw(8) << o; 
    }
 
-   s << "[" << GetVR()  << "] ";
+   s << "[" << vr  << "] ";
 
    if (printLevel>=1) {      
       s.setf(std::ios::left);
       s << std::setw(66-GetName().length()) << " ";             
-   } 
-     
-   s << "[" << GetName()<< "]";       
-   s << " [" << d2 << "]";
+   }
+    
+   s << "[" << GetName()<< "]";
 
+   if (voidArea != NULL) {
+       s << " [gdcm::Non String Data Loaded in Unsecure Area (" 
+         << GetLength() << ") ]";
+   } 
+   
+   else {             
+      if( (GetLength()<MAX_SIZE_PRINT_ELEMENT_VALUE) || 
+          (printLevel>=3)  || 
+          (d2.find("gdcm::NotLoaded.") < d2.length()) )
+         s << " [" << d2 << "]";
+      else 
+         s << " [gdcm::too long for print (" << GetLength() << ") ]";
+   }
+   
    // Display the UID value (instead of displaying the rough code)  
    if (g == 0x0002) {  // Any more to be displayed ?
       if ( (e == 0x0010) || (e == 0x0002) )
@@ -89,13 +106,19 @@ void gdcmHeaderEntry::Print(std::ostream & os) {
       if (g == 0x0008) {
          if ( (e == 0x0016) || (e == 0x1150)  )
             s << "  ==>\t[" << ts->GetValue(v) << "]";
+      } else {
+         if (g == 0x0004) {
+           if ( (e == 0x1510) || (e == 0x1512)  )
+              s << "  ==>\t[" << ts->GetValue(v) << "]";
+        }     
       }
    }
-   if (e == 0x0000) {        // elem 0x0000 --> group length 
+   //if (e == 0x0000) {        // elem 0x0000 --> group length 
+   if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") ) {
       if (v == "4294967295") // to avoid troubles in convertion 
          sprintf (st," x(ffffffff)");
       else     
-         sprintf(st," x(%08x)",atoi(v.c_str()));
+         sprintf(st," x(%x)",(unsigned long)atof(v.c_str()));
       s << st;
    }
    s << std::endl;