X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=14a8a81d6b5d176e425a054cdcf503df63c32ec2;hb=d9ac99c203134d9aa1ced194746748bbb1e005ac;hp=c076fcc0987ca1ecf780525792eddc2b3488da44;hpb=a7667287c96b694d414791dd93e33e8efe0e3bc6;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index c076fcc0..14a8a81d 100644
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/03/22 13:19:25 $
-  Version:   $Revision: 1.82 $
+  Date:      $Date: 2007/02/23 15:29:56 $
+  Version:   $Revision: 1.87 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,7 +23,7 @@
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
 #include "gdcmDebug.h"
-
+#include "gdcmDictSet.h"
 #include <iomanip> // for std::ios::left, ...
 #include <fstream>
 
@@ -34,23 +34,22 @@ namespace gdcm
 // Constructor / Destructor
 /**
  * \brief   Constructor from a given DictEntry
- * @param   in Pointer to existing dictionary entry
+ * @param   group Group number
+ * @param   elem Element number
+ * @param   vr VR 
  */
-DocEntry::DocEntry(DictEntry *in)
+DocEntry::DocEntry(uint16_t group, uint16_t elem, VRKey const &vr)
 {
    ImplicitVR = false;
-   DicomDict  = in;
+   DicomDict  = 0;   
    Offset     = 0 ; // To avoid further missprinting
 
    // init some variables
    ReadLength = 0;
    Length = 0;
 
-   gdcmAssertMacro(DicomDict);
-   DicomDict->Register();
-
-   VR = in->GetVR();
-   Key = in->GetKey();
+   VR = vr;
+   Key.SetGroupElem(group,elem);
 }
 
 /**
@@ -58,9 +57,11 @@ DocEntry::DocEntry(DictEntry *in)
  */
 DocEntry::~DocEntry()
 {
-   gdcmAssertMacro(DicomDict);
-
-   DicomDict->Unregister();
+   if (DicomDict)
+   {
+      gdcmAssertMacro(DicomDict);
+      DicomDict->Unregister();
+   }
 }
 
 //-----------------------------------------------------------------------------
@@ -80,7 +81,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    VRKey vr       = GetVR();
    uint16_t elem  = GetElement();
    uint32_t lgth  = GetLength();
-
+  
    if ( group == 0xfffe && elem == 0x0000 )
    {
      // Fix in order to make some MR PHILIPS images e-film readable
@@ -102,13 +103,13 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    binary_write( *fp, elem);  //element number
 
    // Dicom V3 group 0x0002 is *always* Explicit VR !
-   if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
+   if ( filetype == ExplicitVR || filetype == JPEG || filetype == JPEG2000 || group == 0x0002 )
    {
 // ----------- Writes the common part : the VR + the length 
   
       // Special case of delimiters:
       if (group == 0xfffe)
-      {
+      {   
          // Delimiters have NO Value Representation
          // Hence we skip writing the VR.
          //
@@ -121,7 +122,6 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
          binary_write(*fp, ff);
          return;
       }
-
       uint16_t zero = 0;
       uint16_t shortLgr = (uint16_t)lgth;
 
@@ -129,19 +129,22 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
       {
          // GDCM_VRUNKNOWN was stored in the Entry VR;
          // deal with Entry as if TS were Implicit VR
- 
          binary_write(*fp, lgth);
       }
       else
       {
          binary_write(*fp, vr.str());
-
          // See PS 3.5-2004 page 33, 36                  
          if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OF") 
           ||  (vr == "UN") || (vr == "UT") )
          {
             binary_write(*fp, zero);
-            if (vr == "SQ")
+           if ( (filetype == JPEG || filetype == JPEG2000) && group == 0x7fe0 && elem == 0x0010)
+            {
+               gdcmAssertMacro( GetVR() == "OW" );
+               binary_write(*fp, ffff);
+            }  
+            else if (vr == "SQ")
             {
                // we set SQ length to ffffffff
                // and  we shall write a Sequence Delimitor Item 
@@ -173,6 +176,39 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    }
 }
 
+/// \brief Returns the 'Name' '(e.g. "Patient's Name") found in the Dicom
+/// Dictionnary of the current Dicom Header Entry
+std::string const &DocEntry::GetName() 
+{ 
+   if (DicomDict == 0)
+      DicomDict =
+                 Global::GetDicts()->GetDefaultPubDict()->GetEntry(Key[0],Key[1]);
+   if (DicomDict == 0)
+      return GDCM_UNKNOWN;
+   else
+   {
+      DicomDict->Register();
+      return DicomDict->GetName();
+   }
+}
+
+   /// \brief Returns the 'Value Multiplicity' (e.g. "1", "6", "1-n", "3-n"),
+   /// found in the Dicom entry or in the Dicom Dictionnary
+   /// of the current Dicom entry
+std::string const &DocEntry::GetVM()
+{
+   if (DicomDict == 0)
+      DicomDict =
+                 Global::GetDicts()->GetDefaultPubDict()->GetEntry(Key[0],Key[1]);
+   if (DicomDict == 0)
+      return GDCM_UNKNOWN;
+   else
+   {
+      DicomDict->Register();
+      return DicomDict->GetVM();
+   }
+}
+
 /**
  * \brief   Gets the full length of the elementary DocEntry (not only value
  *          length) depending on the VR.
@@ -198,33 +234,6 @@ uint32_t DocEntry::GetFullLength()
    return l;
 }
 
-/**
- * \brief   tells us if entry is the last one of a 'no length' SequenceItem 
- *          (fffe,e00d) 
- */
-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) 
- */
-bool DocEntry::IsSequenceDelimitor()
-{
-   return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);
-}
-
 /**
  * \brief Copies all the attributes from an other DocEntry 
  * @param doc entry to copy from
@@ -304,8 +313,14 @@ void DocEntry::Print(std::ostream &os, std::string const & )
    if ( GetElement() == 0x0000 )
       name = "Group Length";
    else
+   {
       name = GetName();
-
+      // prevent Print from any CR at end of name (hope it's enought!)
+      if (name[name.length()-1] == 0x0d || name[name.length()-1] == 0x0a)
+      {  
+         name.replace(name.length()-1, 1, 1, ' ');
+      }
+   }
    if (PrintLevel >= 1)
    {
       s.setf(std::ios::left);