X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeaderEntry.cxx;h=b3dd2ef2254b2a9e3aae7f5488c96686300e0973;hb=cdc2a0e2a1e53f0efef4412a248566e076b1f4c9;hp=f2e78cb82f5763196731f62d5f659b3c5ded7779;hpb=a394111e93ec16aade3e5a074e6574f50559b7d0;p=gdcm.git

diff --git a/src/gdcmHeaderEntry.cxx b/src/gdcmHeaderEntry.cxx
index f2e78cb8..b3dd2ef2 100644
--- 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 64
+
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -21,83 +24,110 @@
  * @param   in Pointer to existing dictionary entry
  */
 gdcmHeaderEntry::gdcmHeaderEntry(gdcmDictEntry* in) {
-	ImplicitVr = false;
+	ImplicitVR = false;
+	voidArea = NULL; // unsecure memory area to hold 'non string' values
 	entry = in;
 }
 
 //-----------------------------------------------------------------------------
 // Print
-
+/**
+ * \ingroup gdcmHeaderEntry
+ * \brief   canonical Printer
+ */
 void gdcmHeaderEntry::Print(std::ostream & os) {
    size_t o;
    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();
-      sprintf(greltag,"%04x|%04x ",g,e);           
-      d2 = _CreateCleanString(v);  // replace non printable characters by '.'
-      s << greltag ;
-          
-      if (printLevel>=2) { 
-         s << "lg : ";
-         lgth = GetReadLength();
-         if (lgth == 0xffffffff) {
-            sprintf(st,"x(%ff)");
-            s.setf(std::ios::left);
-            s << std::setw(10-strlen(st)) << " ";  
-            s << st << " ";
-            s.setf(std::ios::left);
-            s << std::setw(8) << "-1";      
-         } else {
-            sprintf(st,"x(%x)",lgth);
-            s.setf(std::ios::left);
-            s << std::setw(10-strlen(st)) << " ";  
-            s << st << " ";
-            s.setf(std::ios::left);
-            s << std::setw(8) << lgth; 
-         }
-         s << " Off.: ";
-         sprintf(st,"x(%x)",o); 
-         s << std::setw(10-strlen(st)) << " ";       
+
+   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(); // ReadLength, as opposed to UsableLength
+      if (lgth == 0xffffffff) {
+         sprintf(st,"x(ffff)");  // I said : "x(ffff)" !
+         s.setf(std::ios::left);
+         s << std::setw(10-strlen(st)) << " ";  
          s << st << " ";
-         s << std::setw(8) << o; 
-      }
-      if (printLevel>=1) {      
-         s << "[" << GetVR()  << "] ";
          s.setf(std::ios::left);
-         s << std::setw(66-GetName().length()) << " ";	     	 
-      } 
-        
-      s << "[" << GetName()<< "]";       
-      s << " [" << 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) << "]";   
+         s << std::setw(8) << "-1";      
       } else {
-         if (g == 0x0008) {
-            if ( (e == 0x0016) || (e == 0x1150)  ) 	   
-               s << "  ==>\t[" << ts->GetValue(v) << "]"; 
-         }
-      } 
-      if (e == 0x0000) {        // elem 0x0000 --> group length 
-	 if (v == "4294967295") // to avoid troubles in convertion 
-	    sprintf (st," x(ffffffff)");
-	 else	
-            sprintf(st," x(%08x)",atoi(v.c_str()));
-         s << st;
-      }                     
-      s << std::endl;
-      os << s.str();
+         sprintf(st,"x(%x)",lgth);
+         s.setf(std::ios::left);
+         s << std::setw(10-strlen(st)) << " ";  
+         s << st << " ";
+         s.setf(std::ios::left);
+         s << std::setw(8) << lgth; 
+      }
+      s << " Off.: ";
+      sprintf(st,"x(%x)",o); 
+      s << std::setw(10-strlen(st)) << " ";
+      s << st << " ";
+      s << std::setw(8) << o; 
+   }
+
+   s << "[" << vr  << "] ";
+
+   if (printLevel>=1) {      
+      s.setf(std::ios::left);
+      s << std::setw(66-GetName().length()) << " ";	     	 
+   }
+    
+   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) )
+         s << "  ==>\t[" << ts->GetValue(v) << "]";
+   } else {
+      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 ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") ) {
+      if (v == "4294967295") // to avoid troubles in convertion 
+         sprintf (st," x(ffffffff)");
+      else	
+         sprintf(st," x(%x)",(unsigned long)atof(v.c_str()));
+      s << st;
+   }
+   s << std::endl;
+   os << s.str();
 }
 
 //-----------------------------------------------------------------------------