Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/01/07 08:46:18 $
- Version: $Revision: 1.162 $
+ Date: $Date: 2005/01/08 15:03:59 $
+ Version: $Revision: 1.168 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
return;
}
- dbg.Verbose(0, "Document::Document: starting parsing of file: ",
- Filename.c_str());
+ gdcmVerboseMacro( "Starting parsing of file: " << Filename.c_str());
Fp->seekg( 0, std::ios::beg);
Fp->seekg(0, std::ios::end);
// Load 'non string' values
- std::string PhotometricInterpretation = GetEntryByNumber(0x0028,0x0004);
+ std::string PhotometricInterpretation = GetEntry(0x0028,0x0004);
if( PhotometricInterpretation == "PALETTE COLOR " )
{
LoadEntryBinArea(0x0028,0x1200); // gray LUT
// we switch lineNumber and columnNumber
//
std::string RecCode;
- RecCode = GetEntryByNumber(0x0008, 0x0010); // recognition code
+ RecCode = GetEntry(0x0008, 0x0010); // recognition code
if (RecCode == "ACRNEMA_LIBIDO_1.1" ||
RecCode == "CANRME_AILIBOD1_1." ) // for brain-damaged softwares
// with "little-endian strings"
{
Filetype = ACR_LIBIDO;
- std::string rows = GetEntryByNumber(0x0028, 0x0010);
- std::string columns = GetEntryByNumber(0x0028, 0x0011);
- SetEntryByNumber(columns, 0x0028, 0x0010);
- SetEntryByNumber(rows , 0x0028, 0x0011);
+ std::string rows = GetEntry(0x0028, 0x0010);
+ std::string columns = GetEntry(0x0028, 0x0011);
+ SetEntry(columns, 0x0028, 0x0010);
+ SetEntry(rows , 0x0028, 0x0011);
}
// ----------------- End of ACR-LibIDO kludge ------------------
}
{
if( Filetype == Unknown)
{
- dbg.Verbose(0, "Document::IsReadable: wrong filetype");
+ gdcmVerboseMacro( "Wrong filetype");
return false;
}
if( TagHT.empty() )
{
- dbg.Verbose(0, "Document::IsReadable: no tags in internal"
- " hash table.");
+ gdcmVerboseMacro( "No tags in internal hash table.");
return false;
}
*/
TransferSyntaxType Document::GetTransferSyntax()
{
- DocEntry *entry = GetDocEntryByNumber(0x0002, 0x0010);
+ DocEntry *entry = GetDocEntry(0x0002, 0x0010);
if ( !entry )
{
return UnknownTS;
// Anyway, it's to late check if the 'Preamble' was found ...
// And ... would it be a rich idea to check ?
// (some 'no Preamble' DICOM images exist !)
- return GetDocEntryByNumber(0x0002, 0x0010) != NULL;
+ return GetDocEntry(0x0002, 0x0010) != NULL;
}
/**
if(Fp)
{
- dbg.Verbose( 0,
- "Document::OpenFile is already opened when opening: ",
- Filename.c_str());
+ gdcmVerboseMacro( "Is already opened when opening: " << Filename.c_str());
}
Fp = new std::ifstream(Filename.c_str(), std::ios::in | std::ios::binary);
if( ! *Fp )
{
- dbg.Verbose( 0,
- "Document::OpenFile cannot open file: ",
- Filename.c_str());
+ gdcmVerboseMacro( "Cannot open file: " << Filename.c_str());
delete Fp;
Fp = 0;
return 0;
}
CloseFile();
- dbg.Verbose( 0,
- "Document::OpenFile not DICOM/ACR (missing preamble)",
- Filename.c_str());
+ gdcmVerboseMacro( "Not DICOM/ACR (missing preamble)" << Filename.c_str());
return 0;
}
* \return pointer to the modified/created Header Entry (NULL when creation
* failed).
*/
-ValEntry *Document::ReplaceOrCreateByNumber(std::string const &value,
- uint16_t group,
- uint16_t elem,
- TagName const &vr )
+ValEntry *Document::ReplaceOrCreate(std::string const &value,
+ uint16_t group,
+ uint16_t elem,
+ TagName const &vr )
{
ValEntry *valEntry = 0;
- DocEntry *currentEntry = GetDocEntryByNumber( group, elem);
+ DocEntry *currentEntry = GetDocEntry( group, elem);
if (currentEntry)
{
{
if (!RemoveEntry(currentEntry))
{
- dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal"
- " of previous DocEntry failed.");
+ gdcmVerboseMacro( "Removal of previous DocEntry failed.");
return NULL;
}
// Create a new valEntry if necessary
if (!valEntry)
{
- valEntry = NewValEntryByNumber(group, elem, vr);
+ valEntry = NewValEntry(group, elem, vr);
if ( !AddEntry(valEntry))
{
- dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry"
- " failed allthough this is a creation.");
+ gdcmVerboseMacro("AddEntry failed although this is a creation.");
delete valEntry;
return NULL;
* \return pointer to the modified/created Header Entry (NULL when creation
* failed).
*/
-BinEntry *Document::ReplaceOrCreateByNumber(uint8_t *binArea,
- int lgth,
- uint16_t group,
- uint16_t elem,
- TagName const &vr )
+BinEntry *Document::ReplaceOrCreate(uint8_t *binArea,
+ int lgth,
+ uint16_t group,
+ uint16_t elem,
+ TagName const &vr )
{
BinEntry *binEntry = 0;
- DocEntry *currentEntry = GetDocEntryByNumber( group, elem);
+ DocEntry *currentEntry = GetDocEntry( group, elem);
// Verify the currentEntry
if (currentEntry)
{
if (!RemoveEntry(currentEntry))
{
- dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal"
- " of previous DocEntry failed.");
+ gdcmVerboseMacro( "Removal of previous DocEntry failed.");
return NULL;
}
// Create a new binEntry if necessary
if (!binEntry)
{
- binEntry = NewBinEntryByNumber(group, elem, vr);
+ binEntry = NewBinEntry(group, elem, vr);
if ( !AddEntry(binEntry))
{
- dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry"
- " failed allthough this is a creation.");
+ gdcmVerboseMacro( "AddEntry failed allthough this is a creation.");
delete binEntry;
return NULL;
* \return pointer to the modified/created SeqEntry (NULL when creation
* failed).
*/
-SeqEntry *Document::ReplaceOrCreateByNumber( uint16_t group, uint16_t elem)
+SeqEntry *Document::ReplaceOrCreate( uint16_t group, uint16_t elem)
{
SeqEntry *seqEntry = 0;
- DocEntry *currentEntry = GetDocEntryByNumber( group, elem);
+ DocEntry *currentEntry = GetDocEntry( group, elem);
// Verify the currentEntry
if (currentEntry)
{
if (!RemoveEntry(currentEntry))
{
- dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal"
- " of previous DocEntry failed.");
+ gdcmVerboseMacro( "Removal of previous DocEntry failed.");
return NULL;
}
// Create a new seqEntry if necessary
if (!seqEntry)
{
- seqEntry = NewSeqEntryByNumber(group, elem);
+ seqEntry = NewSeqEntry(group, elem);
if ( !AddEntry(seqEntry))
{
- dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry"
- " failed allthough this is a creation.");
+ gdcmVerboseMacro( "AddEntry failed allthough this is a creation.");
delete seqEntry;
return NULL;
* @param elem element number of the Entry
* \return boolean
*/
-bool Document::ReplaceIfExistByNumber(std::string const &value,
- uint16_t group, uint16_t elem )
+bool Document::ReplaceIfExist(std::string const &value,
+ uint16_t group, uint16_t elem )
{
- SetEntryByNumber(value, group, elem);
+ SetEntry(value, group, elem);
return true;
}
* @param element Element number of the searched Dicom Element
* @return true is found
*/
-bool Document::CheckIfEntryExistByNumber(uint16_t group, uint16_t element )
+bool Document::CheckIfEntryExist(uint16_t group, uint16_t element )
{
const std::string &key = DictEntry::TranslateToKey(group, element );
return TagHT.count(key) != 0;
* @return Corresponding element value representation when it exists,
* and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
*/
-std::string Document::GetEntryByNumber(uint16_t group, uint16_t element)
+std::string Document::GetEntry(uint16_t group, uint16_t element)
{
TagKey key = DictEntry::TranslateToKey(group, element);
if ( !TagHT.count(key))
* @return Corresponding element value representation when it exists,
* and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
*/
-std::string Document::GetEntryVRByNumber(uint16_t group, uint16_t element)
+std::string Document::GetEntryVR(uint16_t group, uint16_t element)
{
- DocEntry *elem = GetDocEntryByNumber(group, element);
+ DocEntry *elem = GetDocEntry(group, element);
if ( !elem )
{
return GDCM_UNFOUND;
* @param element Element number of the searched tag.
* @return Corresponding element length; -2 if not found
*/
-int Document::GetEntryLengthByNumber(uint16_t group, uint16_t element)
+int Document::GetEntryLength(uint16_t group, uint16_t element)
{
- DocEntry *elem = GetDocEntryByNumber(group, element);
+ DocEntry *elem = GetDocEntry(group, element);
if ( !elem )
{
return -2; //magic number
* @param group group number of the Dicom Element to modify
* @param element element number of the Dicom Element to modify
*/
-bool Document::SetEntryByNumber(std::string const& content,
- uint16_t group, uint16_t element)
+bool Document::SetEntry(std::string const& content,
+ uint16_t group, uint16_t element)
{
- ValEntry *entry = GetValEntryByNumber(group, element);
+ ValEntry *entry = GetValEntry(group, element);
if (!entry )
{
- dbg.Verbose(0, "Document::SetEntryByNumber: no corresponding",
- " ValEntry (try promotion first).");
+ gdcmVerboseMacro( "No corresponding ValEntry (try promotion first).");
return false;
}
return SetEntry(content,entry);
* @param group group number of the Dicom Element to modify
* @param element element number of the Dicom Element to modify
*/
-bool Document::SetEntryByNumber(uint8_t*content, int lgth,
- uint16_t group, uint16_t element)
+bool Document::SetEntry(uint8_t*content, int lgth,
+ uint16_t group, uint16_t element)
{
- BinEntry *entry = GetBinEntryByNumber(group, element);
+ BinEntry *entry = GetBinEntry(group, element);
if (!entry )
{
- dbg.Verbose(0, "Document::SetEntryByNumber: no corresponding",
- " ValEntry (try promotion first).");
+ gdcmVerboseMacro( "No corresponding ValEntry (try promotion first).");
return false;
}
* @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::GetEntryBinArea(uint16_t group, uint16_t elem)
{
- DocEntry *entry = GetDocEntryByNumber(group, elem);
+ DocEntry *entry = GetDocEntry(group, elem);
if (!entry)
{
- dbg.Verbose(1, "Document::GetDocEntryByNumber: no entry");
+ gdcmVerboseMacro( "No entry");
return 0;
}
if ( BinEntry *binEntry = dynamic_cast<BinEntry*>(entry) )
void Document::LoadEntryBinArea(uint16_t group, uint16_t elem)
{
// Search the corresponding DocEntry
- DocEntry *docElement = GetDocEntryByNumber(group, elem);
+ DocEntry *docElement = GetDocEntry(group, elem);
if ( !docElement )
return;
uint8_t *a = new uint8_t[l];
if( !a )
{
- dbg.Verbose(0, "Document::LoadEntryBinArea cannot allocate a");
+ gdcmVerboseMacro( "Cannot allocate a");
return;
}
* @param element Element number of the searched Dicom Element
* @return
*/
-/*bool Document::SetEntryBinAreaByNumber(uint8_t *area,
- uint16_t group, uint16_t element)
+/*bool Document::SetEntryBinArea(uint8_t *area,
+ uint16_t group, uint16_t element)
{
- DocEntry *currentEntry = GetDocEntryByNumber(group, element);
+ DocEntry *currentEntry = GetDocEntry(group, element);
if ( !currentEntry )
{
return false;
* @param element Element number of the searched Dicom Element
* @return
*/
-DocEntry *Document::GetDocEntryByNumber(uint16_t group, uint16_t element)
+DocEntry *Document::GetDocEntry(uint16_t group, uint16_t element)
{
TagKey key = DictEntry::TranslateToKey(group, element);
if ( !TagHT.count(key))
}
/**
- * \brief Same as \ref Document::GetDocEntryByNumber except it only
+ * \brief Same as \ref Document::GetDocEntry except it only
* returns a result when the corresponding entry is of type
* ValEntry.
* @return When present, the corresponding ValEntry.
*/
-ValEntry *Document::GetValEntryByNumber(uint16_t group, uint16_t element)
+ValEntry *Document::GetValEntry(uint16_t group, uint16_t element)
{
- DocEntry *currentEntry = GetDocEntryByNumber(group, element);
+ DocEntry *currentEntry = GetDocEntry(group, element);
if ( !currentEntry )
{
return 0;
{
return entry;
}
- dbg.Verbose(0, "Document::GetValEntryByNumber: unfound ValEntry.");
+ gdcmVerboseMacro( "Unfound ValEntry.");
return 0;
}
/**
- * \brief Same as \ref Document::GetDocEntryByNumber except it only
+ * \brief Same as \ref Document::GetDocEntry except it only
* returns a result when the corresponding entry is of type
* BinEntry.
* @return When present, the corresponding BinEntry.
*/
-BinEntry *Document::GetBinEntryByNumber(uint16_t group, uint16_t element)
+BinEntry *Document::GetBinEntry(uint16_t group, uint16_t element)
{
- DocEntry *currentEntry = GetDocEntryByNumber(group, element);
+ DocEntry *currentEntry = GetDocEntry(group, element);
if ( !currentEntry )
{
return 0;
{
return entry;
}
- dbg.Verbose(0, "Document::GetBinEntryByNumber: unfound BinEntry.");
+ gdcmVerboseMacro( "Unfound BinEntry.");
return 0;
}
break;
default :
//std::cout << "swapCode= " << SwapCode << std::endl;
- dbg.Error(" Document::SwapLong : unset swap code");
+ gdcmErrorMacro( "Unset swap code");
a = 0;
}
return a;
SeqEntry *newSeqEntry;
VRKey vr;
bool used=false;
- long offsetEntry,readEntry;
while (true)
{
if ( newValEntry || newBinEntry )
{
- offsetEntry=newDocEntry->GetOffset();
- readEntry=newDocEntry->GetReadLength();
-
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.");
+ gdcmVerboseMacro( "Neither Valentry, nor BinEntry."
+ "Probably unknown VR.");
}
//////////////////// BinEntry or UNKOWN VR:
Fp->seekg( positionOnEntry, std::ios::beg );
}
}
-
+
// Just to make sure we are at the beginning of next entry.
- SkipToNextDocEntry(offsetEntry,readEntry);
+ SkipToNextDocEntry(newDocEntry);
}
else
{
LoadEntryBinArea(binEntryPtr); // last one, not to erase length !
return;
}
-
+
/// \todo Any compacter code suggested (?)
if ( IsDocEntryAnInteger(entry) )
{
if( length % 2 )
{
newValue = Util::DicomString(str, length+1);
- //dbg.Verbose(0, "Warning: bad length: ", length );
- dbg.Verbose(0, "For string :", newValue.c_str());
+ gdcmVerboseMacro("Warning: bad length: " << length );
+ gdcmVerboseMacro("For string :" << newValue.c_str());
// Since we change the length of string update it length
- entry->SetReadLength(length+1);
+ //entry->SetReadLength(length+1);
}
else
{
{
if ( Fp->fail() || Fp->eof())//Fp->gcount() == 1
{
- dbg.Verbose(1, "Document::LoadDocEntry",
- "unread element value");
+ gdcmVerboseMacro( "Unread element value");
valEntry->SetValue(GDCM_UNREAD);
return;
}
}
else
{
- dbg.Error(true, "Document::LoadDocEntry"
- "Should have a ValEntry, here !");
+ gdcmErrorMacro( "Should have a ValEntry, here !");
}
}
uint32_t lengthOB;
try
{
- /// \todo rename that to FindDocEntryLengthOBOrOW since
- /// the above test is on both OB and OW...
- lengthOB = FindDocEntryLengthOB();
+ lengthOB = FindDocEntryLengthOBOrOW();
}
catch ( FormatUnexpected )
{
// the length and proceed.
long currentPosition = Fp->tellg();
Fp->seekg(0L,std::ios::end);
+
long lengthUntilEOF = (long)(Fp->tellg())-currentPosition;
Fp->seekg(currentPosition, std::ios::beg);
+
+ entry->SetReadLength(lengthUntilEOF);
entry->SetLength(lengthUntilEOF);
return;
}
+ entry->SetReadLength(lengthOB);
entry->SetLength(lengthOB);
return;
}
}
length16 = 4;
SwitchSwapToBigEndian();
+
// Restore the unproperly loaded values i.e. the group, the element
// 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 = GetDictEntry( correctGroup,
correctElem );
if ( !newTag )
{
* @param readLgth length to skip
*/
-void Document::SkipToNextDocEntry(long offset,long readLgth)
+void Document::SkipToNextDocEntry(DocEntry *newDocEntry)
{
- Fp->seekg((long)(offset), std::ios::beg);
- Fp->seekg( (long)(readLgth), std::ios::cur);
+ Fp->seekg((long)(newDocEntry->GetOffset()), std::ios::beg);
+ Fp->seekg( (long)(newDocEntry->GetReadLength()),std::ios::cur);
}
/**
foundLength = 0;
}
- uint16_t gr = entry->GetGroup();
- uint16_t el = entry->GetElement();
+ uint16_t gr = entry->GetGroup();
+ uint16_t elem = entry->GetElement();
if ( foundLength % 2)
{
- std::ostringstream s;
- s << "Warning : Tag with uneven length "
- << foundLength
- << " in x(" << std::hex << gr << "," << el <<")" << std::dec;
- dbg.Verbose(0, s.str().c_str());
+ gdcmVerboseMacro( "Warning : Tag with uneven length " << foundLength
+ << " in x(" << std::hex << gr << "," << elem <<")");
}
//////// Fix for some naughty General Electric images.
// Allthough not recent many such GE corrupted images are still present
// on Creatis hard disks. Hence this fix shall remain when such images
- // are no longer in user (we are talking a few years, here)...
+ // are no longer in use (we are talking a few years, here)...
// Note: XMedCom probably uses such a trick since it is able to read
// those pesky GE images ...
if ( foundLength == 13)
{
// Only happens for this length !
- if ( entry->GetGroup() != 0x0008
- || ( entry->GetElement() != 0x0070
- && entry->GetElement() != 0x0080 ) )
+ if ( gr != 0x0008 || ( elem != 0x0070 && elem != 0x0080 ) )
{
foundLength = 10;
entry->SetReadLength(10); /// \todo a bug is to be fixed !?
// Occurence of such images is quite low (unless one leaves close to a
// 'Leonardo' source. Hence, one might consider commenting out the
// following fix on efficiency reasons.
- else if ( entry->GetGroup() == 0x0009
- && ( entry->GetElement() == 0x1113
- || entry->GetElement() == 0x1114 ) )
+ else if ( gr == 0x0009 && ( elem == 0x1113 || elem == 0x1114 ) )
{
foundLength = 4;
entry->SetReadLength(4); /// \todo a bug is to be fixed !?
//////// We encountered a 'delimiter' element i.e. a tag of the form
// "fffe|xxxx" which is just a marker. Delimiters length should not be
// taken into account.
- else if( entry->GetGroup() == 0xfffe )
+ else if( gr == 0xfffe )
{
// According to the norm, fffe|0000 shouldn't exist. BUT the Philips
// image gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm happens to
}
}
- entry->SetUsableLength(foundLength);
+ entry->SetLength(foundLength);
}
/**
// test is useless (and might even look a bit paranoid), when we
// encounter such an ill-formed image, we simply display a warning
// message and proceed on parsing (while crossing fingers).
- std::ostringstream s;
long filePosition = Fp->tellg();
- s << "Erroneous Group Length element length on : (" \
+ gdcmVerboseMacro( "Erroneous Group Length element length on : ("
<< std::hex << group << " , " << element
<< ") -before- position x(" << filePosition << ")"
- << "lgt : " << length;
- dbg.Verbose(0, "Document::IsDocEntryAnInteger", s.str().c_str() );
+ << "lgt : " << length );
}
}
* @return
*/
-uint32_t Document::FindDocEntryLengthOB()
+uint32_t Document::FindDocEntryLengthOBOrOW()
throw( FormatUnexpected )
{
// See PS 3.5-2001, section A.4 p. 49 on encapsulation of encoded pixel data.
}
catch ( FormatError )
{
- throw FormatError("Document::FindDocEntryLengthOB()",
+ throw FormatError("Document::FindDocEntryLengthOBOrOW()",
" group or element not present.");
}
if ( group != 0xfffe || ( ( elem != 0xe0dd ) && ( elem != 0xe000 ) ) )
{
- dbg.Verbose(1, "Document::FindDocEntryLengthOB: neither an Item "
- "tag nor a Sequence delimiter tag.");
+ gdcmVerboseMacro( "Neither an Item tag nor a Sequence delimiter tag.");
Fp->seekg(positionOnEntry, std::ios::beg);
- throw FormatUnexpected("Document::FindDocEntryLengthOB()",
- "Neither an Item tag nor a Sequence "
- "delimiter tag.");
+ throw FormatUnexpected( "Neither an Item tag nor a Sequence delimiter tag.");
}
if ( elem == 0xe0dd )
char *entCur = deb + 128;
if( memcmp(entCur, "DICM", (size_t)4) == 0 )
{
- dbg.Verbose(1, "Document::CheckSwap:", "looks like DICOM Version3");
+ gdcmVerboseMacro( "Looks like DICOM Version3" );
// Next, determine the value representation (VR). Let's skip to the
// first element (0002, 0000) and check there if we find "UL"
// instead of just checking for UL, OB and UI !? group 0000
{
Filetype = ExplicitVR;
- dbg.Verbose(1, "Document::CheckSwap:",
- "explicit Value Representation");
+ gdcmVerboseMacro( "Explicit Value Representation");
}
else
{
Filetype = ImplicitVR;
- dbg.Verbose(1, "Document::CheckSwap:",
- "not an explicit Value Representation");
+ gdcmVerboseMacro( "Not an explicit Value Representation");
}
if ( net2host )
{
SwapCode = 4321;
- dbg.Verbose(1, "Document::CheckSwap:",
- "HostByteOrder != NetworkByteOrder");
+ gdcmVerboseMacro( "HostByteOrder != NetworkByteOrder");
}
else
{
SwapCode = 0;
- dbg.Verbose(1, "Document::CheckSwap:",
- "HostByteOrder = NetworkByteOrder");
+ gdcmVerboseMacro( "HostByteOrder = NetworkByteOrder");
}
// Position the file position indicator at first tag (i.e.
// Alas, this is not a DicomV3 file and whatever happens there is no file
// preamble. We can reset the file position indicator to where the data
// is (i.e. the beginning of the file).
- dbg.Verbose(1, "Document::CheckSwap:", "not a DICOM Version3 file");
+ gdcmVerboseMacro( "Not a DICOM Version3 file");
Fp->seekg(0, std::ios::beg);
// Our next best chance would be to be considering a 'clean' ACR/NEMA file.
Filetype = ACR;
return true;
default :
- dbg.Verbose(0, "Document::CheckSwap:",
- "ACR/NEMA unfound swap info (Really hopeless !)");
+ gdcmVerboseMacro( "ACR/NEMA unfound swap info (Really hopeless !)");
Filetype = Unknown;
return false;
}
*/
void Document::SwitchSwapToBigEndian()
{
- dbg.Verbose(1, "Document::SwitchSwapToBigEndian",
- "Switching to BigEndian mode.");
+ gdcmVerboseMacro( "Switching to BigEndian mode.");
if ( SwapCode == 0 )
{
SwapCode = 4321;
if( vr == GDCM_UNKNOWN)
{
- DictEntry *dictEntry = GetDictEntryByNumber(group,elem);
+ DictEntry *dictEntry = GetDictEntry(group,elem);
if( dictEntry )
realVR = dictEntry->GetVR();
}
DocEntry *newEntry;
if( Global::GetVR()->IsVROfSequence(realVR) )
- newEntry = NewSeqEntryByNumber(group, elem);
+ newEntry = NewSeqEntry(group, elem);
else if( Global::GetVR()->IsVROfStringRepresentable(realVR) )
- newEntry = NewValEntryByNumber(group, elem,vr);
+ newEntry = NewValEntry(group, elem,vr);
else
- newEntry = NewBinEntryByNumber(group, elem,vr);
+ newEntry = NewBinEntry(group, elem,vr);
if( vr == GDCM_UNKNOWN )
{
std::string msg;
msg = Util::Format("Falsely explicit vr file (%04x,%04x)\n",
newEntry->GetGroup(), newEntry->GetElement());
- dbg.Verbose(1, "Document::FindVR: ", msg.c_str());
+ gdcmVerboseMacro( msg.c_str() );
}
newEntry->SetImplicitVR();
}
}
if ( itemTagGroup != testGroup || itemTagElement != testElement )
{
- std::ostringstream s;
- s << " We should have found tag (";
- s << std::hex << testGroup << "," << testElement << ")" << std::endl;
- s << " but instead we encountered tag (";
- s << std::hex << itemTagGroup << "," << itemTagElement << ")"
- << std::endl;
- s << " at address: " << (unsigned)currentPosition << std::endl;
- dbg.Verbose(0, "Document::ReadItemTagLength: wrong Item Tag found:");
- dbg.Verbose(0, s.str().c_str());
+ gdcmVerboseMacro( "Wrong Item Tag found:"
+ << " We should have found tag ("
+ << std::hex << testGroup << "," << testElement << ")" << std::endl
+ << " but instead we encountered tag ("
+ << std::hex << itemTagGroup << "," << itemTagElement << ")"
+ << std::endl
+ << " at address: " << (unsigned int)currentPosition );
Fp->seekg(positionOnEntry, std::ios::beg);
return false;
long currentPosition = Fp->tellg();
uint32_t itemLength = ReadInt32();
{
- std::ostringstream s;
- s << "Basic Item Length is: "
- << itemLength << std::endl;
- s << " at address: " << (unsigned)currentPosition << std::endl;
- dbg.Verbose(0, "Document::ReadItemTagLength: ", s.str().c_str());
+ gdcmVerboseMacro( "Basic Item Length is: "
+ << itemLength << std::endl
+ << " at address: " << (unsigned int)currentPosition);
}
return itemLength;
}
{
uint32_t individualLength = str2num( &basicOffsetTableItemValue[i],
uint32_t);
- std::ostringstream s;
- s << " Read one length: ";
- s << std::hex << individualLength << std::endl;
- dbg.Verbose(0,
- "Document::ReadAndSkipEncapsulatedBasicOffsetTable: ",
- s.str().c_str());
+ gdcmVerboseMacro( "Read one length: " <<
+ std::hex << individualLength );
}
#endif //GDCM_DEBUG
if ( nbRleSegments > 16 )
{
// There should be at most 15 segments (refer to RLEFrame class)
- dbg.Verbose(0, "Document::ComputeRLEInfo: too many segments.");
+ gdcmVerboseMacro( "Too many segments.");
}
uint32_t rleSegmentOffsetTable[16];
// Delimiter Item':
if ( !ReadTag(0xfffe, 0xe0dd) )
{
- dbg.Verbose(0, "Document::ComputeRLEInfo: no sequence delimiter ");
- dbg.Verbose(0, " item at end of RLE item sequence");
+ gdcmVerboseMacro( "No sequence delimiter item at end of RLE item sequence");
}
}
// Delimiter Item':
if ( !ReadTag(0xfffe, 0xe0dd) )
{
- dbg.Verbose(0, "Document::ComputeRLEInfo: no sequence delimiter ");
- dbg.Verbose(0, " item at end of JPEG item sequence");
+ gdcmVerboseMacro( "No sequence delimiter item at end of JPEG item sequence");
}
}
bool Document::operator<(Document &document)
{
// Patient Name
- std::string s1 = GetEntryByNumber(0x0010,0x0010);
- std::string s2 = document.GetEntryByNumber(0x0010,0x0010);
+ std::string s1 = GetEntry(0x0010,0x0010);
+ std::string s2 = document.GetEntry(0x0010,0x0010);
if(s1 < s2)
{
return true;
else
{
// Patient ID
- s1 = GetEntryByNumber(0x0010,0x0020);
- s2 = document.GetEntryByNumber(0x0010,0x0020);
+ s1 = GetEntry(0x0010,0x0020);
+ s2 = document.GetEntry(0x0010,0x0020);
if ( s1 < s2 )
{
return true;
else
{
// Study Instance UID
- s1 = GetEntryByNumber(0x0020,0x000d);
- s2 = document.GetEntryByNumber(0x0020,0x000d);
+ s1 = GetEntry(0x0020,0x000d);
+ s2 = document.GetEntry(0x0020,0x000d);
if ( s1 < s2 )
{
return true;
else
{
// Serie Instance UID
- s1 = GetEntryByNumber(0x0020,0x000e);
- s2 = document.GetEntryByNumber(0x0020,0x000e);
+ s1 = GetEntry(0x0020,0x000e);
+ s2 = document.GetEntry(0x0020,0x000e);
if ( s1 < s2 )
{
return true;
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff