X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=82d2743610880317549e47ab8f1de5b6bbe6a8d1;hb=ab0aa4fa11e3ac7ec236d1aceb6f0cf89fe83eae;hp=c0082d832bb279989dfb8cdf9822fb1630f99fad;hpb=513f52eb83d002f898a8f0995e8525b269d9d225;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index c0082d83..82d27436 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/23 13:02:36 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2004/09/13 12:10:53 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -32,36 +32,30 @@
  */
 gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e)
 {
-   voidArea = NULL; // will be in BinEntry ?
 }
 
 /**
  * \brief   Constructor from a given gdcmDocEntry
  * @param   e Pointer to existing Doc entry
  */
-gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
+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();
-
-   this->voidArea = NULL; // will be in BinEntry ?
+   UsableLength = e->GetLength();
+   ReadLength   = e->GetReadLength();
+   ImplicitVR   = e->IsImplicitVR();
+   Offset       = e->GetOffset();
+   PrintLevel   = e->GetPrintLevel();
 }
 
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmValEntry::~gdcmValEntry (void)
+gdcmValEntry::~gdcmValEntry ()
 {
-   if (!voidArea)  // will be in BinEntry
-      free(voidArea);
 }
 
-
 //-----------------------------------------------------------------------------
 // Print
 /**
@@ -69,8 +63,8 @@ gdcmValEntry::~gdcmValEntry (void)
  */
 void gdcmValEntry::Print(std::ostream & os)
 {
-   guint16 g = GetGroup();
-   guint16 e = GetElement();
+   uint16_t g = GetGroup();
+   uint16_t e = GetElement();
    std::string vr = GetVR();
    std::ostringstream s; 
    char st[20];
@@ -90,7 +84,8 @@ void gdcmValEntry::Print(std::ostream & os)
    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()) )
+       (PrintLevel>=3)  || (d2.find(GDCM_NOTLOADED) < d2.length()) )
    {
       s << " [" << d2 << "]";
    }
@@ -99,18 +94,54 @@ 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) << "]";
+            }
          }     
       }
    }
@@ -118,12 +149,19 @@ void gdcmValEntry::Print(std::ostream & os)
    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;
    }
@@ -136,8 +174,16 @@ void gdcmValEntry::Print(std::ostream & os)
 void gdcmValEntry::Write(FILE *fp, FileType filetype)
 {
    gdcmDocEntry::Write(fp, filetype);
-   std::string vr=GetVR();
-   int lgr=GetLength();
+
+   //std::cout << "=====================================" << GetVR() << std::endl;
+      
+   if ( GetGroup() == 0xfffe ) 
+   {
+      return; //delimitors have NO value
+   }
+      
+   std::string vr = GetVR();
+   int lgr = GetReadLength();
    if (vr == "US" || vr == "SS")
    {
       // some 'Short integer' fields may be mulivaluated
@@ -146,8 +192,9 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       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());
+      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);
       }
@@ -163,14 +210,16 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       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());
+      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
 }