Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2004/10/25 03:35:20 $
- Version: $Revision: 1.31 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.44 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmValEntry.h"
#include "gdcmBinEntry.h"
#include "gdcmGlobal.h"
+#include "gdcmDictSet.h"
#include "gdcmUtil.h"
#include "gdcmDebug.h"
+
#include <fstream>
namespace gdcm
{
-
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
cc != DocEntries.end();
++cc)
{
- delete (*cc);
+ delete *cc;
}
DocEntries.clear();
}
/*
* \brief canonical Printer
*/
- void SQItem::Print(std::ostream& os)
- {
+void SQItem::Print(std::ostream& os)
+{
std::ostringstream s;
if (SQDepthLevel > 0)
s << " | " ;
}
}
- std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl;
+ //std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl;
for (ListDocEntry::iterator i = DocEntries.begin();
i != DocEntries.end();
++i)
bool PrintEndLine = true;
os << s.str();
- Entry->SetPrintLevel(2);
+ Entry->SetPrintLevel(PrintLevel);
Entry->Print(os);
if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(Entry) )
{
* \ingroup SQItem
* \brief canonical Writer
*/
-void SQItem::Write(std::ofstream* 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
- fp->write((char*)&item[0],8); // 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;
}
// 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
- fp->write((char*)&itemt[0],8); // fffe e000 ffff ffff
-
+ for(j=0;j<4;++j)
+ {
+ binary_write( *fp, itemt[j]); // fffe e000 ffff ffff
+ }
+
}
//-----------------------------------------------------------------------------
continue;
}
- if ( ( group < (*i)->GetGroup() )
+ if ( ( group < (*i)->GetGroup() )
||( group == (*i)->GetGroup() && element < (*i)->GetElement()) )
{
// instead of ReplaceOrCreateByNumber
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)
{
- // 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", "??", "??");
- }
- // we assume the constructor didn't fail
- entry = new ValEntry(dictEntry);
- /// \todo
- /// ----
- /// better we don't assume too much !
- /// SQItem is now used to describe any DICOMDIR related object
- }
- else
- {
- DocEntry* foundEntry = PtagHT->find(key)->second;
- entry = dynamic_cast<ValEntry*>(foundEntry);
- if (!entry)
- {
- dbg.Verbose(0, "SQItem::SetEntryByNumber: docEntries"
- " contains non ValEntry occurences");
- }
- }
+ dictEntry =
+ Global::GetDicts()->NewVirtualDictEntry(group, element,
+ "UN", GDCM_UNKNOWN, GDCM_UNKNOWN);
+ }
+ // we assume the constructor didn't fail
+ entry = new ValEntry(dictEntry);
if (entry)
{
entry->SetValue(val);
}
- entry->SetLength(val.length());
DocEntries.insert(i,entry);
return true;
{
entry->SetValue(val);
}
- (*i)->SetLength(val.length());
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);
+ 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
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff