X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=d5a1bd21200fe03d089dc0889f86ec50de70f1be;hb=9d913797d3bf5a18625f4d8d8b42c8f5c8c10d99;hp=3c9a25e758f22579ac94776c17ab448a0088caf9;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 3c9a25e7..d5a1bd21 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/07/02 13:55:28 $ - Version: $Revision: 1.20 $ + Date: $Date: 2005/01/07 19:20:39 $ + Version: $Revision: 1.47 $ 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 @@ -21,34 +21,38 @@ #include "gdcmValEntry.h" #include "gdcmBinEntry.h" #include "gdcmGlobal.h" +#include "gdcmDictSet.h" #include "gdcmUtil.h" - #include "gdcmDebug.h" +#include +namespace gdcm +{ //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmSQItem - * \brief Constructor from a given gdcmSQItem + * \ingroup SQItem + * \brief Constructor from a given SQItem */ -gdcmSQItem::gdcmSQItem(int depthLevel ) - : gdcmDocEntrySet(depthLevel) { - SQDepthLevel = depthLevel +1; +SQItem::SQItem(int depthLevel ) + : DocEntrySet( ) +{ + SQDepthLevel = depthLevel; } /** * \brief Canonical destructor. */ -gdcmSQItem::~gdcmSQItem() +SQItem::~SQItem() { - for(ListDocEntry::iterator cc = docEntries.begin(); - cc != docEntries.end(); - ++cc) + for(ListDocEntry::iterator cc = DocEntries.begin(); + cc != DocEntries.end(); + ++cc) { - delete (*cc); + delete *cc; } - docEntries.clear(); + DocEntries.clear(); } //----------------------------------------------------------------------------- @@ -56,62 +60,86 @@ gdcmSQItem::~gdcmSQItem() /* * \brief canonical Printer */ - void gdcmSQItem::Print(std::ostream & os) { +void SQItem::Print(std::ostream &os) +{ std::ostringstream s; - if (SQDepthLevel>0) + if (SQDepthLevel > 0) { - for (int i=0;iSetPrintLevel(2); - Entry->Print(os); - if ( gdcmSeqEntry* SeqEntry = dynamic_cast(Entry) ) + Entry->SetPrintLevel(PrintLevel); + Entry->Print(os); + if ( SeqEntry *seqEntry = dynamic_cast(Entry) ) { - (void)SeqEntry; //not used + (void)seqEntry; //not used PrintEndLine = false; } if (PrintEndLine) + { os << std::endl; + } } } /* - * \ingroup gdcmSQItem + * \ingroup SQItem * \brief canonical Writer */ -void gdcmSQItem::Write(FILE *fp,FileType filetype) +void SQItem::WriteContent(std::ofstream *fp, FileType filetype) { - for (ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); - ++i) + int j; + 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 + for(j=0;j<4;++j) { - // 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; + binary_write( *fp, item[j]); // fffe e000 ffff ffff + } + + for (ListDocEntry::iterator it = DocEntries.begin(); + it != DocEntries.end(); + ++it) + { + // we skip delimitors (start and end one) because + // we force them as 'no length' + if ( (*it)->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; + if ( (*it)->GetGroup() == 0xfffe && (*it)->GetElement() == 0x0000 ) + { + break; // FIXME : continue; ?!? + } - // It's up to the gdcmDocEntry Writter to write the SQItem begin element - // (fffe|e000) as a 'no length' one - (*i)->Write(fp, filetype); - } + (*it)->WriteContent(fp, filetype); + } + + //we force the writting of an 'Item Delimitation' item + // because we wrote the Item as a 'no Length' item + for(j=0;j<4;++j) + { + binary_write( *fp, itemt[j]); // fffe e000 ffff ffff + } + } //----------------------------------------------------------------------------- @@ -119,9 +147,9 @@ void gdcmSQItem::Write(FILE *fp,FileType filetype) /** * \brief adds any Entry (Dicom Element) to the Sequence Item */ -bool gdcmSQItem::AddEntry(gdcmDocEntry *entry) +bool SQItem::AddEntry(DocEntry *entry) { - docEntries.push_back(entry); + DocEntries.push_back(entry); //TODO : check if it worked return true; } @@ -139,81 +167,150 @@ bool gdcmSQItem::AddEntry(gdcmDocEntry *entry) * @return true if element was found or created successfully */ -bool gdcmSQItem::SetEntryByNumber(std::string val, uint16_t group, - uint16_t element) +bool SQItem::SetEntryByNumber(std::string const &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() ) + 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); + // that is a method of Document :-( + ValEntry* entry = 0; + TagKey key = DictEntry::TranslateToKey(group, element); - if ( ! ptagHT->count(key)) + // we assume a Public Dictionnary *is* loaded + Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); + // if the invoked (group,elem) doesn't exist inside the Dictionary + // we create a VirtualDictEntry + DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, element); + if (dictEntry == NULL) + { + dictEntry = + Global::GetDicts()->NewVirtualDictEntry(group, element, + "UN", GDCM_UNKNOWN, GDCM_UNKNOWN); + } + // we assume the constructor didn't fail + entry = new ValEntry(dictEntry); + if (entry) { - // 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"); + entry->SetValue(val); } - if (Entry) - Entry->SetValue(val); - Entry->SetLength(val.length()); - docEntries.insert(i,Entry); + 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()); + if ( ValEntry* entry = dynamic_cast(*i) ) + { + entry->SetValue(val); + } return true; } } return false; } -//----------------------------------------------------------------------------- -// Protected +/** + * \brief Clear the hash table from given entry AND delete the entry. + * @param entryToRemove Entry to remove AND delete. + * \warning Some problems when using under Windows... prefer the use of + * Initialize / GetNext methods + */ +bool SQItem::RemoveEntry( DocEntry* entryToRemove) +{ + for(ListDocEntry::iterator it = DocEntries.begin(); + it != DocEntries.end(); + ++it) + { + if( *it == entryToRemove) + { + DocEntries.erase(it); + gdcmVerboseMacro( "SQItem::RemoveEntry: one element erased."); + delete entryToRemove; + return true; + } + } + + gdcmVerboseMacro( "SQItem::RemoveEntry: value not present "); + return false ; +} + +/** + * \brief Clear the hash table from given entry BUT keep the entry. + * @param entryToRemove Entry to remove. + */ +bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove) +{ + for(ListDocEntry::iterator it = DocEntries.begin(); + it != DocEntries.end(); + ++it) + { + if( *it == entryToRemove) + { + DocEntries.erase(it); + gdcmVerboseMacro( "SQItem::RemoveEntry: one element erased."); + return true; + } + } + + gdcmVerboseMacro( "SQItem::RemoveEntry: value not present "); + return false ; +} + +/** + * \brief Initialise the visit of the chained list + */ +void SQItem::Initialize() +{ + ItDocEntries = DocEntries.begin(); +} + +/** + * \brief Get the next entry whil visiting the chained list + * \return The next DocEntry if found, otherwhise NULL + */ +DocEntry *SQItem::GetNextEntry() +{ + if (ItDocEntries != DocEntries.end()) + { + DocEntry *tmp = *ItDocEntries; + ++ItDocEntries; + + return(tmp); + } + else + { + return(NULL); + } +} +//----------------------------------------------------------------------------- +// Protected /** * \brief Gets a Dicom Element inside a SQ Item Entry, by number * @return */ -gdcmDocEntry *gdcmSQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) +DocEntry* SQItem::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; + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) + { + if ( (*i)->GetGroup() == group && (*i)->GetElement() == element ) + { + return *i; + } + } + return 0; } /** @@ -221,13 +318,16 @@ gdcmDocEntry *gdcmSQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) * @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(); +std::string SQItem::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 ((ValEntry *)(*i))->GetValue(); //FIXME } - } + } return GDCM_UNFOUND; } //----------------------------------------------------------------------------- @@ -235,3 +335,5 @@ std::string gdcmSQItem::GetEntryByNumber(uint16_t group, uint16_t element) //----------------------------------------------------------------------------- + +} // end namespace gdcm