Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2004/08/01 00:59:21 $
- Version: $Revision: 1.22 $
+ Date: $Date: 2004/10/12 04:35:47 $
+ Version: $Revision: 1.29 $
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
#include "gdcmBinEntry.h"
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
-
#include "gdcmDebug.h"
+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)
+SQItem::SQItem(int depthLevel )
+ : DocEntrySet( )
{
- SQDepthLevel = depthLevel +1;
+ SQDepthLevel = depthLevel;
}
/**
* \brief Canonical destructor.
*/
-gdcmSQItem::~gdcmSQItem()
+SQItem::~SQItem()
{
for(ListDocEntry::iterator cc = docEntries.begin();
cc != docEntries.end();
/*
* \brief canonical Printer
*/
- void gdcmSQItem::Print(std::ostream & os)
+ void SQItem::Print(std::ostream& os)
{
std::ostringstream s;
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<gdcmSeqEntry*>(Entry) )
+ Entry->Print(os);
+ if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(Entry) )
{
- (void)SeqEntry; //not used
+ (void)seqEntry; //not used
PrintEndLine = false;
}
if (PrintEndLine)
}
/*
- * \ingroup gdcmSQItem
+ * \ingroup SQItem
* \brief canonical Writer
*/
-void gdcmSQItem::Write(FILE *fp,FileType filetype)
+void SQItem::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() )
+ {
+ // we skip delimitors (start and end one) because
+ // we force them as 'no length'
+ if ( (*i)->GetGroup() == 0xfffe )
{
- break;
+ continue;
}
// Fix in order to make some MR PHILIPS images e-film readable
// we just *always* ignore spurious fffe|0000 tag !
if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0x0000 )
{
- break;
+ 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);
- }
+ }
+
+ //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
+
}
//-----------------------------------------------------------------------------
/**
* \brief adds any Entry (Dicom Element) to the Sequence Item
*/
-bool gdcmSQItem::AddEntry(gdcmDocEntry *entry)
+bool SQItem::AddEntry(DocEntry* entry)
{
docEntries.push_back(entry);
//TODO : check if it worked
* @return true if element was found or created successfully
*/
-bool gdcmSQItem::SetEntryByNumber(std::string val,uint16_t group,
+bool SQItem::SetEntryByNumber(std::string val, uint16_t group,
uint16_t element)
{
for(ListDocEntry::iterator i = docEntries.begin(); i != docEntries.end(); ++i)
||( 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,
+ DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group,
element);
if (dictEntry == NULL)
{
dictEntry =
- gdcmGlobal::GetDicts()->NewVirtualDictEntry(group, element,
+ 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<gdcmValEntry*>(foundEntry);
+ DocEntry* foundEntry = PtagHT->find(key)->second;
+ entry = dynamic_cast<ValEntry*>(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)
}
if (group == (*i)->GetGroup() && element == (*i)->GetElement() )
{
- if ( gdcmValEntry* entry = dynamic_cast<gdcmValEntry*>(*i) )
+ if ( ValEntry* entry = dynamic_cast<ValEntry*>(*i) )
{
entry->SetValue(val);
}
* \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)
* @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)
{
if ( (*i)->GetGroup() == group && (*i)->GetElement() == element)
{
- return ((gdcmValEntry *)(*i))->GetValue(); //FIXME
+ return ((ValEntry *)(*i))->GetValue(); //FIXME
}
}
return GDCM_UNFOUND;
//-----------------------------------------------------------------------------
+
+} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff