X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirObject.cxx;h=ce17714bcdec2adb015ec3b8e2e1d5e83a1c1f41;hb=3869544e5153cebbd44ad8778cbaf35883bfb993;hp=11dfd84c78ce3bccdffc9d89847597793f436674;hpb=7f5f66f57c85e30920d807612d32a65800cb1df0;p=gdcm.git diff --git a/src/gdcmDicomDirObject.cxx b/src/gdcmDicomDirObject.cxx index 11dfd84c..ce17714b 100644 --- a/src/gdcmDicomDirObject.cxx +++ b/src/gdcmDicomDirObject.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirObject.cxx,v $ Language: C++ - Date: $Date: 2004/12/06 11:37:38 $ - Version: $Revision: 1.10 $ + Date: $Date: 2005/01/06 20:03:27 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,11 +27,8 @@ namespace gdcm //----------------------------------------------------------------------------- /** - * \ingroup DicomDirObject * \brief Constructor * - * @param ptagHT pointer to the HTable (DicomDirObject needs it - * to build the DocEntries) * @param depth Sequence depth level */ @@ -42,7 +39,6 @@ DicomDirObject::DicomDirObject(int depth) /** - * \ingroup DicomDirObject * \brief Canonical destructor. */ DicomDirObject::~DicomDirObject() @@ -50,13 +46,11 @@ DicomDirObject::~DicomDirObject() } - //----------------------------------------------------------------------------- // Public /** - * \ingroup DicomDirObject * \brief Builds a hash table (multimap) containing * pointers to all Header Entries (i.e Dicom Element) * related to this 'object' @@ -79,8 +73,9 @@ TagDocEntryHT DicomDirObject::GetEntry() /** * \brief add the 'Object' related Dicom Elements to the listEntries * of a partially created DICOMDIR + * @param elemList Element List to add at the right place */ -void DicomDirObject::FillObject(ListDicomDirMetaElem const & elemList) +void DicomDirObject::FillObject(ListDicomDirMetaElem const &elemList) { // FillObject rempli le SQItem qui sera accroche au bon endroit @@ -99,28 +94,6 @@ void DicomDirObject::FillObject(ListDicomDirMetaElem const & elemList) entry->SetOffset(0); // just to avoid further missprinting entry->SetValue(it->Value); - // dealing with value length ... - - if(dictEntry->GetGroup()==0xfffe) - { - entry->SetLength(entry->GetValue().length()); - } - else if( dictEntry->GetVR() == "UL" || dictEntry->GetVR() == "SL" ) - { - entry->SetLength(4); - } - else if( dictEntry->GetVR() == "US" || dictEntry->GetVR() == "SS" ) - { - entry->SetLength(2); - } - else if( dictEntry->GetVR() == "SQ" ) - { - entry->SetLength(0xffffffff); - } - else - { - entry->SetLength(entry->GetValue().length()); - } AddEntry(entry); } }