X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=d34f7a9d640f622dd96e8f83d9783bea1d54ac7b;hb=dd0927eaa7e990832c45a1256f85de6148f35b93;hp=d8d9153a28455c4371aa3aa2d22e67f9989ed9ce;hpb=0d33ba5ffb1c6beac21f33bd3e3aad67b7608c9d;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index d8d9153a..d34f7a9d 100644 --- a/src/gdcmSQItem.cxx +++ b/src/gdcmSQItem.cxx @@ -1,10 +1,30 @@ -// gdcmSQItem.cxx -//----------------------------------------------------------------------------- -// +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmSQItem.cxx,v $ + Language: C++ + Date: $Date: 2004/07/17 22:47:01 $ + Version: $Revision: 1.21 $ + + 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 "gdcmSQItem.h" +#include "gdcmSeqEntry.h" +#include "gdcmValEntry.h" +#include "gdcmBinEntry.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" + //----------------------------------------------------------------------------- // Constructor / Destructor @@ -12,8 +32,9 @@ * \ingroup gdcmSQItem * \brief Constructor from a given gdcmSQItem */ -gdcmSQItem::gdcmSQItem( ) - : gdcmDocEntrySet() { +gdcmSQItem::gdcmSQItem(int depthLevel ) + : gdcmDocEntrySet(depthLevel) { + SQDepthLevel = depthLevel +1; } /** @@ -25,58 +46,197 @@ gdcmSQItem::~gdcmSQItem() cc != docEntries.end(); ++cc) { - delete *cc; + delete (*cc); } + docEntries.clear(); } - //----------------------------------------------------------------------------- // Print /* - * \ingroup gdcmSQItem * \brief canonical Printer */ void gdcmSQItem::Print(std::ostream & os) { std::ostringstream s; - s << " | " ; + + if (SQDepthLevel>0) + { + for (int i=0;iSetPrintLevel(2); + Entry->Print(os); + if ( gdcmSeqEntry* SeqEntry = dynamic_cast(Entry) ) + { + (void)SeqEntry; //not used + PrintEndLine = false; + } + if (PrintEndLine) + os << std::endl; + } +} + +/* + * \ingroup gdcmSQItem + * \brief canonical Writer + */ +void gdcmSQItem::Write(FILE *fp,FileType filetype) +{ for (ListDocEntry::iterator i = docEntries.begin(); i != docEntries.end(); ++i) { - os << s.str(); - //(*i)->SetPrintLevel(printLevel); //self->GetPrintLevel() ? - (*i)->SetPrintLevel(2); - (*i)->Print(os); + // Item Delimitor Item IS the last one of a 'no length' SQItem + // (when it exists) we don't write it right now + // It will be written outside, because ALL the SQItems are written + // as 'no length' + if ( (*i)->isItemDelimitor() ) + break; + + // Fix in order to make some MR PHILIPS images e-film readable + // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm: + // we just *always* ignore spurious fffe|0000 tag ! + if ( ((*i)->GetGroup() == 0xfffe) && ((*i)->GetElement() == 0x0000) ) + break; + + // It's up to the gdcmDocEntry Writter to write the SQItem begin element + // (fffe|e000) as a 'no length' one + (*i)->Write(fp, filetype); } } //----------------------------------------------------------------------------- // Public - -bool gdcmSQItem::AddEntry(gdcmDocEntry *entry) { - std::cout << " entree ds gdcmSQItem::AddEntry" << std::endl; +/** + * \brief adds any Entry (Dicom Element) to the Sequence Item + */ +bool gdcmSQItem::AddEntry(gdcmDocEntry *entry) +{ docEntries.push_back(entry); //TODO : check if it worked return true; } - + +/** + * \brief Sets Entry (Dicom Element) value of an element, + * specified by it's tag (Group, Number) + * and the length, too ... inside a SQ Item + * If the Element is not found, it's just created ! + * \warning we suppose, right now, the element belongs to a Public Group + * (NOT a shadow one) + * @param val string value to set + * @param group Group number of the searched tag. + * @param element Element number of the searched tag. + * @return true if element was found or created successfully + */ + +bool gdcmSQItem::SetEntryByNumber(std::string val,uint16_t group, + uint16_t element) +{ + for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) + { + if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0xe000 ) + continue; + + if ( ( group < (*i)->GetGroup() ) + ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) ) + { + // instead of ReplaceOrCreateByNumber + // that is a method of gdcmDocument :-( + gdcmValEntry* Entry = (gdcmValEntry*)0; + gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); + + if ( ! ptagHT->count(key)) + { + // we assume a Public Dictionnary *is* loaded + gdcmDict *PubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); + // if the invoked (group,elem) doesn't exist inside the Dictionary + // we create a VirtualDictEntry + gdcmDictEntry *DictEntry = PubDict->GetDictEntryByNumber(group, + element); + if (DictEntry == NULL) + { + DictEntry=gdcmGlobal::GetDicts()->NewVirtualDictEntry(group, + element, + "UN", + "??","??"); + } + // we assume the constructor didn't fail + Entry = new gdcmValEntry(DictEntry); + /// \todo + /// ---- + /// better we don't assume too much ! + /// gdcmSQItem is now used to describe any DICOMDIR related object + } else { + gdcmDocEntry* FoundEntry = ptagHT->find(key)->second; + Entry = dynamic_cast(FoundEntry); + if (!Entry) + dbg.Verbose(0, "gdcmSQItem::SetEntryByNumber: docEntries" + " contains non gdcmValEntry occurences"); + } + if (Entry) + Entry->SetValue(val); + Entry->SetLength(val.length()); + docEntries.insert(i,Entry); + return true; + } + if (group == (*i)->GetGroup() && element == (*i)->GetElement() ) + { + if ( gdcmValEntry* Entry = dynamic_cast(*i) ) + Entry->SetValue(val); + (*i)->SetLength(val.length()); + return true; + } + } + return false; +} //----------------------------------------------------------------------------- // Protected -//----------------------------------------------------------------------------- -// Private -// end-user intended : the guy *wants* to create his own SeQuence ?!? -gdcmDocEntry *gdcmSQItem::NewDocEntryByNumber(guint16 group, - guint16 element) { -// TODO - gdcmDocEntry *a; - return a; +/** + * \brief Gets a Dicom Element inside a SQ Item Entry, by number + * @return + */ +gdcmDocEntry *gdcmSQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) +{ + for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) + { + if ( (*i)->GetGroup()==group && (*i)->GetElement()==element) + { + return (*i); + } + } + return NULL; } -gdcmDocEntry *gdcmSQItem::NewDocEntryByName (std::string Name) { -// TODO : - gdcmDocEntry *a; - return a; +/** + * \brief Get the value of a Dicom Element inside a SQ Item Entry, by number + * @return + */ + +std::string gdcmSQItem::GetEntryByNumber(uint16_t group, uint16_t element) +{ + for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) + { + if ( (*i)->GetGroup()==group && (*i)->GetElement()==element) + { + return ((gdcmValEntry *)(*i))->GetValue(); + } + } + return GDCM_UNFOUND; } //----------------------------------------------------------------------------- +// Private + + +//-----------------------------------------------------------------------------