X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=a4011aa731b0fef048e8ec408ef6087f498088b4;hb=bd1e1aea88a95e4d14cd59088a7e5280703402ea;hp=474d5681305e2ad956335c115cab6ca3f6da9c45;hpb=5b89bede4607999aeb8d5b45311e7ee82f9471ef;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 474d5681..a4011aa7 100644
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/02 16:18:48 $
-  Version:   $Revision: 1.52 $
+  Date:      $Date: 2005/10/18 19:54:26 $
+  Version:   $Revision: 1.72 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -29,9 +29,7 @@
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
-#define MAX_SIZE_PRINT_ELEMENT_VALUE 64
 
-//-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
  * \brief   Constructor from a given DictEntry
@@ -52,7 +50,7 @@ DocEntry::DocEntry(DictEntry *in)
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \brief   Writes the common part of any ValEntry, BinEntry, SeqEntry
+ * \brief   Writes the common part of any DataEntry, SeqEntry
  * @param fp already open ofstream pointer
  * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
  */
@@ -62,7 +60,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    uint16_t group = GetGroup();
    VRKey vr       = GetVR();
    uint16_t el    = GetElement();
-   uint32_t lgr   = GetLength();
+   uint32_t lgth  = GetLength();
 
    if ( group == 0xfffe && el == 0x0000 )
    {
@@ -77,16 +75,18 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    binary_write( *fp, group); //group number
    binary_write( *fp, el);    //element number
 
-   if ( filetype == ExplicitVR )
+   // Dicom V3 group 0x0002 is *always* Explicit VR !
+   if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
    {
       // Special case of delimiters:
       if (group == 0xfffe)
       {
          // Delimiters have NO Value Representation
          // Hence we skip writing the VR.
+         //
          // In order to avoid further troubles, we choose to write them
          // as 'no-length' Item Delimitors (we pad by writing 0xffffffff)
-         // We shall force the end of a given Item by writting 
+         // We shall force the end of a given SeqItem by writting 
          //  a Item Delimitation Item (fffe, e00d)
 
          uint32_t ff = 0xffffffff;
@@ -94,24 +94,30 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
          return;
       }
 
-      uint16_t z = 0;
-      uint16_t shortLgr = lgr;
+      uint16_t zero = 0;
+      uint16_t shortLgr = (uint16_t)lgth;
 
-      if (vr == GDCM_UNKNOWN)
+      if( IsVRUnknown() )
       {
-         // Unknown was 'written'
-         // deal with Little Endian            
-         binary_write(*fp, shortLgr);
-         binary_write(*fp, z);
+         // GDCM_VRUNKNOWN was stored in the Entry VR;
+         // deal with Entry as if TS were Implicit VR
+ 
+         // FIXME : troubles expected on big endian processors :
+         // let lgth = 0x00001234
+         // we write 34 12 00 00 on little endian proc (OK)
+         // we write 12 34 00 00 on big endian proc (KO)          
+         //binary_write(*fp, shortLgr);
+         //binary_write(*fp, zero);
+
+         binary_write(*fp, lgth);
       }
       else
       {
-         binary_write(*fp, vr);
-         gdcmAssertMacro( vr.size() == 2 );
+         binary_write(*fp, vr.str());
                   
-         if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") )
+         if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") /*|| (vr == "UN")*/ )
          {
-            binary_write(*fp, z);
+            binary_write(*fp, zero);
             if (vr == "SQ")
             {
                // we set SQ length to ffffffff
@@ -121,7 +127,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
             }
             else
             {
-               binary_write(*fp, lgr);
+               binary_write(*fp, lgth);
             }
          }
          else
@@ -138,7 +144,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
       }
       else
       {
-         binary_write(*fp, lgr);
+         binary_write(*fp, lgth);
       }
    }
 }
@@ -177,6 +183,15 @@ bool DocEntry::IsItemDelimitor()
    return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
 }
 
+/**
+ * \brief   tells us if entry is the first one of an Item 
+ *          (fffe,e000) 
+ */
+bool DocEntry::IsItemStarter()
+{
+   return (GetGroup() == 0xfffe && GetElement() == 0xe000);
+}
+
 /**
  * \brief   tells us if entry is the last one of a 'no length' Sequence 
  *          (fffe,e0dd) 
@@ -207,7 +222,7 @@ void DocEntry::Copy(DocEntry *doc)
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \brief   Prints the common part of ValEntry, BinEntry, SeqEntry
+ * \brief   Prints the common part of DataEntry, SeqEntry
  * @param   os ostream we want to print in
  * @param indent Indentation string to be prepended during printing
  */
@@ -216,13 +231,14 @@ void DocEntry::Print(std::ostream &os, std::string const & )
    size_t o;
    std::string st;
    TSKey v;
-   std::string d2, vr;
+   std::string d2;
+   VRKey vr;
    std::ostringstream s;
    uint32_t lgth;
 
    o  = GetOffset();
    vr = GetVR();
-   if(vr==GDCM_UNKNOWN)
+   if ( vr == GDCM_VRUNKNOWN )
       vr="  ";
 
    s << DictEntry::TranslateToKey(GetGroup(),GetElement()); 
@@ -230,41 +246,49 @@ void DocEntry::Print(std::ostream &os, std::string const & )
    if (PrintLevel >= 2)
    {
       s << " lg : ";
-      lgth = GetReadLength(); // ReadLength, as opposed to Length
+      lgth = GetReadLength(); // ReadLength, as opposed to (usable) Length
       if (lgth == 0xffffffff)
       {
-         st = Util::Format("x(ffff)");  // I said : "x(ffff)" !
+         st = " ffff ";
          s.setf(std::ios::left);
-         s << std::setw(10-st.size()) << " ";  
-         s << st << " ";
+         s << std::setw(4);  
+         s << "    x(ffff) ";
          s.setf(std::ios::left);
          s << std::setw(8) << "-1"; 
       }
       else
       {
-         st = Util::Format("x(%x)",lgth);
+         st = Util::Format("x(%x)",lgth); // we may keep it
          s.setf(std::ios::left);
-         s << std::setw(10-st.size()) << " ";
+         s << std::setw(11-st.size()) << " ";
          s << st << " ";
          s.setf(std::ios::left);
          s << std::setw(8) << lgth; 
       }
       s << " Off.: ";
-      st = Util::Format("x(%x)",o); 
-      s << std::setw(10-st.size()) << " ";
+      st = Util::Format("x(%x)",o);  // we may keep it
+      s << std::setw(11-st.size()) << " ";
       s << st << " ";
       s << std::setw(8) << o; 
    }
+   if (PrintLevel >= 1)
+      s << " ";
 
    s << "[" << vr  << "] ";
 
+   std::string name;
+   if ( GetElement() == 0x0000 )
+      name = "Group Length";
+   else
+      name = GetName();
+
    if (PrintLevel >= 1)
    {
       s.setf(std::ios::left);
-      s << std::setw(66-GetName().length()) << " ";
+      s << std::setw(66-name.length()) << " ";
    }
     
-   s << "[" << GetName()<< "]";
+   s << "[" << name << "]";
    os << s.str();      
 }