Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/01/06 15:36:48 $
- Version: $Revision: 1.157 $
+ Date: $Date: 2005/01/07 08:46:18 $
+ Version: $Revision: 1.162 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
static const char *TransferSyntaxStrings[] = {
// Implicit VR Little Endian
"1.2.840.10008.1.2",
- // Implicit VR Little Endian DLX G.E?
+ // Implicit VR Big Endian DLX G.E?
"1.2.840.113619.5.2",
// Explicit VR Little Endian
"1.2.840.10008.1.2.1",
// Unknown
"Unknown Transfer Syntax"
};
-
+
//-----------------------------------------------------------------------------
// Refer to Document::CheckSwap()
//const unsigned int Document::HEADER_LENGTH_TO_READ = 256;
* \brief constructor
* @param filename file to be opened for parsing
*/
-Document::Document( std::string const & filename ) : ElementSet(-1)
+Document::Document( std::string const &filename ) : ElementSet(-1)
{
SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE);
Filename = filename;
* \brief Prints The Dict Entries of THE public Dicom Dictionary
* @return
*/
-void Document::PrintPubDict(std::ostream & os)
+void Document::PrintPubDict(std::ostream &os)
{
RefPubDict->SetPrintLevel(PrintLevel);
RefPubDict->Print(os);
* \brief Prints The Dict Entries of THE shadow Dicom Dictionary
* @return
*/
-void Document::PrintShaDict(std::ostream & os)
+void Document::PrintShaDict(std::ostream &os)
{
RefShaDict->SetPrintLevel(PrintLevel);
RefShaDict->Print(os);
/**
* \brief Get the public dictionary used
*/
-Dict* Document::GetPubDict()
+Dict *Document::GetPubDict()
{
return RefPubDict;
}
/**
* \brief Get the shadow dictionary used
*/
-Dict* Document::GetShaDict()
+Dict *Document::GetShaDict()
{
return RefShaDict;
}
/**
* \brief Set the shadow dictionary used
- * \param dict dictionary to use in shadow
+ * @param dict dictionary to use in shadow
*/
bool Document::SetShaDict(Dict *dict)
{
/**
* \brief Set the shadow dictionary used
- * \param dictName name of the dictionary to use in shadow
+ * @param dictName name of the dictionary to use in shadow
*/
-bool Document::SetShaDict(DictKey const & dictName)
+bool Document::SetShaDict(DictKey const &dictName)
{
RefShaDict = Global::GetDicts()->GetDict(dictName);
return !RefShaDict;
// The entry might be present but not loaded (parsing and loading
// happen at different stages): try loading and proceed with check...
LoadDocEntrySafe(entry);
- if (ValEntry* valEntry = dynamic_cast< ValEntry* >(entry) )
+ if (ValEntry *valEntry = dynamic_cast< ValEntry* >(entry) )
{
std::string transfer = valEntry->GetValue();
// The actual transfer (as read from disk) might be padded. We
* checks the preamble when existing.
* @return The FILE pointer on success.
*/
-std::ifstream* Document::OpenFile()
+std::ifstream *Document::OpenFile()
{
if (Filename.length() == 0)
{
* (ACR-NEMA, ExplicitVR, ImplicitVR)
* \return Always true.
*/
-void Document::WriteContent(std::ofstream* fp, FileType filetype)
+void Document::WriteContent(std::ofstream *fp, FileType filetype)
{
/// \todo move the following lines (and a lot of others, to be written)
/// to a future function CheckAndCorrectHeader
* \return pointer to the modified/created Header Entry (NULL when creation
* failed).
*/
-ValEntry* Document::ReplaceOrCreateByNumber(std::string const & value,
+ValEntry *Document::ReplaceOrCreateByNumber(std::string const &value,
uint16_t group,
uint16_t elem,
- TagName const & vr )
+ TagName const &vr )
{
- ValEntry* valEntry = 0;
- DocEntry* currentEntry = GetDocEntryByNumber( group, elem);
+ ValEntry *valEntry = 0;
+ DocEntry *currentEntry = GetDocEntryByNumber( group, elem);
if (currentEntry)
{
* \return pointer to the modified/created Header Entry (NULL when creation
* failed).
*/
-BinEntry* Document::ReplaceOrCreateByNumber(uint8_t* binArea,
+BinEntry *Document::ReplaceOrCreateByNumber(uint8_t *binArea,
int lgth,
uint16_t group,
uint16_t elem,
- TagName const & vr )
+ TagName const &vr )
{
- BinEntry* binEntry = 0;
- DocEntry* currentEntry = GetDocEntryByNumber( group, elem);
+ BinEntry *binEntry = 0;
+ DocEntry *currentEntry = GetDocEntryByNumber( group, elem);
// Verify the currentEntry
if (currentEntry)
* \return pointer to the modified/created SeqEntry (NULL when creation
* failed).
*/
-SeqEntry* Document::ReplaceOrCreateByNumber( uint16_t group, uint16_t elem)
+SeqEntry *Document::ReplaceOrCreateByNumber( uint16_t group, uint16_t elem)
{
- SeqEntry* seqEntry = 0;
- DocEntry* currentEntry = GetDocEntryByNumber( group, elem);
+ SeqEntry *seqEntry = 0;
+ DocEntry *currentEntry = GetDocEntryByNumber( group, elem);
// Verify the currentEntry
if (currentEntry)
* @param elem element number of the Entry
* \return boolean
*/
-bool Document::ReplaceIfExistByNumber(std::string const & value,
+bool Document::ReplaceIfExistByNumber(std::string const &value,
uint16_t group, uint16_t elem )
{
SetEntryByNumber(value, group, elem);
return TagHT.count(key) != 0;
}
-/**
- * \brief Searches within Header Entries (Dicom Elements) parsed with
- * the public and private dictionaries
- * for the element value of a given tag.
- * \warning Don't use any longer : use GetPubEntryByName
- * @param tagName name of the searched element.
- * @return Corresponding element value when it exists,
- * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
- */
-std::string Document::GetEntryByName(TagName const & tagName)
-{
- DictEntry* dictEntry = RefPubDict->GetDictEntryByName(tagName);
- if( !dictEntry )
- {
- return GDCM_UNFOUND;
- }
-
- return GetEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement());
-}
-
-/**
- * \brief Searches within Header Entries (Dicom Elements) parsed with
- * the public and private dictionaries
- * for the element value representation of a given tag.
- *
- * Obtaining the VR (Value Representation) might be needed by caller
- * to convert the string typed content to caller's native type
- * (think of C++ vs Python). The VR is actually of a higher level
- * of semantics than just the native C++ type.
- * @param tagName name of the searched element.
- * @return Corresponding element value representation when it exists,
- * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
- */
-std::string Document::GetEntryVRByName(TagName const& tagName)
-{
- DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
- if( dictEntry == NULL)
- {
- return GDCM_UNFOUND;
- }
-
- DocEntry* elem = GetDocEntryByNumber(dictEntry->GetGroup(),
- dictEntry->GetElement());
- return elem->GetVR();
-}
/**
* \brief Searches within Header Entries (Dicom Elements) parsed with
*/
std::string Document::GetEntryVRByNumber(uint16_t group, uint16_t element)
{
- DocEntry* elem = GetDocEntryByNumber(group, element);
+ DocEntry *elem = GetDocEntryByNumber(group, element);
if ( !elem )
{
return GDCM_UNFOUND;
*/
int Document::GetEntryLengthByNumber(uint16_t group, uint16_t element)
{
- DocEntry* elem = GetDocEntryByNumber(group, element);
+ DocEntry *elem = GetDocEntryByNumber(group, element);
if ( !elem )
{
return -2; //magic number
}
return elem->GetLength();
}
-/**
- * \brief Sets the value (string) of the Header Entry (Dicom Element)
- * @param content string value of the Dicom Element
- * @param tagName name of the searched Dicom Element.
- * @return true when found
- */
-bool Document::SetEntryByName( std::string const & content,
- TagName const & tagName)
-{
- DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
- if( !dictEntry )
- {
- return false;
- }
-
- return SetEntryByNumber(content,dictEntry->GetGroup(),
- dictEntry->GetElement());
-}
/**
* \brief Accesses an existing DocEntry (i.e. a Dicom Element)
bool Document::SetEntryByNumber(std::string const& content,
uint16_t group, uint16_t element)
{
- ValEntry* entry = GetValEntryByNumber(group, element);
+ ValEntry *entry = GetValEntryByNumber(group, element);
if (!entry )
{
dbg.Verbose(0, "Document::SetEntryByNumber: no corresponding",
bool Document::SetEntryByNumber(uint8_t*content, int lgth,
uint16_t group, uint16_t element)
{
- BinEntry* entry = GetBinEntryByNumber(group, element);
+ BinEntry *entry = GetBinEntryByNumber(group, element);
if (!entry )
{
dbg.Verbose(0, "Document::SetEntryByNumber: no corresponding",
/**
* \brief Accesses an existing DocEntry (i.e. a Dicom Element)
* and modifies it's content with the given value.
- * @param content new value (string) to substitute with
+ * @param content new value (string) to substitute with
+ * @param entry Entry to be modified
*/
-bool Document::SetEntry(std::string const & content,ValEntry* entry)
+bool Document::SetEntry(std::string const &content,ValEntry *entry)
{
if(entry)
{
* \brief Accesses an existing BinEntry (i.e. a Dicom Element)
* and modifies it's content with the given value.
* @param content new value (void* -> uint8_t*) to substitute with
+ * @param entry Entry to be modified
* @param lgth new value length
*/
-bool Document::SetEntry(uint8_t* content, int lgth,BinEntry* entry)
+bool Document::SetEntry(uint8_t *content, int lgth, BinEntry *entry)
{
if(entry)
{
* @param elem element number of the Entry
* @return Pointer to the 'non string' area
*/
-void* Document::GetEntryBinAreaByNumber(uint16_t group, uint16_t elem)
+void *Document::GetEntryBinAreaByNumber(uint16_t group, uint16_t elem)
{
- DocEntry* entry = GetDocEntryByNumber(group, elem);
+ DocEntry *entry = GetDocEntryByNumber(group, elem);
if (!entry)
{
dbg.Verbose(1, "Document::GetDocEntryByNumber: no entry");
return 0;
}
- if ( BinEntry* binEntry = dynamic_cast<BinEntry*>(entry) )
+ if ( BinEntry *binEntry = dynamic_cast<BinEntry*>(entry) )
{
return binEntry->GetBinArea();
}
* when a string is not suitable
* @param element Entry whose binArea is going to be loaded
*/
-void Document::LoadEntryBinArea(BinEntry* element)
+void Document::LoadEntryBinArea(BinEntry *element)
{
if(element->GetBinArea())
return;
Fp->seekg(o, std::ios::beg);
size_t l = element->GetLength();
- uint8_t* a = new uint8_t[l];
+ uint8_t *a = new uint8_t[l];
if( !a )
{
dbg.Verbose(0, "Document::LoadEntryBinArea cannot allocate a");
* @param element Element number of the searched Dicom Element
* @return
*/
-/*bool Document::SetEntryBinAreaByNumber(uint8_t* area,
+/*bool Document::SetEntryBinAreaByNumber(uint8_t *area,
uint16_t group, uint16_t element)
{
- DocEntry* currentEntry = GetDocEntryByNumber(group, element);
+ DocEntry *currentEntry = GetDocEntryByNumber(group, element);
if ( !currentEntry )
{
return false;
}
- if ( BinEntry* binEntry = dynamic_cast<BinEntry*>(currentEntry) )
+ if ( BinEntry *binEntry = dynamic_cast<BinEntry*>(currentEntry) )
{
binEntry->SetBinArea( area );
return true;
return false;
}*/
-/**
- * \brief Searches within the Header Entries for a Dicom Element of
- * a given tag.
- * @param tagName name of the searched Dicom Element.
- * @return Corresponding Dicom Element when it exists, and NULL
- * otherwise.
- */
-DocEntry* Document::GetDocEntryByName(TagName const & tagName)
-{
- DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
- if( !dictEntry )
- {
- return NULL;
- }
-
- return GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement());
-}
-
/**
* \brief retrieves a Dicom Element (the first one) using (group, element)
* \warning (group, element) IS NOT an identifier inside the Dicom Header
* @param element Element number of the searched Dicom Element
* @return
*/
-DocEntry* Document::GetDocEntryByNumber(uint16_t group, uint16_t element)
+DocEntry *Document::GetDocEntryByNumber(uint16_t group, uint16_t element)
{
TagKey key = DictEntry::TranslateToKey(group, element);
if ( !TagHT.count(key))
* ValEntry.
* @return When present, the corresponding ValEntry.
*/
-ValEntry* Document::GetValEntryByNumber(uint16_t group, uint16_t element)
+ValEntry *Document::GetValEntryByNumber(uint16_t group, uint16_t element)
{
- DocEntry* currentEntry = GetDocEntryByNumber(group, element);
+ DocEntry *currentEntry = GetDocEntryByNumber(group, element);
if ( !currentEntry )
{
return 0;
}
- if ( ValEntry* entry = dynamic_cast<ValEntry*>(currentEntry) )
+ if ( ValEntry *entry = dynamic_cast<ValEntry*>(currentEntry) )
{
return entry;
}
* BinEntry.
* @return When present, the corresponding BinEntry.
*/
-BinEntry* Document::GetBinEntryByNumber(uint16_t group, uint16_t element)
+BinEntry *Document::GetBinEntryByNumber(uint16_t group, uint16_t element)
{
- DocEntry* currentEntry = GetDocEntryByNumber(group, element);
+ DocEntry *currentEntry = GetDocEntryByNumber(group, element);
if ( !currentEntry )
{
return 0;
}
- if ( BinEntry* entry = dynamic_cast<BinEntry*>(currentEntry) )
+ if ( BinEntry *entry = dynamic_cast<BinEntry*>(currentEntry) )
{
return entry;
}
/**
* \brief Loads the element while preserving the current
- * underlying file position indicator as opposed to
+ * underlying file position indicator as opposed to
* to LoadDocEntry that modifies it.
* @param entry Header Entry whose value shall be loaded.
* @return
*/
-void Document::LoadDocEntrySafe(DocEntry * entry)
+void Document::LoadDocEntrySafe(DocEntry *entry)
{
if(Fp)
{
long l_max, bool delim_mode)
{
DocEntry *newDocEntry = 0;
+ ValEntry *newValEntry;
+ BinEntry *newBinEntry;
+ SeqEntry *newSeqEntry;
+ VRKey vr;
+ bool used=false;
+ long offsetEntry,readEntry;
while (true)
{
{
break;
}
+
+ used=true;
newDocEntry = ReadNextDocEntry( );
if ( !newDocEntry )
{
break;
}
- VRKey vr = newDocEntry->GetVR();
- if ( vr != "SQ" )
+ vr = newDocEntry->GetVR();
+ newValEntry = dynamic_cast<ValEntry*>(newDocEntry);
+ newBinEntry = dynamic_cast<BinEntry*>(newDocEntry);
+ newSeqEntry = dynamic_cast<SeqEntry*>(newDocEntry);
+
+ if ( newValEntry || newBinEntry )
{
+ offsetEntry=newDocEntry->GetOffset();
+ readEntry=newDocEntry->GetReadLength();
- if ( Global::GetVR()->IsVROfGdcmStringRepresentable(vr) )
+ if ( newBinEntry )
+ {
+ if ( ! Global::GetVR()->IsVROfBinaryRepresentable(vr) )
+ {
+ ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR
+ dbg.Verbose(0, "Document::ParseDES: neither Valentry, "
+ "nor BinEntry. Probably unknown VR.");
+ }
+
+ //////////////////// BinEntry or UNKOWN VR:
+ // When "this" is a Document the Key is simply of the
+ // form ( group, elem )...
+ if (Document *dummy = dynamic_cast< Document* > ( set ) )
+ {
+ (void)dummy;
+ newBinEntry->SetKey( newBinEntry->GetKey() );
+ }
+ // but when "this" is a SQItem, we are inserting this new
+ // valEntry in a sequence item, and the kay has the
+ // generalized form (refer to \ref BaseTagKey):
+ if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) )
+ {
+ newBinEntry->SetKey( parentSQItem->GetBaseTagKey()
+ + newBinEntry->GetKey() );
+ }
+
+ LoadDocEntry( newBinEntry );
+ if( !set->AddEntry( newBinEntry ) )
+ {
+ //Expect big troubles if here
+ //delete newBinEntry;
+ used=false;
+ }
+ }
+ else
{
/////////////////////// ValEntry
- ValEntry* newValEntry =
- new ValEntry( newDocEntry->GetDictEntry() ); //LEAK
- newValEntry->Copy( newDocEntry );
-
// When "set" is a Document, then we are at the top of the
// hierarchy and the Key is simply of the form ( group, elem )...
- if (Document* dummy = dynamic_cast< Document* > ( set ) )
+ if (Document *dummy = dynamic_cast< Document* > ( set ) )
{
(void)dummy;
newValEntry->SetKey( newValEntry->GetKey() );
// ...but when "set" is a SQItem, we are inserting this new
// valEntry in a sequence item. Hence the key has the
// generalized form (refer to \ref BaseTagKey):
- if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) )
+ if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) )
{
newValEntry->SetKey( parentSQItem->GetBaseTagKey()
+ newValEntry->GetKey() );
if( !set->AddEntry( newValEntry ) )
{
// If here expect big troubles
- delete newValEntry; //otherwise mem leak
+ //delete newValEntry; //otherwise mem leak
+ used=false;
}
if (delimitor)
{
- delete newDocEntry;
+ if(!used)
+ delete newDocEntry;
break;
}
if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
{
- delete newDocEntry;
+ if(!used)
+ delete newDocEntry;
break;
}
}
- else
- {
- if ( ! Global::GetVR()->IsVROfGdcmBinaryRepresentable(vr) )
- {
- ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR
- dbg.Verbose(0, "Document::ParseDES: neither Valentry, "
- "nor BinEntry. Probably unknown VR.");
- }
-
- //////////////////// BinEntry or UNKOWN VR:
- BinEntry* newBinEntry = new BinEntry( newDocEntry ); //LEAK
-
- // When "this" is a Document the Key is simply of the
- // form ( group, elem )...
- if (Document* dummy = dynamic_cast< Document* > ( set ) )
- {
- (void)dummy;
- newBinEntry->SetKey( newBinEntry->GetKey() );
- }
- // but when "this" is a SQItem, we are inserting this new
- // valEntry in a sequence item, and the kay has the
- // generalized form (refer to \ref BaseTagKey):
- if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) )
- {
- newBinEntry->SetKey( parentSQItem->GetBaseTagKey()
- + newBinEntry->GetKey() );
- }
-
- LoadDocEntry( newBinEntry );
- if( !set->AddEntry( newBinEntry ) )
- {
- //Expect big troubles if here
- delete newBinEntry;
- }
- }
if ( ( newDocEntry->GetGroup() == 0x7fe0 )
&& ( newDocEntry->GetElement() == 0x0010 ) )
TransferSyntaxType ts = GetTransferSyntax();
if ( ts == RLELossless )
{
- long PositionOnEntry = Fp->tellg();
+ long positionOnEntry = Fp->tellg();
Fp->seekg( newDocEntry->GetOffset(), std::ios::beg );
ComputeRLEInfo();
- Fp->seekg( PositionOnEntry, std::ios::beg );
+ Fp->seekg( positionOnEntry, std::ios::beg );
}
else if ( IsJPEG() )
{
- long PositionOnEntry = Fp->tellg();
+ long positionOnEntry = Fp->tellg();
Fp->seekg( newDocEntry->GetOffset(), std::ios::beg );
ComputeJPEGFragmentInfo();
- Fp->seekg( PositionOnEntry, std::ios::beg );
+ Fp->seekg( positionOnEntry, std::ios::beg );
}
}
// Just to make sure we are at the beginning of next entry.
- SkipToNextDocEntry(newDocEntry);
- //delete newDocEntry;
+ SkipToNextDocEntry(offsetEntry,readEntry);
}
else
{
}
}
// no other way to create it ...
- SeqEntry* newSeqEntry =
- new SeqEntry( newDocEntry->GetDictEntry() );
- newSeqEntry->Copy( newDocEntry );
newSeqEntry->SetDelimitorMode( delim_mode );
// At the top of the hierarchy, stands a Document. When "set"
// is a Document, then we are building the first depth level.
// Hence the SeqEntry we are building simply has a depth
// level of one:
- if (Document* dummy = dynamic_cast< Document* > ( set ) )
+ if (Document *dummy = dynamic_cast< Document* > ( set ) )
{
(void)dummy;
newSeqEntry->SetDepthLevel( 1 );
// But when "set" is allready a SQItem, we are building a nested
// sequence, and hence the depth level of the new SeqEntry
// we are building, is one level deeper:
- if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) )
+ if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) )
{
newSeqEntry->SetDepthLevel( parentSQItem->GetDepthLevel() + 1 );
newSeqEntry->SetKey( parentSQItem->GetBaseTagKey()
set->AddEntry( newSeqEntry );
if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
{
- delete newDocEntry;
break;
}
}
- delete newDocEntry;
+
+ if(!used)
+ delete newDocEntry;
}
}
* \brief Parses a Sequence ( SeqEntry after SeqEntry)
* @return parsed length for this level
*/
-void Document::ParseSQ( SeqEntry* seqEntry,
+void Document::ParseSQ( SeqEntry *seqEntry,
long offset, long l_max, bool delim_mode)
{
int SQItemNumber = 0;
while (true)
{
- DocEntry* newDocEntry = ReadNextDocEntry();
+ DocEntry *newDocEntry = ReadNextDocEntry();
if ( !newDocEntry )
{
// FIXME Should warn user
* the value specified with Document::SetMaxSizeLoadEntry()
* @param entry Header Entry (Dicom Element) to be dealt with
*/
-void Document::LoadDocEntry(DocEntry* entry)
+void Document::LoadDocEntry(DocEntry *entry)
{
uint16_t group = entry->GetGroup();
std::string vr = entry->GetVR();
std::ostringstream s;
if (length > MaxSizeLoadEntry)
{
- if (BinEntry* binEntryPtr = dynamic_cast< BinEntry* >(entry) )
+ if (BinEntry *binEntryPtr = dynamic_cast< BinEntry* >(entry) )
{
//s << "gdcm::NotLoaded (BinEntry)";
s << GDCM_NOTLOADED;
binEntryPtr->SetValue(s.str());
}
// Be carefull : a BinEntry IS_A ValEntry ...
- else if (ValEntry* valEntryPtr = dynamic_cast< ValEntry* >(entry) )
+ else if (ValEntry *valEntryPtr = dynamic_cast< ValEntry* >(entry) )
{
// s << "gdcm::NotLoaded. (ValEntry)";
s << GDCM_NOTLOADED;
}
// When we find a BinEntry not very much can be done :
- if (BinEntry* binEntryPtr = dynamic_cast< BinEntry* >(entry) )
+ if (BinEntry *binEntryPtr = dynamic_cast< BinEntry* >(entry) )
{
s << GDCM_BINLOADED;
binEntryPtr->SetValue(s.str());
}
delete[] str;
- if ( ValEntry* valEntry = dynamic_cast<ValEntry* >(entry) )
+ if ( ValEntry *valEntry = dynamic_cast<ValEntry* >(entry) )
{
if ( Fp->fail() || Fp->eof())//Fp->gcount() == 1
{
// and the dictionary entry depending on them.
uint16_t correctGroup = SwapShort( entry->GetGroup() );
uint16_t correctElem = SwapShort( entry->GetElement() );
- DictEntry* newTag = GetDictEntryByNumber( correctGroup,
+ DictEntry *newTag = GetDictEntryByNumber( correctGroup,
correctElem );
if ( !newTag )
{
/**
* \brief Find the Value Representation of the current Dicom Element.
- * @param entry
+ * @return Value Representation of the current Entry
*/
std::string Document::FindDocEntryVR()
{
* \brief Check the correspondance between the VR of the header entry
* and the taken VR. If they are different, the header entry is
* updated with the new VR.
- * @param entry Header Entry to check
* @param vr Dicom Value Representation
* @return false if the VR is incorrect of if the VR isn't referenced
* otherwise, it returns true
* @param entry Entry to reverse transform
* @return Reverse transformed entry value
*/
-std::string Document::GetDocEntryUnvalue(DocEntry* entry)
+std::string Document::GetDocEntryUnvalue(DocEntry *entry)
{
if ( IsDocEntryAnInteger(entry) && entry->IsImplicitVR() )
{
/**
* \brief Skips to the begining of the next Header Entry
* \warning NOT end user intended method !
- * @param entry entry to skip
+ * @param offset start of skipping
+ * @param readLgth length to skip
+
*/
-void Document::SkipToNextDocEntry(DocEntry *entry)
+void Document::SkipToNextDocEntry(long offset,long readLgth)
{
- Fp->seekg((long)(entry->GetOffset()), std::ios::beg);
- Fp->seekg( (long)(entry->GetReadLength()), std::ios::cur);
+ Fp->seekg((long)(offset), std::ios::beg);
+ Fp->seekg( (long)(readLgth), std::ios::cur);
}
/**
{
uint16_t element = entry->GetElement();
uint16_t group = entry->GetGroup();
- const std::string & vr = entry->GetVR();
+ const std::string &vr = entry->GetVR();
uint32_t length = entry->GetLength();
// When we have some semantics on the element we just read, and if we
* gets the VR, gets the length, gets the offset value)
* @return On succes the newly created DocEntry, NULL on failure.
*/
-DocEntry* Document::ReadNextDocEntry()
+DocEntry *Document::ReadNextDocEntry()
{
uint16_t group;
uint16_t elem;
}
HandleBrokenEndian(group, elem);
- std::string vr=FindDocEntryVR();
+ std::string vr = FindDocEntryVR();
+ std::string realVR = vr;
+
+ if( vr == GDCM_UNKNOWN)
+ {
+ DictEntry *dictEntry = GetDictEntryByNumber(group,elem);
+ if( dictEntry )
+ realVR = dictEntry->GetVR();
+ }
+
+ DocEntry *newEntry;
+ if( Global::GetVR()->IsVROfSequence(realVR) )
+ newEntry = NewSeqEntryByNumber(group, elem);
+ else if( Global::GetVR()->IsVROfStringRepresentable(realVR) )
+ newEntry = NewValEntryByNumber(group, elem,vr);
+ else
+ newEntry = NewBinEntryByNumber(group, elem,vr);
- DocEntry *newEntry = NewDocEntryByNumber(group, elem, vr);
if( vr == GDCM_UNKNOWN )
{
if( Filetype == ExplicitVR )
// lengths, but we won't bother with such fuses for the time being.
if ( itemLength != 0 )
{
- char* basicOffsetTableItemValue = new char[itemLength + 1];
+ char *basicOffsetTableItemValue = new char[itemLength + 1];
Fp->read(basicOffsetTableItemValue, itemLength);
#ifdef GDCM_DEBUG
SkipBytes(rleSegmentLength[nbRleSegments]);
// Store the collected info
- RLEFrame* newFrameInfo = new RLEFrame;
+ RLEFrame *newFrameInfo = new RLEFrame;
newFrameInfo->NumberFragments = nbRleSegments;
for( unsigned int uk = 1; uk <= nbRleSegments; uk++ )
{
long fragmentOffset = Fp->tellg();
// Store the collected info
- JPEGFragment* newFragment = new JPEGFragment;
+ JPEGFragment *newFragment = new JPEGFragment;
newFragment->Offset = fragmentOffset;
newFragment->Length = fragmentLength;
JPEGInfo->Fragments.push_back( newFragment );
* when recursively walking the given set.
* @param set The structure to be traversed (recursively).
*/
-void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT,
- DocEntrySet* set )
+void Document::BuildFlatHashTableRecurse( TagDocEntryHT &builtHT,
+ DocEntrySet *set )
{
- if (ElementSet* elementSet = dynamic_cast< ElementSet* > ( set ) )
+ if (ElementSet *elementSet = dynamic_cast< ElementSet* > ( set ) )
{
- TagDocEntryHT const & currentHT = elementSet->GetTagHT();
+ TagDocEntryHT const ¤tHT = elementSet->GetTagHT();
for( TagDocEntryHT::const_iterator i = currentHT.begin();
i != currentHT.end();
++i)
{
- DocEntry* entry = i->second;
- if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
+ DocEntry *entry = i->second;
+ if ( SeqEntry *seqEntry = dynamic_cast<SeqEntry*>(entry) )
{
const ListSQItem& items = seqEntry->GetSQItems();
for( ListSQItem::const_iterator item = items.begin();
return;
}
- if (SQItem* SQItemSet = dynamic_cast< SQItem* > ( set ) )
+ if (SQItem *SQItemSet = dynamic_cast< SQItem* > ( set ) )
{
const ListDocEntry& currentList = SQItemSet->GetDocEntries();
for (ListDocEntry::const_iterator i = currentList.begin();
i != currentList.end();
++i)
{
- DocEntry* entry = *i;
- if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
+ DocEntry *entry = *i;
+ if ( SeqEntry *seqEntry = dynamic_cast<SeqEntry*>(entry) )
{
const ListSQItem& items = seqEntry->GetSQItems();
for( ListSQItem::const_iterator item = items.begin();
* \ref BuildFlatHashTable again...
* @return The flat std::map<> we juste build.
*/
-TagDocEntryHT* Document::BuildFlatHashTable()
+TagDocEntryHT *Document::BuildFlatHashTable()
{
- TagDocEntryHT* FlatHT = new TagDocEntryHT;
+ TagDocEntryHT *FlatHT = new TagDocEntryHT;
BuildFlatHashTableRecurse( *FlatHT, this );
return FlatHT;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff