X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=62e506771508224ce7ddb841603af16380b2a3f4;hb=233c8b3ebb1aee6b1be6723d842eb2241b9ffb91;hp=1dc964c863466e3eb54ee92f6031ca30effe24d4;hpb=0fc486652e88490f7344439111750eb9dcaf7a29;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index 1dc964c8..62e50677 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/09/16 19:21:57 $ - Version: $Revision: 1.26 $ + Date: $Date: 2004/12/03 17:13:18 $ + Version: $Revision: 1.39 $ 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 @@ -22,18 +22,19 @@ #include "gdcmBinEntry.h" #include "gdcmGlobal.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( ) +SQItem::SQItem(int depthLevel ) + : DocEntrySet( ) { SQDepthLevel = depthLevel; } @@ -41,15 +42,15 @@ gdcmSQItem::gdcmSQItem(int 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(); } //----------------------------------------------------------------------------- @@ -57,8 +58,9 @@ gdcmSQItem::~gdcmSQItem() /* * \brief canonical Printer */ - void gdcmSQItem::Print(std::ostream & os) + void SQItem::Print(std::ostream& os) { + os << "S "; std::ostringstream s; if (SQDepthLevel > 0) @@ -68,20 +70,20 @@ gdcmSQItem::~gdcmSQItem() s << " | " ; } } - std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl; - for (ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); + //std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl; + for (ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { - gdcmDocEntry* Entry = *i; + DocEntry* Entry = *i; bool PrintEndLine = true; os << s.str(); Entry->SetPrintLevel(2); Entry->Print(os); - if ( gdcmSeqEntry* SeqEntry = dynamic_cast(Entry) ) + if ( SeqEntry* seqEntry = dynamic_cast(Entry) ) { - (void)SeqEntry; //not used + (void)seqEntry; //not used PrintEndLine = false; } if (PrintEndLine) @@ -92,25 +94,29 @@ gdcmSQItem::~gdcmSQItem() } /* - * \ingroup gdcmSQItem + * \ingroup SQItem * \brief canonical Writer */ -void gdcmSQItem::Write(FILE *fp,FileType filetype) +void SQItem::WriteContent(std::ofstream* fp, FileType filetype) { + 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 - fwrite(&item[0],8,1,fp); // fffe e000 ffff ffff + for(j=0;j<4;++j) + { + binary_write( *fp, item[j]); // fffe e000 ffff ffff + } - for (ListDocEntry::iterator i = docEntries.begin(); - i != docEntries.end(); - ++i) + 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 ( (*i)->GetGroup() == 0xfffe ) + if ( (*it)->GetGroup() == 0xfffe ) { continue; } @@ -118,18 +124,21 @@ void gdcmSQItem::Write(FILE *fp,FileType filetype) // 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 ) + if ( (*it)->GetGroup() == 0xfffe && (*it)->GetElement() == 0x0000 ) { break; // FIXME : continue; ?!? } - (*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 - fwrite(&itemt[0],8,1,fp); // fffe e000 ffff ffff - + for(j=0;j<4;++j) + { + binary_write( *fp, itemt[j]); // fffe e000 ffff ffff + } + } //----------------------------------------------------------------------------- @@ -137,9 +146,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; } @@ -157,10 +166,12 @@ 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 ) { @@ -171,39 +182,38 @@ bool gdcmSQItem::SetEntryByNumber(std::string val,uint16_t group, ||( group == (*i)->GetGroup() && element < (*i)->GetElement()) ) { // instead of ReplaceOrCreateByNumber - // that is a method of gdcmDocument :-( - gdcmValEntry* entry = 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 - gdcmDict *pubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict(); + Dict *pubDict = Global::GetDicts()->GetDefaultPubDict(); // if the invoked (group,elem) doesn't exist inside the Dictionary // we create a VirtualDictEntry - gdcmDictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, - element); + DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, element); if (dictEntry == NULL) { dictEntry = - gdcmGlobal::GetDicts()->NewVirtualDictEntry(group, element, - "UN", "??", "??"); + Global::GetDicts()->NewVirtualDictEntry(group, element, + "UN", "??", "??"); } // we assume the constructor didn't fail - entry = new gdcmValEntry(dictEntry); + entry = new ValEntry(dictEntry); /// \todo /// ---- /// better we don't assume too much ! - /// gdcmSQItem is now used to describe any DICOMDIR related object + /// SQItem is now used to describe any DICOMDIR related object } else { - gdcmDocEntry* foundEntry = PtagHT->find(key)->second; - entry = dynamic_cast(foundEntry); + DocEntry* foundEntry = PtagHT->find(key)->second; + entry = dynamic_cast(foundEntry); if (!entry) { - dbg.Verbose(0, "gdcmSQItem::SetEntryByNumber: docEntries" - " contains non gdcmValEntry occurences"); + dbg.Verbose(0, "SQItem::SetEntryByNumber: docEntries" + " contains non ValEntry occurences"); } } if (entry) @@ -211,13 +221,13 @@ bool gdcmSQItem::SetEntryByNumber(std::string val,uint16_t group, 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) ) + if ( ValEntry* entry = dynamic_cast(*i) ) { entry->SetValue(val); } @@ -227,18 +237,91 @@ bool gdcmSQItem::SetEntryByNumber(std::string val,uint16_t group, } 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); + dbg.Verbose(0, "SQItem::RemoveEntry: one element erased."); + delete entryToRemove; + return true; + } + } + + dbg.Verbose(0, "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); + dbg.Verbose(0, "SQItem::RemoveEntry: one element erased."); + return true; + } + } + + dbg.Verbose(0, "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) + for(ListDocEntry::iterator i = DocEntries.begin(); + i != DocEntries.end(); ++i) { if ( (*i)->GetGroup() == group && (*i)->GetElement() == element ) { @@ -253,14 +336,14 @@ gdcmDocEntry *gdcmSQItem::GetDocEntryByNumber(uint16_t group, uint16_t element) * @return */ -std::string gdcmSQItem::GetEntryByNumber(uint16_t group, uint16_t element) +std::string SQItem::GetEntryByNumber(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() == group && (*i)->GetElement() == element) { - return ((gdcmValEntry *)(*i))->GetValue(); //FIXME + return ((ValEntry *)(*i))->GetValue(); //FIXME } } return GDCM_UNFOUND; @@ -270,3 +353,5 @@ std::string gdcmSQItem::GetEntryByNumber(uint16_t group, uint16_t element) //----------------------------------------------------------------------------- + +} // end namespace gdcm