X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=9160b21aeef91e478bf4cbce3c72be0eede56185;hb=879f56a62d0772c95e92d0657882eb1886b4153d;hp=2ab55cbfaf39685372e476628e464dde7c47ed3d;hpb=49c0af19f5bf0f2402d37d8abf7fb139e7453245;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 2ab55cbf..9160b21a 100644
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 00:59:22 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2004/10/10 00:42:55 $
+  Version:   $Revision: 1.29 $
                                                                                 
   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.htm for details.
+  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
@@ -32,23 +32,20 @@
  */
 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())
 {
    UsableLength = e->GetLength();
    ReadLength   = e->GetReadLength();
    ImplicitVR   = e->IsImplicitVR();
    Offset       = e->GetOffset();
-   printLevel   = e->GetPrintLevel();
-   SQDepthLevel = e->GetDepthLevel();
-
-   voidArea = NULL; // will be in BinEntry ?
+   PrintLevel   = e->GetPrintLevel();
 }
 
 
@@ -57,11 +54,6 @@ gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
  */
 gdcmValEntry::~gdcmValEntry ()
 {
-   if (!voidArea)  // will be in BinEntry
-   {
-      free(voidArea);
-      voidArea = NULL; // let's be carefull !
-   }
 }
 
 //-----------------------------------------------------------------------------
@@ -75,7 +67,7 @@ void gdcmValEntry::Print(std::ostream & os)
    uint16_t e = GetElement();
    std::string vr = GetVR();
    std::ostringstream s; 
-   char st[20];
+   std::string st;
    TSKey v;
    std::string d2;
      
@@ -90,9 +82,10 @@ void gdcmValEntry::Print(std::ostream & os)
    gdcmTS * ts = gdcmGlobal::GetTS();
     
    v  = GetValue();  // not applicable for SQ ...     
-   d2 = CreateCleanString(v);  // replace non printable characters by '.'            
+   d2 = gdcmUtil::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 << "]";
    }
@@ -157,17 +150,17 @@ void gdcmValEntry::Print(std::ostream & os)
    {
       if (v == "4294967295") // to avoid troubles in convertion 
       {
-         sprintf (st," x(ffffffff)");
+         st = gdcmUtil::Format(" x(ffffffff)");
       }
       else
       {
          if ( GetLength() !=0 )
          {
-            sprintf(st," x(%x)", atoi(v.c_str()));//FIXME
+            st = gdcmUtil::Format(" x(%x)", atoi(v.c_str()));//FIXME
          }
          else
          {
-            sprintf(st," ");
+            st = gdcmUtil::Format(" ");
          }
       }
       s << st;
@@ -178,9 +171,17 @@ void gdcmValEntry::Print(std::ostream & os)
 /*
  * \brief   canonical Writer
  */
-void gdcmValEntry::Write(FILE *fp, FileType filetype)
+void gdcmValEntry::Write(FILE* fp, FileType filetype)
 {
    gdcmDocEntry::Write(fp, filetype);
+
+   //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")
@@ -190,11 +191,11 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       // 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, "\\");
+      gdcmUtil::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;
+         void* ptr = &val_uint16;
          fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
       }
       tokens.clear();
@@ -208,11 +209,11 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       // 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, "\\");
+      gdcmUtil::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;
+         void* ptr = &val_uint32;
          fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
       }
       tokens.clear();