Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/11/21 16:28:06 $
- Version: $Revision: 1.331 $
+ Date: $Date: 2006/01/31 11:32:06 $
+ Version: $Revision: 1.337 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <ctype.h> // for isdigit
#include <stdlib.h> // for atoi
+#if defined(__BORLANDC__)
+ #include <mem.h> // for memset
+#endif
+
namespace gdcm
{
//-----------------------------------------------------------------------------
return DoTheLoadingDocumentJob( );
}
-/*
-//#ifndef GDCM_LEGACY_REMOVE
-bool Document::Load( std::string const &fileName )
-{
- Filename = fileName;
- return DoTheLoadingDocumentJob( );
-}
-//#endif
-*/
-
/**
* \brief Performs the Loading Job (internal use only)
* @return false if file cannot be open or no swap info was found,
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
/**
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
// Load only if we can add (not a duplicate key)
LoadDocEntry( newDataEntry );
}
-
if ( newDataEntry->GetElement() == 0x0000 ) // if on group length
{
if ( newDataEntry->GetGroup()%2 != 0 ) // if Shadow Group
if ( LoadMode & LD_NOSHADOW ) // if user asked to skip shad.gr
{
std::string strLgrGroup = newDataEntry->GetString();
+
int lgrGroup;
- if ( newDataEntry->IsUnfound() )
+ //if ( newDataEntry->IsUnfound() ) /?!? JPR
{
lgrGroup = atoi(strLgrGroup.c_str());
Fp->seekg(lgrGroup, std::ios::cur);
{ // 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
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;
}
{
realVR = "UL"; // must be UL
}
+ // Commented out in order not to generate 'Shadow Groups' where some
+ // Data Elements are Explicit VR and some other ones Implicit VR
+ // (Stupid MatLab DICOM Reader couln't read gdcm-written images)
+ /*
else if (CurrentGroup%2 == 1 &&
(CurrentElem >= 0x0010 && CurrentElem <=0x00ff ))
{
// (gggg-0010->00FF where gggg is odd) attributes have to be LO
realVR = "LO";
}
+ */
else
{
DictEntry *dictEntry = GetDictEntry(CurrentGroup,CurrentElem);
// 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) )
- {
- gdcmWarningMacro("True DICOM File, with illegal Transfer Syntax: ["
- << ts << "]");
- return;
- }
// Group 0002 is always 'Explicit ...'
// even when Transfer Syntax says 'Implicit ..."
}
// FIXME Strangely, this works with
- //'Implicit VR BigEndian Transfer Syntax (GE Private)
+ //'Implicit VR BigEndian Transfer Syntax' (GE Private)
//
// --> Probabely normal, since we considered we never have
// to trust manufacturers.
group = SwapShort(group);
elem = SwapShort(elem);
}
+
+ /// \todo find a trick to warn user and stop processing
+
+ if ( Global::GetTS()->GetSpecialTransferSyntax(ts) ==
+ TS::DeflatedExplicitVRLittleEndian)
+ {
+ gdcmWarningMacro("Transfer Syntax ["
+ << GetTransferSyntaxName() << "] :"
+ << " not yet dealt with ");
+ return;
+ }
+
+ // The following shouldn't occur very often
+ // Let's check at the very end.
+
+ if ( ts == GDCM_UNKNOWN )
+ {
+ gdcmDebugMacro("True DICOM File, with NO Transfer Syntax (?!) " );
+ return;
+ }
+
+ if ( !Global::GetTS()->IsTransferSyntax(ts) )
+ {
+ gdcmWarningMacro("True DICOM File, with illegal Transfer Syntax: ["
+ << ts << "]");
+ return;
+ }
}
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff