X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=3dd80953caa06389b42baaa21f9537ab9b645e4a;hb=f163238b46fdd5a54c1b6b70549ab9466c101d14;hp=ee0b42b8ebd44a1182bdfb84244c682e6dbe89c8;hpb=3b48ae81d6c358b352e726fa283296c496f35437;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index ee0b42b8..3dd80953 100644
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 14:03:30 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2004/08/01 03:20:23 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -41,27 +41,29 @@ gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e)
  */
 gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
 {
-   this->UsableLength = e->GetLength();
-   this->ReadLength   = e->GetReadLength();
-   this->ImplicitVR   = e->IsImplicitVR();
-   this->Offset       = e->GetOffset();
-   this->printLevel   = e->GetPrintLevel();
-   this->SQDepthLevel = e->GetDepthLevel();
+   UsableLength = e->GetLength();
+   ReadLength   = e->GetReadLength();
+   ImplicitVR   = e->IsImplicitVR();
+   Offset       = e->GetOffset();
+   PrintLevel   = e->GetPrintLevel();
+   SQDepthLevel = e->GetDepthLevel();
 
-   this->voidArea = NULL; // will be in BinEntry ?
+   voidArea = NULL; // will be in BinEntry ?
 }
 
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmValEntry::~gdcmValEntry (void)
+gdcmValEntry::~gdcmValEntry ()
 {
    if (!voidArea)  // will be in BinEntry
+   {
       free(voidArea);
+      voidArea = NULL; // let's be carefull !
+   }
 }
 
-
 //-----------------------------------------------------------------------------
 // Print
 /**
@@ -69,30 +71,28 @@ gdcmValEntry::~gdcmValEntry (void)
  */
 void gdcmValEntry::Print(std::ostream & os)
 {
+   uint16_t g = GetGroup();
+   uint16_t e = GetElement();
+   std::string vr = GetVR();
    std::ostringstream s; 
-   unsigned short int g, e;
    char st[20];
    TSKey v;
-   std::string d2, vr;
+   std::string d2;
      
-   PrintCommonPart(os); 
+   gdcmDocEntry::Print(os); 
 
-   g  = GetGroup();
-   
-   if (g == 0xfffe) {
-      s << std::endl;
-      os << s.str(); 
-      return;  // just to avoid identing all the remaining code     
+   if (g == 0xfffe)
+   {
+      // just to avoid identing all the remaining code     
+      return;
    }
    
-   e  = GetElement();
-   vr = GetVR();
    gdcmTS * ts = gdcmGlobal::GetTS();
     
    v  = GetValue();  // not applicable for SQ ...     
    d2 = CreateCleanString(v);  // replace non printable characters by '.'            
    if( (GetLength()<=MAX_SIZE_PRINT_ELEMENT_VALUE) || 
-       (printLevel>=3)  || (d2.find("gdcm::NotLoaded.") < d2.length()) )
+       (PrintLevel>=3)  || (d2.find("gdcm::NotLoaded.") < d2.length()) )
    {
       s << " [" << d2 << "]";
    }
@@ -101,78 +101,125 @@ void gdcmValEntry::Print(std::ostream & os)
       s << " [gdcm::too long for print (" << GetLength() << ") ]";
    }
    
-   // Display the UID value (instead of displaying only the rough code)  
-   if (g == 0x0002) {  // Any more to be displayed ?
+   // Display the UID value (instead of displaying only the rough code)
+   // First 'clean' trailing character (space or zero) 
+   if (g == 0x0002)
+   {
+      // Any more to be displayed ?
       if ( (e == 0x0010) || (e == 0x0002) )
+      {
+         if ( v.length() != 0 )  // for brain damaged headers
+         {
+            if ( ! isdigit(v[v.length()-1]) )
+            {
+               v.erase(v.length()-1, 1);
+            }
+         }
          s << "  ==>\t[" << ts->GetValue(v) << "]";
-   } else {
-      if (g == 0x0008) {
-         if ( (e == 0x0016) || (e == 0x1150)  )
+      }
+   }
+   else
+   {
+      if (g == 0x0008)
+      {
+         if ( e == 0x0016 || e == 0x1150 )
+         {
+            if ( v.length() != 0 )  // for brain damaged headers
+            {
+               if ( ! isdigit(v[v.length()-1]) )
+               {
+                  v.erase(v.length()-1, 1);
+               }
+            }
             s << "  ==>\t[" << ts->GetValue(v) << "]";
-      } else {
-         if (g == 0x0004) {
-           if ( (e == 0x1510) || (e == 0x1512)  )
+         }
+      }
+      else
+      {
+         if (g == 0x0004)
+         {
+            if ( (e == 0x1510) || (e == 0x1512)  )
+            {
+               if ( v.length() != 0 )  // for brain damaged headers  
+               {
+                  if ( ! isdigit(v[v.length()-1]) )
+                  {
+                     v.erase(v.length()-1, 1);  
+                  }
+               }
               s << "  ==>\t[" << ts->GetValue(v) << "]";
+            }
          }     
       }
    }
    //if (e == 0x0000) {        // elem 0x0000 --> group length 
-   if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") ) {
+   if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") )
+   {
       if (v == "4294967295") // to avoid troubles in convertion 
+      {
          sprintf (st," x(ffffffff)");
-      else {
-         if ( GetLength() !=0 )        
+      }
+      else
+      {
+         if ( GetLength() !=0 )
+         {
             sprintf(st," x(%x)", atoi(v.c_str()));//FIXME
-        else
-            sprintf(st," "); 
+         }
+         else
+         {
+            sprintf(st," ");
+         }
       }
       s << st;
    }
-        
-   s << std::endl;
-   os << s.str();   
+   os << s.str();
 }
 
-
 /*
  * \brief   canonical Writer
  */
-void gdcmValEntry::Write(FILE *fp, FileType filetype) {
-      std::string vr=GetVR();
-      int lgr=GetLength();
-      if (vr == "US" || vr == "SS") {
-         // some 'Short integer' fields may be mulivaluated
-         // each single value is separated from the next one by '\'
-         // we split the string and write each value as a short int
-         std::vector<std::string> tokens;
-         tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
-         Tokenize (GetValue(), tokens, "\\");
-         for (unsigned int i=0; i<tokens.size();i++) {
-            guint16 val_uint16 = atoi(tokens[i].c_str());
-            void *ptr = &val_uint16;
-            fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
-         }
-         tokens.clear();
-         return;
+void gdcmValEntry::Write(FILE *fp, FileType filetype)
+{
+   gdcmDocEntry::Write(fp, filetype);
+   std::string vr = GetVR();
+   int lgr = GetReadLength();
+   if (vr == "US" || vr == "SS")
+   {
+      // some 'Short integer' fields may be mulivaluated
+      // each single value is separated from the next one by '\'
+      // we split the string and write each value as a short int
+      std::vector<std::string> tokens;
+      tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
+      Tokenize (GetValue(), tokens, "\\");
+      for (unsigned int i=0; i<tokens.size();i++)
+      {
+         uint16_t val_uint16 = atoi(tokens[i].c_str());
+         void *ptr = &val_uint16;
+         fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
       }
-      if (vr == "UL" || vr == "SL") {
-         // Some 'Integer' fields may be multivaluated (multiple instances 
-         // of integers). But each single integer value is separated from the
-         // next one by '\' (backslash character). Hence we split the string
-         // along the '\' and write each value as an int:
-         std::vector<std::string> tokens;
-         tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
-         Tokenize (GetValue(), tokens, "\\");
-         for (unsigned int i=0; i<tokens.size();i++){
-            guint32 val_uint32 = atoi(tokens[i].c_str());
-            void *ptr = &val_uint32;
-            fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
-         }
-         tokens.clear();
-         return;
-      }           
-      fwrite (GetValue().c_str(),
-              (size_t)lgr ,(size_t)1, fp); // Elem value
+      tokens.clear();
+      return;
+   }
+   if (vr == "UL" || vr == "SL")
+   {
+      // Some 'Integer' fields may be multivaluated (multiple instances 
+      // of integers). But each single integer value is separated from the
+      // next one by '\' (backslash character). Hence we split the string
+      // along the '\' and write each value as an int:
+      std::vector<std::string> tokens;
+      tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
+      Tokenize (GetValue(), tokens, "\\");
+      for (unsigned int i=0; i<tokens.size();i++)
+      {
+         uint32_t val_uint32 = atoi(tokens[i].c_str());
+         void *ptr = &val_uint32;
+         fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
+      }
+      tokens.clear();
+      return;
+   } 
+          
+   fwrite (GetValue().c_str(), (size_t)lgr ,(size_t)1, fp); // Elem value
 } 
 
 //-----------------------------------------------------------------------------