X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=4fddd8831b4bbfffdabf2b808e8ef0ac3e937264;hb=5b89bede4607999aeb8d5b45311e7ee82f9471ef;hp=a329b54ce035fdf711f7393eab12532b5c655aba;hpb=98ab91206c2a0e603d6d9b11951860e5c78e315a;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index a329b54c..4fddd883 100644
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -1,119 +1,283 @@
-// gdcmValEntry.cxx
-//-----------------------------------------------------------------------------
-//
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmValEntry.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/02/02 16:18:49 $
+  Version:   $Revision: 1.56 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmValEntry.h"
+#include "gdcmVR.h"
 #include "gdcmTS.h"
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
 
-// CLEAN ME
+#include <fstream>
+
+namespace gdcm 
+{
+//-----------------------------------------------------------------------------
 #define MAX_SIZE_PRINT_ELEMENT_VALUE 128
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmValEntry
- * \brief   Constructor from a given gdcmDictEntry
+ * \brief   Constructor from a given DictEntry
  * @param   e Pointer to existing dictionary entry
  */
-gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e) {
-   voidArea = NULL; // will be in BinEntry ?
+ValEntry::ValEntry(DictEntry *e) 
+        : ContentEntry(e)
+{
+}
+
+/**
+ * \brief   Constructor from a given DocEntry
+ * @param   e Pointer to existing Doc entry
+ */
+ValEntry::ValEntry(DocEntry *e)
+        : ContentEntry(e->GetDictEntry())
+{
+   Copy(e);
 }
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmValEntry::~gdcmValEntry (void) {
-   if (!voidArea)  // will be in BinEntry
-      free(voidArea);
+ValEntry::~ValEntry ()
+{
 }
 
+//-----------------------------------------------------------------------------
+// Public
+/**
+ * \brief   Writes the std::string representable' value of a ValEntry
+ * @param fp already open ofstream pointer
+ * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
+ */
+void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
+{
+   DocEntry::WriteContent(fp, filetype);
+
+   if ( GetGroup() == 0xfffe )
+   {
+      return; //delimitors have NO value
+   }
+
+   const VRKey &vr = GetVR();
+   unsigned int lgr = GetLength();
+   if (vr == "US" || vr == "SS")
+   {
+      // some 'Short integer' fields may be multivaluated
+      // 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
+      Util::Tokenize (GetValue(), tokens, "\\");
+      for (unsigned int i=0; i<tokens.size();i++)
+      {
+         uint16_t val_uint16 = atoi(tokens[i].c_str());
+         binary_write( *fp, val_uint16);
+      }
+      tokens.clear();
+      return;
+   }
+   if (vr == "UL" || vr == "SL")
+   {
+      // Some 'Integer' fields may be multivaluated (multiple instances 
+      // of integer). 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
+      Util::Tokenize (GetValue(), tokens, "\\");
+      for (unsigned int i=0; i<tokens.size();i++)
+      {
+         uint32_t val_uint32 = atoi(tokens[i].c_str());
+         binary_write( *fp, val_uint32);
+      }
+      tokens.clear();
+      return;
+   } 
+
+   gdcmAssertMacro( lgr == GetValue().length() );
+   binary_write(*fp, GetValue());
+} 
+
+/**
+ * \brief   Sets the std::string representable' value of a ValEntry
+ * @param  val value to set 
+ */
+void ValEntry::SetValue(std::string const &val)
+{
+   // Integers have a special treatement for their length:
+   int l = val.length();
+   if ( l != 0) // To avoid to be cheated by 'zero length' integers
+   {   
+      const VRKey &vr = GetVR();
+      if( vr == "US" || vr == "SS" )
+      {
+         // for multivaluated items
+         l = (Util::CountSubstring(val, "\\") + 1) * 2;
+         ContentEntry::SetValue(val);
+      }
+      else if( vr == "UL" || vr == "SL" )
+      {
+         // for multivaluated items
+         l = (Util::CountSubstring(val, "\\") + 1) * 4;;
+         ContentEntry::SetValue(val);
+      }
+      else
+      {
+         std::string finalVal = Util::DicomString( val.c_str() );
+         gdcmAssertMacro( !(finalVal.size() % 2) );
+
+         l = finalVal.length();
+         ContentEntry::SetValue(finalVal);
+      }
+   }
+   else
+   {
+      std::string finalVal = Util::DicomString( val.c_str() );
+      gdcmAssertMacro( !(finalVal.size() % 2) );
+
+      l = finalVal.length();
+      ContentEntry::SetValue(finalVal);
+   }
+
+   SetLength(l);
+}
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
 
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmValEntry
- * \brief   canonical Printer
+ * \brief   Prints the 'std::string representable' value of ValEntry
+ * @param   os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
  */
-void gdcmValEntry::Print(std::ostream & os) { 
-
+void ValEntry::Print(std::ostream &os, std::string const &)
+{
+   uint16_t g = GetGroup();
+   uint16_t e = GetElement();
+   VRKey vr   = GetVR();
    std::ostringstream s; 
-   size_t o;
-   unsigned short int g, e;
-   char st[20];
-   TSKey v;
-   std::string d2, vr;
+   std::string st;
+   std::string d2;
      
-   PrintCommonPart(os); 
+   os << "V ";
+   DocEntry::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) // delimiters have NO value
+   {
+      // just to avoid identing all the remaining code     
+      return;
    }
    
-   e  = GetElement();
-   vr = GetVR();
-   gdcmTS * ts = gdcmGlobal::GetTS();
+   TS *ts = Global::GetTS();
     
-   if (voidArea != NULL) { // should be moved in gdcmBinEntry Printer (when any)
-       s << " [gdcm::Non String Data Loaded in Unsecure Area (" 
-         << GetLength() << ") ]";
-   } 
-   
-   else {
-      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()) )
-         s << " [" << d2 << "]";
-      else 
-         s << " [gdcm::too long for print (" << GetLength() << ") ]";
+   TSAtr v  = GetValue();  // not applicable for SQ ...     
+   d2 = Util::CreateCleanString(v);  // replace non printable characters by '.'            
+   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 only the rough code)  
-   if (g == 0x0002) {  // Any more to be displayed ?
-      if ( (e == 0x0010) || (e == 0x0002) )
+   // 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((unsigned char)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((unsigned char)v[v.length()-1]) )
+               {
+                  v.erase(v.length()-1, 1);
+               }
+            }
             s << "  ==>\t[" << ts->GetValue(v) << "]";
-      } else {
-         if (g == 0x0004) {
-	    if ( (e == 0x1510) || (e == 0x1512)  )
-	       s << "  ==>\t[" << ts->GetValue(v) << "]";
-	 }     
+         }
+      }
+      else
+      {
+         if (g == 0x0004)
+         {
+            if ( e == 0x1510 || e == 0x1512  )
+            {
+               if ( v.length() != 0 )  // for brain damaged headers  
+               {
+                  if ( ! isdigit((unsigned char)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 )        
-            sprintf(st," x(%x)", atoi(v.c_str()));//FIXME
-	 else
-	  sprintf(st," "); 
+      {
+         st = Util::Format(" x(ffffffff)");
+      }
+      else
+      {
+         if ( GetLength() != 0 )
+         {
+            st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME
+         }
+         else
+         {
+            st = Util::Format(" ");
+         }
       }
       s << st;
    }
-        
-   s << std::endl;
-   os << s.str();   
+   os << s.str();
 }
- 
 
 //-----------------------------------------------------------------------------
-// Public
+} // end namespace gdcm
 
-//-----------------------------------------------------------------------------
-// Protected
-
-//-----------------------------------------------------------------------------
-// Private
-
-//-----------------------------------------------------------------------------