X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=747a1479b3370de7ca792caef152d77de03e98bf;hb=df832cf7f90b4ca5aca2f628c1756fb276779fac;hp=8d5f308b2ce1875733c6ec9c91942d20e9d8ebc7;hpb=8e7d7cb974953d9bc78b905451de7ca72887dc58;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 8d5f308b..747a1479 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.cxx,v $ Language: C++ - Date: $Date: 2007/08/29 15:30:49 $ - Version: $Revision: 1.93 $ + Date: $Date: 2007/10/30 09:14:42 $ + Version: $Revision: 1.96 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -33,7 +33,7 @@ namespace GDCM_NAME_SPACE // Constructor / Destructor /** - * \brief Constructor from a given DictEntry + * \brief Constructor from a given DocEntry * @param group Group number * @param elem Element number * @param vr VR @@ -42,7 +42,7 @@ DocEntry::DocEntry(uint16_t group, uint16_t elem, VRKey const &vr) { ImplicitVR = false; DicomDict = 0; - Offset = 0 ; // To avoid further missprinting + Offset = 0 ; // To avoid further misprinting // init some variables ReadLength = 0; @@ -53,7 +53,7 @@ DocEntry::DocEntry(uint16_t group, uint16_t elem, VRKey const &vr) } /** - * \brief Destructor from a given DictEntry + * \brief Destructor from a given DocEntry */ DocEntry::~DocEntry() { @@ -135,7 +135,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype, bool insideMet //{ binary_write(*fp, vr.str()); // See PS 3.5-2004 page 33, 36 - if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OF") + if ( (vr == "SQ") || (vr == "OB") || (vr == "OW") || (vr == "OL") || (vr == "OF") || (vr == "UN") || (vr == "UT") ) { binary_write(*fp, zero); @@ -223,7 +223,7 @@ uint32_t DocEntry::GetFullLength() } else { - if ( GetVR()=="OB" || GetVR()=="OW" || GetVR()=="SQ" ) + if ( GetVR()=="OB" || GetVR()=="OW" || GetVR()=="OL" || GetVR()=="SQ" ) { l = l + 12; // 2 (gr) + 2 (el) + 2 (vr) + 2 (unused) + 4 (lgth) } @@ -256,7 +256,7 @@ void DocEntry::Copy(DocEntry *doc) //----------------------------------------------------------------------------- // Print /** - * \brief Prints the common part of DataEntry, SeqEntry + * \brief Prints the common part (vr [length offset] name) of DataEntry, SeqEntry * @param os ostream we want to print in * @param indent Indentation string to be prepended during printing */ @@ -305,7 +305,7 @@ void DocEntry::Print(std::ostream &os, std::string const & ) s << st << " "; s << std::setw(8) << o; } - if (PrintLevel >= 1) + //if (PrintLevel >= 1) s << " "; s << "[" << vr << "] ";