X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=7d61d3cce28c878c633614ee0561903aa5fcc2ff;hb=3fd520b58c8d1939994de2c63cc038c3e7ac9522;hp=02ac489c6d2636f36c68412775d147035342562b;hpb=61e1a3e0ce5480990a0d0b844cf0e86d1775306d;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 02ac489c..7d61d3cc 100644 --- a/src/gdcmSQItem.cxx +++ b/src/gdcmSQItem.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.cxx,v $ Language: C++ - Date: $Date: 2004/06/19 23:51:04 $ - Version: $Revision: 1.10 $ + Date: $Date: 2004/08/26 15:29:53 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,8 +22,10 @@ #include "gdcmBinEntry.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" + #include "gdcmDebug.h" + //----------------------------------------------------------------------------- // Constructor / Destructor /** @@ -31,7 +33,8 @@ * \brief Constructor from a given gdcmSQItem */ gdcmSQItem::gdcmSQItem(int depthLevel ) - : gdcmDocEntrySet(depthLevel) { + : gdcmDocEntrySet(depthLevel) +{ SQDepthLevel = depthLevel +1; } @@ -54,22 +57,70 @@ gdcmSQItem::~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() << "SQItemNumber " << SQItemNumber << std::endl; + 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) +{ 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); } } @@ -93,146 +144,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) + +bool gdcmSQItem::SetEntryByNumber(std::string val,uint16_t group, + uint16_t element) { - for(ListDocEntry::iterator i=docEntries.begin();i!=docEntries.end();++i) + 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; - TagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( ! ptagHT->count(key)) + 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(); + 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, + gdcmDictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, element); - if (DictEntry == NULL) + if (dictEntry == NULL) { - DictEntry=gdcmGlobal::GetDicts()->NewVirtualDictEntry(group, - element, - "UN", - "??","??"); + dictEntry = + gdcmGlobal::GetDicts()->NewVirtualDictEntry(group, element, + "UN", "??", "??"); } // we assume the constructor didn't fail - Entry = new gdcmValEntry(DictEntry); + 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) + } + 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); } - if (Entry) - Entry->SetValue(val); - Entry->SetLength(val.length()); - docEntries.insert(i,Entry); + 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); + 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 ?!? - -/// \brief to be written if really usefull -gdcmDocEntry *gdcmSQItem::NewDocEntryByNumber(guint16 group, - guint16 element) { -/// \todo 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()); -} //-----------------------------------------------------------------------------