X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=2299b946bc6af54bf7f2047e82c715c85f34ee51;hb=7a06c1759c4f03b6c8dc7780bfda9b508a2250c5;hp=eda6b0941fb33d06c4b73c0813f5de2e0d10c356;hpb=5c198a737e21a72460f81e81a1b9405b5a591b60;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index eda6b094..2299b946 100644 --- a/src/gdcmSQItem.cxx +++ b/src/gdcmSQItem.cxx @@ -1,10 +1,29 @@ -// gdcmSQItem.cxx -//----------------------------------------------------------------------------- -// +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmSQItem.cxx,v $ + Language: C++ + Date: $Date: 2004/08/27 15:48:44 $ + Version: $Revision: 1.25 $ + + 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 "gdcmValEntry.h" + +#include "gdcmDebug.h" //----------------------------------------------------------------------------- @@ -14,7 +33,8 @@ * \brief Constructor from a given gdcmSQItem */ gdcmSQItem::gdcmSQItem(int depthLevel ) - : gdcmDocEntrySet(depthLevel) { + : gdcmDocEntrySet(depthLevel) +{ SQDepthLevel = depthLevel +1; } @@ -27,33 +47,89 @@ gdcmSQItem::~gdcmSQItem() cc != docEntries.end(); ++cc) { - delete *cc; + delete (*cc); } + docEntries.clear(); } - //----------------------------------------------------------------------------- // Print /* - * \ingroup gdcmSQItem * \brief canonical Printer */ - void gdcmSQItem::Print(std::ostream & os) { + void gdcmSQItem::Print(std::ostream & os) + { std::ostringstream s; - if (SQDepthLevel>0) { - for (int i=0;i 0) + { + for (int i = 0; i < SQDepthLevel; ++i) + { s << " | " ; + } } + std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl; + for (ListDocEntry::iterator i = docEntries.begin(); + i != docEntries.end(); + ++i) + { + gdcmDocEntry* Entry = *i; + bool PrintEndLine = true; + + os << s.str(); + Entry->SetPrintLevel(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) +{ + uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff }; + uint16_t itemt[4]= { 0xfffe, 0xe00d, 0xffff, 0xffff }; + + //we force the writting of an 'Item' Start Element + // because we want to write the Item as a 'no Length' item + fwrite(&item[0],8,1,fp); // fffe e000 ffff ffff + for (ListDocEntry::iterator i = docEntries.begin(); i != docEntries.end(); ++i) - { - os << s.str(); - //(*i)->SetPrintLevel(printLevel); //self->GetPrintLevel() ? - (*i)->SetPrintLevel(2); - (*i)->Print(os); - } + { + // we skip delimitors (start and end one) because + // we force them as 'no length' + if ( (*i)->GetGroup() == 0xfffe ) + { + continue; + } + + // 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; // FIXME : continue; ?!? + } + + (*i)->Write(fp, filetype); + } + + //we force the writting of an 'Item Delimitation' item + // because we wrote the Item as a 'no Length' item + fwrite(&itemt[0],8,1,fp); // fffe e000 ffff ffff + } //----------------------------------------------------------------------------- @@ -61,13 +137,13 @@ gdcmSQItem::~gdcmSQItem() /** * \brief adds any Entry (Dicom Element) to the Sequence Item */ -bool gdcmSQItem::AddEntry(gdcmDocEntry *entry) { +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) @@ -76,133 +152,121 @@ bool gdcmSQItem::AddEntry(gdcmDocEntry *entry) { * \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 of the searched tag. - * @param element Element of the searched tag. + * @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,guint16 group, - guint16 element) { - for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) { +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 :-( - gdcmDocEntry *Entry; - TagKey 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 gdcmDocEntry(DictEntry); - /// \todo - /// ---- - /// better we don't assume too much ! - /// gdcmSQItem is now used to describe any DICOMDIR related object - /// - } else { - Entry = ptagHT->find(key)->second; + } + + if ( ( group < (*i)->GetGroup() ) + ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) ) + { + // instead of ReplaceOrCreateByNumber + // that is a method of gdcmDocument :-( + gdcmValEntry* entry = 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); } - ((gdcmValEntry*)Entry)->SetValue(val); - Entry->SetLength(val.length()); - docEntries.insert(i,Entry); - return true; - } - if (group == (*i)->GetGroup() && element == (*i)->GetElement() ) { - ((gdcmValEntry*)(*i))->SetValue(val); (*i)->SetLength(val.length()); return true; - } - } -} + } + } + return false; +} //----------------------------------------------------------------------------- // Protected -//----------------------------------------------------------------------------- -// Private - -// end-user intended : the guy *wants* to create his own SeQuence ?!? - -/// \brief to be written if really usefull -gdcmDocEntry *gdcmSQItem::NewDocEntryByNumber(guint16 group, - guint16 element) { -// TODO - gdcmDocEntry *a; - std::cout << " gdcmSQItem::NewDocEntryByNumber : TODO" <GetDefaultPubDict(); - gdcmDictEntry *dictEntry = (*PubDict).GetDictEntryByName(name); - if( dictEntry == NULL) - return NULL; - return GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()); -} /** - * \ingroup gdcmSQItem * \brief Gets a Dicom Element inside a SQ Item Entry, by number * @return */ -gdcmDocEntry *gdcmSQItem::GetDocEntryByNumber(guint16 group, guint16 element) { - for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) { - if ( (*i)->GetGroup()==group && (*i)->GetElement()==element) - return (*i); - } - return NULL; +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 0; } /** - * \ingroup gdcmSQItem * \brief Get the value of a Dicom Element inside a SQ Item Entry, by number * @return */ -std::string gdcmSQItem::GetEntryByNumber(guint16 group, guint16 element) { - for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) { - if ( (*i)->GetGroup()==group && (*i)->GetElement()==element) { - return ((gdcmValEntry *)(*i))->GetValue(); +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(); //FIXME } - } + } return GDCM_UNFOUND; } +//----------------------------------------------------------------------------- +// Private -/** - * \ingroup gdcmSQItem - * \brief Get the value of a Dicom Element inside a SQ Item Entry, by name - * @param name : name of the searched element. - * @return - */ - -std::string gdcmSQItem::GetEntryByName(TagName name) { - gdcmDict *PubDict=gdcmGlobal::GetDicts()->GetDefaultPubDict(); - gdcmDictEntry *dictEntry = (*PubDict).GetDictEntryByName(name); - - if( dictEntry == NULL) - return GDCM_UNFOUND; - return GetEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()); -} //-----------------------------------------------------------------------------