X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=597d833cb01e8c8ab4e308483e134f93bc04d71a;hb=00e89cde772e18e4f2baab2b01680330af909d59;hp=417093d03ce42351cf21bda9114e74fc4fe569ce;hpb=0accc3e4b95c96903d4fb6a792d657bf1e509375;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 417093d0..597d833c 100644 --- a/src/gdcmSQItem.cxx +++ b/src/gdcmSQItem.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.cxx,v $ Language: C++ - Date: $Date: 2004/06/24 18:03:14 $ - Version: $Revision: 1.17 $ + Date: $Date: 2004/09/27 08:39:07 $ + Version: $Revision: 1.28 $ 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. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -33,8 +33,9 @@ * \brief Constructor from a given gdcmSQItem */ gdcmSQItem::gdcmSQItem(int depthLevel ) - : gdcmDocEntrySet(depthLevel) { - SQDepthLevel = depthLevel +1; + : gdcmDocEntrySet( ) +{ + SQDepthLevel = depthLevel; } /** @@ -56,16 +57,19 @@ gdcmSQItem::~gdcmSQItem() /* * \brief canonical Printer */ - void gdcmSQItem::Print(std::ostream & os) { + void gdcmSQItem::Print(std::ostream& os) + { std::ostringstream s; - if (SQDepthLevel>0) + if (SQDepthLevel > 0) { - for (int i=0;iSetPrintLevel(2); - Entry->Print(os); + Entry->Print(os); if ( gdcmSeqEntry* SeqEntry = dynamic_cast(Entry) ) + { + (void)SeqEntry; //not used PrintEndLine = false; + } if (PrintEndLine) + { os << std::endl; + } } } @@ -86,27 +95,41 @@ gdcmSQItem::~gdcmSQItem() * \ingroup gdcmSQItem * \brief canonical Writer */ -void gdcmSQItem::Write(FILE *fp,FileType filetype) +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) - { - // 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; - if ( ((*i)->GetGroup() == 0xfffe) && ((*i)->GetElement() == 0x0000) ) - // 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 ! - return; - // It's up to the gdcmDocEntry Writter to write the SQItem begin element - // (fffe|e000) as a 'no length' one + { + // 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 + } //----------------------------------------------------------------------------- @@ -114,7 +137,7 @@ void gdcmSQItem::Write(FILE *fp,FileType filetype) /** * \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 @@ -134,60 +157,70 @@ bool gdcmSQItem::AddEntry(gdcmDocEntry *entry) * @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); + gdcmValEntry* entry = 0; + gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element); - if ( ! ptagHT->count(key)) + 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); - Entry->SetLength(val.length()); - docEntries.insert(i,Entry); + 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); + if ( gdcmValEntry* entry = dynamic_cast(*i) ) + { + entry->SetValue(val); + } (*i)->SetLength(val.length()); return true; } @@ -202,12 +235,17 @@ bool gdcmSQItem::SetEntryByNumber(std::string val,guint16 group, * \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; } /** @@ -215,12 +253,16 @@ gdcmDocEntry *gdcmSQItem::GetDocEntryByNumber(guint16 group, guint16 element) { * @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; } //-----------------------------------------------------------------------------