Program: gdcm
Module: $RCSfile: gdcmDocument.h,v $
Language: C++
- Date: $Date: 2007/08/22 16:14:04 $
- Version: $Revision: 1.146 $
+ Date: $Date: 2008/01/04 13:32:01 $
+ Version: $Revision: 1.151 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
std::string GetTransferSyntaxName();
// Swap code
- /// 'Swap code' accessor (see \ref SwapCode )
+ /// 'Swap code' accessor (see SwapCode )
int GetSwapCode() { return SwapCode; }
// File I/O
- /// Accessor to \ref Filename
+ /// Accessor to Filename
const std::string &GetFileName() const { return Filename; }
- /// Accessor to \ref Filename
+ /// Accessor to Filename
virtual void SetFileName(std::string const &fileName)
{ if (Filename != fileName)
Filename = fileName, IsDocumentModified = true; }
std::ifstream *OpenFile();
bool CloseFile();
- void WriteContent( std::ofstream *fp, FileType type );
+ void WriteContent( std::ofstream *fp, FileType type, bool insideMetaElements, bool insideSequence );
// Data entries
virtual void LoadEntryBinArea(uint16_t group, uint16_t elem);
void SetMaxSizeLoadEntry(long);
void AddForceLoadElement(uint16_t group, uint16_t elem);
-
+
// Ordering of Documents
bool operator<(Document &document);
/**
- * \brief Sets the LoadMode as a boolean string.
+ * \brief Sets the LoadMode as a boolean string.
* LD_NOSEQ, LD_NOSHADOW, LD_NOSHADOWSEQ
... (nothing more, right now)
* WARNING : before using NO_SHADOW, be sure *all* your files
- * contain accurate values in the 0x0000 element (if any)
+ * contain accurate values in the 0x0000 element (if any)
* of *each* Shadow Group. The parser will fail if the size is wrong !
- * @param mode Load mode to be used
+ * @param mode Load mode to be used
*/
- void SetLoadMode (int mode) { if (LoadMode != mode)
+ void SetLoadMode (int mode) { if (LoadMode != mode)
LoadMode=mode, IsDocumentModified = true; }
protected:
// Methods
- // Constructor and destructor are protected to forbid end user
+ // Constructor and destructor are protected to forbid end user
// to instanciate from this class Document (only gdcm::File and
// gdcm::DicomDir are meaningfull).
Document();
uint16_t ReadInt16() throw ( FormatError );
uint32_t ReadInt32() throw ( FormatError );
-
+
/// \brief skips bytes inside the source file
- void SkipBytes(uint32_t nBytes) { Fp->seekg((long)nBytes, std::ios::cur);}
+ void SkipBytes(uint32_t nBytes) { Fp->seekg((long)nBytes, std::ios::cur);}
int ComputeGroup0002Length( );
// Variables
uint32_t UnswapLong(uint32_t a) { return SwapLong(a);}
// Read
- void ParseDES(DocEntrySet *set, long offset, long l_max, bool delim_mode);
+ bool ParseDES(DocEntrySet *set, long offset, long l_max, bool delim_mode);
bool ParseSQ (SeqEntry *seq, long offset, long l_max, bool delim_mode);
void LoadDocEntry (DocEntry *e, bool forceLoad = false);
DocEntry *ReadNextDocEntry();
uint16_t GetInt16();
uint32_t GetInt32();
-
+
void HandleBrokenEndian (uint16_t &group, uint16_t &elem);
void HandleOutOfGroup0002(uint16_t &group, uint16_t &elem);
- DocEntry *Backtrack(DocEntry *docEntry);
-
-
-// Variables
+ DocEntry *Backtrack(DocEntry *docEntry, DocEntrySet *set);
+ DataEntry *BacktrackSQtoOB(SeqEntry *docEntry, DocEntrySet *set);
protected:
/// value of the ??? for any progress bar
float Progress;
bool changeFromUN;
/// \brief whether an unexpected EOF was encountered
bool UnexpectedEOF;
+ /// \brief to avoid infinite loop when illegal UN stands for OB
+ size_t OffsetOfPreviousParseDES;
};
} // end namespace gdcm