X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=0b373346fdc4b77ca884123f8f7e6896f6cca8bf;hb=cac61ccf53d9b3be025fa52df3fe647e75e8648f;hp=b9d59ac01ad4b9b8621b53f1413b6a4546df2953;hpb=61e1a3e0ce5480990a0d0b844cf0e86d1775306d;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index b9d59ac0..0b373346 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -1,8 +1,26 @@ -// gdcmElementSet.cxx -//----------------------------------------------------------------------------- -// +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmElementSet.cxx,v $ + Language: C++ + Date: $Date: 2004/06/22 14:42:02 $ + Version: $Revision: 1.12 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmElementSet.h" #include "gdcmDebug.h" +#include "gdcmValEntry.h" +#include "gdcmBinEntry.h" +#include "gdcmSeqEntry.h" //----------------------------------------------------------------------------- // Constructor / Destructor @@ -25,7 +43,7 @@ gdcmElementSet::~gdcmElementSet() { EntryToDelete = cc->second; if ( EntryToDelete ) - delete EntryToDelete; // TODO : a verifier + delete EntryToDelete; } tagHT.clear(); } @@ -45,12 +63,47 @@ gdcmElementSet::~gdcmElementSet() void gdcmElementSet::Print(std::ostream & os) { for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i) { - //(*i)->second->SetPrintLevel(printLevel); + //(i)->second->SetPrintLevel(printLevel); (i->second)->Print(os); } } +/** + * \brief Writes the Header Entries (Dicom Elements) + * from the H Table + * @return + */ +void gdcmElementSet::Write(FILE *fp, FileType filetype) { + +// Troubles expected : BinEntries ARE ValEntries :-( +// BinEntry is checked first, then ValEntry; + gdcmDocEntry *e; + for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i) + { + e=i->second; + e->WriteCommonPart(fp, filetype); + std::cout<GetKey() << " " << std::hex << e->GetVR() << " " + << e->GetName() + << std::endl; + +// e->Write(fp,filetype); // This will be the right way to proceed ! + + if (gdcmBinEntry* BinEntry = dynamic_cast< gdcmBinEntry* >(e) ) { + BinEntry->Write(fp); + continue; + } + if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(e) ) { + ValEntry->Write(fp); + continue; + } + + if (gdcmSeqEntry* SeqEntry = dynamic_cast< gdcmSeqEntry* >(e) ) { + SeqEntry->Write(fp,filetype); + continue; + } + } +} //----------------------------------------------------------------------------- // Protected