X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmElementSet.cxx;h=215589b811bd10ac6c4c3e2b29101ae0e8bd2916;hb=ee38a24e454e9675ee479469a844f8a850bc1afa;hp=8dddf32077614fca22fbf8a135e6151aa65855d5;hpb=21d241b3fdcf675d8d91a6daf6dfd6f448b68195;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index 8dddf320..215589b8 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2005/10/11 08:24:10 $ - Version: $Revision: 1.64 $ + Date: $Date: 2005/10/18 09:17:08 $ + Version: $Revision: 1.66 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,9 +18,8 @@ #include "gdcmElementSet.h" #include "gdcmDebug.h" -#include "gdcmValEntry.h" -#include "gdcmBinEntry.h" #include "gdcmSeqEntry.h" +#include "gdcmDataEntry.h" namespace gdcm { @@ -29,11 +28,9 @@ namespace gdcm /** * \brief Constructor for a given ElementSet */ -//BOZ depthLevel is not usefull anymore -ElementSet::ElementSet(int depthLevel) +ElementSet::ElementSet() : DocEntrySet() { - (void)depthLevel; } /** @@ -196,11 +193,11 @@ void ElementSet::Print(std::ostream &os, std::string const & ) { // Let's change the 'warning value' for Pixel Data, // to avoid human reader to be confused by 'gdcm::NotLoaded'. - gdcm::BinEntry *pixelElement = GetBinEntry(0x7fe0,0x0010); + DataEntry *pixelElement = GetDataEntry(0x7fe0,0x0010); if ( pixelElement != 0 ) { - pixelElement->SetValue( gdcm::GDCM_PIXELDATA); - } + pixelElement->SetFlag( DataEntry::FLAG_PIXELDATA ); + } for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i) { @@ -209,7 +206,7 @@ void ElementSet::Print(std::ostream &os, std::string const & ) entry->SetPrintLevel(PrintLevel); entry->Print(os); - if ( dynamic_cast(entry) ) + if ( dynamic_cast(entry) ) { // Avoid the newline for a sequence: continue;