Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/10/27 11:55:45 $
- Version: $Revision: 1.315 $
+ Date: $Date: 2005/12/09 12:23:38 $
+ Version: $Revision: 1.333 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//-----------------------------------------------------------------------------
// Public
-
/**
* \brief Loader. use SetLoadMode(), SetFileName() before !
* @return false if file cannot be open or no swap info was found,
return false;
}
return DoTheLoadingDocumentJob( );
-}
-/**
- * \brief Loader. (DEPRECATED : not to break the API)
- * @param fileName 'Document' (File or DicomDir) to be open for parsing
- * @return false if file cannot be open or no swap info was found,
- * or no tag was found.
- */
-bool Document::Load( std::string const &fileName )
-{
- Filename = fileName;
- return DoTheLoadingDocumentJob( );
}
/**
/// In order to fix things "Quick and Dirty" the dictionary was
/// altered on PURPOSE but now contains a WRONG value.
/// In order to fix things and restore the dictionary to its
- /// correct value, one needs to decided of the semantics by deciding
+ /// correct value, one needs to decide of the semantics by deciding
/// whether the following tags are either :
/// - multivaluated US, and hence loaded as ValEntry, but afterwards
/// also used as BinEntry, which requires the proper conversion,
* @return false when we're 150 % sure it's NOT a Dicom/Acr file,
* true otherwise.
*/
-bool Document::IsReadable()
+bool Document::IsParsable()
{
if ( Filetype == Unknown )
{
- gdcmErrorMacro( "Wrong filetype");
+ gdcmWarningMacro( "Wrong filetype for " << GetFileName());
return false;
}
if ( IsEmpty() )
{
- gdcmErrorMacro( "No tag in internal hash table.");
+ gdcmWarningMacro( "No tag in internal hash table.");
return false;
}
return true;
}
+/**
+ * \brief This predicate tells us whether or not the current Document
+ * was properly parsed and contains at least *one* Dicom Element
+ * (and nothing more, sorry).
+ * @return false when we're 150 % sure it's NOT a Dicom/Acr file,
+ * true otherwise.
+ */
+bool Document::IsReadable()
+{
+ return IsParsable();
+}
/**
* \brief Predicate for dicom version 3 file.
return a;
}
-
//
// -----------------File I/O ---------------
/**
return 0;
}
- //-- ACR or DICOM with no Preamble; may start with a Shadow Group --
+ //-- Broken ACR or DICOM with no Preamble; may start with a Shadow Group --
+
+ // FIXME : We cannot be sure the preable is only zeroes..
+ // (see ACUSON-24-YBR_FULL-RLE.dcm )
if (
zero == 0x0001 || zero == 0x0100 || zero == 0x0002 || zero == 0x0200 ||
zero == 0x0003 || zero == 0x0300 || zero == 0x0004 || zero == 0x0400 ||
DocEntry *docEntry = GetDocEntry(group, elem);
if ( !docEntry )
{
- gdcmWarningMacro(std::hex << group << "|" << elem
- << "doesn't exist" );
+ gdcmDebugMacro(std::hex << group << "|" << elem
+ << " doesn't exist" );
return;
}
DataEntry *dataEntry = dynamic_cast<DataEntry *>(docEntry);
if ( !dataEntry )
{
gdcmWarningMacro(std::hex << group << "|" << elem
- << "is NOT a DataEntry");
+ << " is NOT a DataEntry");
return;
}
LoadEntryBinArea(dataEntry);
uint32_t i;
unsigned short vrLgth =
Global::GetVR()->GetAtomicElementLength(entry->GetVR());
- if( entry->GetVR() == "OW" )
- vrLgth = 1;
+
+// FIXME : trouble expected if we read an ... OW Entry (LUT, etc ..)
+// if( entry->GetVR() == "OW" )
+// vrLgth = 1;
switch(vrLgth)
{
+ case 1:
+ {
+ break;
+ }
case 2:
{
uint16_t *data16 = (uint16_t *)data;
/**
* \brief skips bytes inside the source file
- * \warning NOT end user intended method !
* @return
*/
void Document::SkipBytes(uint32_t nBytes)
}
/**
- * \brief Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader
+ * \brief Re-computes the length of the Dicom group 0002.
*/
int Document::ComputeGroup0002Length( )
{
{
vr = entry->GetVR();
- // FIXME : group 0x0002 is *always* Explicit VR!
- // --> Except for Implicit VR Transfer Syntax (GE Private) !!
-
- //if ( filetype == ExplicitVR )
- //{
//if ( (vr == "OB")||(vr == "OW")||(vr == "UT")||(vr == "SQ"))
// (no SQ, OW, UT in group 0x0002;)
if ( vr == "OB" )
// explicit VR AND (OB, OW, SQ, UT) : 4 more bytes
groupLength += 4;
}
- //}
+
groupLength += 2 + 2 + 4 + entry->GetLength();
}
}
return groupLength;
}
+/**
+ * \brief CallStartMethod
+ */
+void Document::CallStartMethod()
+{
+ Progress = 0.0f;
+ Abort = false;
+ CommandManager::ExecuteCommand(this,CMD_STARTPROGRESS);
+}
+
+/**
+ * \brief CallProgressMethod
+ */
+void Document::CallProgressMethod()
+{
+ CommandManager::ExecuteCommand(this,CMD_PROGRESS);
+}
+
+/**
+ * \brief CallEndMethod
+ */
+void Document::CallEndMethod()
+{
+ Progress = 1.0f;
+ CommandManager::ExecuteCommand(this,CMD_ENDPROGRESS);
+}
+
//-----------------------------------------------------------------------------
// Private
/**
* \brief Loads all the needed Dictionaries
- * \warning NOT end user intended method !
*/
void Document::Initialize()
{
bool delim_mode_intern = delim_mode;
bool first = true;
gdcmDebugMacro( "Enter in ParseDES, delim-mode " << delim_mode
- << " at offset " << std::hex << offset );
+ << " at offset " << std::hex << "0x(" << offset << ")" );
while (true)
{
if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
{
gdcmDebugMacro( "in ParseDES : cannot add a DataEntry "
<< newDataEntry->GetKey()
- << " (at offset : "
- << newDataEntry->GetOffset() << " )" );
+ << " (at offset : 0x("
+ << newDataEntry->GetOffset() << ") )" );
used=false;
}
else
{ // Don't try to parse zero-length sequences
gdcmDebugMacro( "Entry in ParseSQ, delim " << delim_mode_intern
- << " at offset " << std::hex
- << newDocEntry->GetOffset() );
+ << " at offset 0x(" << std::hex
+ << newDocEntry->GetOffset() << ")");
ParseSQ( newSeqEntry,
newDocEntry->GetOffset(),
{
gdcmWarningMacro( "in ParseDES : cannot add a SeqEntry "
<< newSeqEntry->GetKey()
- << " (at offset : "
- << newSeqEntry->GetOffset() << " )" );
+ << " (at offset : 0x("
+ << newSeqEntry->GetOffset() << ") )" );
used = false;
}
else
long offset = PreviousDocEntry->GetOffset();
gdcmDebugMacro( "Backtrack :" << std::hex << group
- << "|" << elem
- << " at offset " << offset );
+ << "|" << elem
+ << " at offset 0x(" <<offset << ")" );
RemoveEntry( PreviousDocEntry );
// forge the Seq Entry
/**
* \brief Find the Length till the next sequence delimiter
- * \warning NOT end user intended method !
* @return
*/
uint32_t Document::FindDocEntryLengthOBOrOW()
// we used a heuristic that found "UL" in the first tag and/or
// 'Transfer Syntax' told us it is.
// Alas this doesn't guarantee that all the tags will be in explicit VR.
- // In some cases one finds implicit VR tags mixed within an explicit VR file
+ // In some cases one finds implicit VR tags mixed within an explicit VR file.
// Hence we make sure the present tag is in explicit VR and try to fix things
// if it happens not to be the case.
if ( !CheckDocEntryVR(vr) )
{
- gdcmWarningMacro( "Unknown VR " << std::hex << "0x("
+ // Don't warn user with useless messages
+ // Often, delimiters (0xfffe), are not explicit VR ...
+ if ( CurrentGroup != 0xfffe )
+ gdcmWarningMacro( "Unknown VR " << std::hex << "0x("
<< (unsigned int)vr[0] << "|" << (unsigned int)vr[1]
- << ") at offset :" << positionOnEntry );
+ << ") at offset : 0x(" << positionOnEntry<< ")" );
Fp->seekg(positionOnEntry, std::ios::beg);
return GDCM_VRUNKNOWN;
}
/**
* \brief Skip a given Header Entry
- * \warning NOT end user intended method !
* @param entry entry to skip
*/
void Document::SkipDocEntry(DocEntry *entry)
/**
* \brief Skips to the beginning of the next Header Entry
- * \warning NOT end user intended method !
* @param currentDocEntry entry to skip
*/
void Document::SkipToNextDocEntry(DocEntry *currentDocEntry)
if ( net2host )
{
SwapCode = 4321;
- gdcmDebugMacro( "HostByteOrder != NetworkByteOrder");
+ gdcmDebugMacro( "HostByteOrder != NetworkByteOrder, SwapCode = 4321");
}
else
{
SwapCode = 1234;
- gdcmDebugMacro( "HostByteOrder = NetworkByteOrder");
+ gdcmDebugMacro( "HostByteOrder = NetworkByteOrder, SwapCode = 1234");
}
// Position the file position indicator at first tag
*/
DocEntry *Document::ReadNextDocEntry()
{
- uint16_t group;
- uint16_t elem;
-
try
{
- group = ReadInt16();
- elem = ReadInt16();
+ CurrentGroup = ReadInt16();
+ CurrentElem = ReadInt16();
}
catch ( FormatError )
{
}
// Sometimes file contains groups of tags with reversed endianess.
- HandleBrokenEndian(group, elem);
+ HandleBrokenEndian(CurrentGroup, CurrentElem);
// In 'true DICOM' files Group 0002 is always little endian
if ( HasDCMPreamble )
- HandleOutOfGroup0002(group, elem);
+ HandleOutOfGroup0002(CurrentGroup, CurrentElem);
VRKey vr = FindDocEntryVR();
if ( vr == GDCM_VRUNKNOWN )
{
- if ( elem == 0x0000 ) // Group Length
+ if ( CurrentElem == 0x0000 ) // Group Length
{
realVR = "UL"; // must be UL
}
- else if (group%2 == 1 && (elem >= 0x0010 && elem <=0x00ff ))
+ else if (CurrentGroup%2 == 1 &&
+ (CurrentElem >= 0x0010 && CurrentElem <=0x00ff ))
{
// DICOM PS 3-5 7.8.1 a) states that those
// (gggg-0010->00FF where gggg is odd) attributes have to be LO
}
else
{
- DictEntry *dictEntry = GetDictEntry(group,elem);
+ DictEntry *dictEntry = GetDictEntry(CurrentGroup,CurrentElem);
if ( dictEntry )
{
realVR = dictEntry->GetVR();
DocEntry *newEntry;
if ( Global::GetVR()->IsVROfSequence(realVR) )
- newEntry = NewSeqEntry(group, elem);
+ newEntry = NewSeqEntry(CurrentGroup, CurrentElem);
else
{
- newEntry = NewDataEntry(group, elem, realVR);
+ newEntry = NewDataEntry(CurrentGroup, CurrentElem, realVR);
static_cast<DataEntry *>(newEntry)->SetState(DataEntry::STATE_NOTLOADED);
}
if ((group == 0xfeff) && (elem == 0x00e0))
{
// start endian swap mark for group found
+ gdcmDebugMacro( "Start endian swap mark found." );
reversedEndian++;
SwitchByteSwapCode();
// fix the tag
else if (group == 0xfffe && elem == 0xe00d && reversedEndian)
{
// end of reversed endian group
+ gdcmDebugMacro( "End of reversed endian." );
reversedEndian--;
SwitchByteSwapCode();
}
{
Group0002Parsed = true;
// we just came out of group 0002
- // if Transfer syntax is Big Endian we have to change CheckSwap
+ // if Transfer Syntax is Big Endian we have to change CheckSwap
std::string ts = GetTransferSyntax();
+ if ( ts == GDCM_UNKNOWN )
+ {
+ gdcmDebugMacro("True DICOM File, with NO Transfer Syntax (?!) " );
+ return;
+ }
if ( !Global::GetTS()->IsTransferSyntax(ts) )
{
- gdcmDebugMacro("True DICOM File, with NO Tansfer Syntax: " << ts );
+ gdcmWarningMacro("True DICOM File, with illegal Transfer Syntax: ["
+ << ts << "]");
return;
}
if ( Global::GetTS()->GetSpecialTransferSyntax(ts) ==
TS::ImplicitVRLittleEndian )
- {
- Filetype = ImplicitVR;
- }
+ {
+ Filetype = ImplicitVR;
+ }
// FIXME Strangely, this works with
//'Implicit VR BigEndian Transfer Syntax (GE Private)