Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2004/06/28 16:07:21 $
- Version: $Revision: 1.41 $
+ Date: $Date: 2004/11/15 16:12:30 $
+ Version: $Revision: 1.123 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
- http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
#include "gdcmValEntry.h"
#include "gdcmBinEntry.h"
#include "gdcmSeqEntry.h"
-
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
#include "gdcmDebug.h"
-#include <errno.h>
#include <vector>
+#include <iomanip>
// For nthos:
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)
#include <winsock.h>
#else
#include <netinet/in.h>
#endif
-# include <iomanip>
-
-// Implicit VR Little Endian
-#define UI1_2_840_10008_1_2 "1.2.840.10008.1.2"
-// Explicit VR Little Endian
-#define UI1_2_840_10008_1_2_1 "1.2.840.10008.1.2.1"
-// Deflated Explicit VR Little Endian
-#define UI1_2_840_10008_1_2_1_99 "1.2.840.10008.1.2.1.99"
-// Explicit VR Big Endian
-#define UI1_2_840_10008_1_2_2 "1.2.840.10008.1.2.2"
-// JPEG Baseline (Process 1)
-#define UI1_2_840_10008_1_2_4_50 "1.2.840.10008.1.2.4.50"
-// JPEG Extended (Process 2 & 4)
-#define UI1_2_840_10008_1_2_4_51 "1.2.840.10008.1.2.4.51"
-// JPEG Extended (Process 3 & 5)
-#define UI1_2_840_10008_1_2_4_52 "1.2.840.10008.1.2.4.52"
-// JPEG Spectral Selection, Non-Hierarchical (Process 6 & 8)
-#define UI1_2_840_10008_1_2_4_53 "1.2.840.10008.1.2.4.53"
-// JPEG Full Progression, Non-Hierarchical (Process 10 & 12)
-#define UI1_2_840_10008_1_2_4_55 "1.2.840.10008.1.2.4.55"
-// JPEG Lossless, Non-Hierarchical (Process 14)
-#define UI1_2_840_10008_1_2_4_57 "1.2.840.10008.1.2.4.57"
-// JPEG Lossless, Hierarchical, First-Order Prediction (Process 14,
-// [Selection Value 1])
-#define UI1_2_840_10008_1_2_4_70 "1.2.840.10008.1.2.4.70"
-// JPEG 2000 Lossless
-#define UI1_2_840_10008_1_2_4_90 "1.2.840.10008.1.2.4.90"
-// JPEG 2000
-#define UI1_2_840_10008_1_2_4_91 "1.2.840.10008.1.2.4.91"
-// RLE Lossless
-#define UI1_2_840_10008_1_2_5 "1.2.840.10008.1.2.5"
-// UI1_1_2_840_10008_1_2_5
-#define str2num(str, typeNum) *((typeNum *)(str))
+namespace gdcm
+{
+static const char *TransferSyntaxStrings[] = {
+ // Implicit VR Little Endian
+ "1.2.840.10008.1.2",
+ // Explicit VR Little Endian
+ "1.2.840.10008.1.2.1",
+ // Deflated Explicit VR Little Endian
+ "1.2.840.10008.1.2.1.99",
+ // Explicit VR Big Endian
+ "1.2.840.10008.1.2.2",
+ // JPEG Baseline (Process 1)
+ "1.2.840.10008.1.2.4.50",
+ // JPEG Extended (Process 2 & 4)
+ "1.2.840.10008.1.2.4.51",
+ // JPEG Extended (Process 3 & 5)
+ "1.2.840.10008.1.2.4.52",
+ // JPEG Spectral Selection, Non-Hierarchical (Process 6 & 8)
+ "1.2.840.10008.1.2.4.53",
+ // JPEG Full Progression, Non-Hierarchical (Process 10 & 12)
+ "1.2.840.10008.1.2.4.55",
+ // JPEG Lossless, Non-Hierarchical (Process 14)
+ "1.2.840.10008.1.2.4.57",
+ // JPEG Lossless, Hierarchical, First-Order Prediction (Process 14, [Selection Value 1])
+ "1.2.840.10008.1.2.4.70",
+ // JPEG 2000 Lossless
+ "1.2.840.10008.1.2.4.90",
+ // JPEG 2000
+ "1.2.840.10008.1.2.4.91",
+ // RLE Lossless
+ "1.2.840.10008.1.2.5",
+ // Unknown
+ "Unknown Transfer Syntax"
+};
//-----------------------------------------------------------------------------
-// Refer to gdcmDocument::CheckSwap()
-const unsigned int gdcmDocument::HEADER_LENGTH_TO_READ = 256;
+// Refer to Document::CheckSwap()
+const unsigned int Document::HEADER_LENGTH_TO_READ = 256;
-// Refer to gdcmDocument::SetMaxSizeLoadEntry()
-const unsigned int gdcmDocument::MAX_SIZE_LOAD_ELEMENT_VALUE = 0x7fffffff;// 4096;//
-const unsigned int gdcmDocument::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff;//64;
+// Refer to Document::SetMaxSizeLoadEntry()
+const unsigned int Document::MAX_SIZE_LOAD_ELEMENT_VALUE = 0xfff; // 4096
+const unsigned int Document::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff;
//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
* \brief constructor
- * @param inFilename file to be opened for parsing
- * @param exception_on_error whether we throw an exception or not
- * @param enable_sequences = true to allow the header
- * to be parsed *inside* the SeQuences,
- * when they have an actual length
- * \warning enable_sequences *has to be* true for reading PAPYRUS 3.0 files
- * @param ignore_shadow to allow skipping the shadow elements,
- * to save memory space.
- * \warning The TRUE value for this param has to be used
- * with a FALSE value for the 'enable_sequence' param.
- * ('public elements' may be embedded in 'shadow Sequences')
- */
-gdcmDocument::gdcmDocument(std::string const & inFilename,
- bool exception_on_error,
- bool enable_sequences,
- bool ignore_shadow)
- : gdcmElementSet(-1) {
- IgnoreShadow =ignore_shadow;
- //enableSequences=enable_sequences;
- (void)enable_sequences;
- enableSequences=true; // JPR // TODO : remove params out of the constructor
+ * @param filename file to be opened for parsing
+ */
+Document::Document( std::string const & filename ) : ElementSet(-1)
+{
SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE);
- Filename = inFilename;
+ Filename = filename;
Initialise();
- if ( !OpenFile(exception_on_error))
+ Fp = 0;
+ if ( !OpenFile() )
+ {
return;
-
- dbg.Verbose(0, "gdcmDocument::gdcmDocument: starting parsing of file: ",
+ }
+
+ dbg.Verbose(0, "Document::Document: starting parsing of file: ",
Filename.c_str());
- rewind(fp);
+ Fp->seekg( 0, std::ios_base::beg);
- fseek(fp,0L,SEEK_END);
- long lgt = ftell(fp);
+ Fp->seekg(0, std::ios_base::end);
+ long lgt = Fp->tellg();
- rewind(fp);
+ Fp->seekg( 0, std::ios_base::beg);
CheckSwap();
- long beg = ftell(fp);
+ long beg = Fp->tellg();
lgt -= beg;
- SQDepthLevel=0;
-
- long l=ParseDES( this, beg, lgt, false); // le Load sera fait a la volee
- (void)l; //is l used anywhere ?
+ ParseDES( this, beg, lgt, false); // le Load sera fait a la volee
- rewind(fp);
+ Fp->seekg( 0, std::ios_base::beg);
// Load 'non string' values
std::string PhotometricInterpretation = GetEntryByNumber(0x0028,0x0004);
- if( PhotometricInterpretation == "PALETTE COLOR " ) {
- LoadEntryVoidArea(0x0028,0x1200); // gray LUT
- LoadEntryVoidArea(0x0028,0x1201); // R LUT
- LoadEntryVoidArea(0x0028,0x1202); // G LUT
- LoadEntryVoidArea(0x0028,0x1203); // B LUT
+ if( PhotometricInterpretation == "PALETTE COLOR " )
+ {
+ LoadEntryBinArea(0x0028,0x1200); // gray LUT
+ /// FIXME FIXME FIXME
+ /// The tags refered by the three following lines used to be CORRECTLY
+ /// defined as having an US Value Representation in the public
+ /// dictionnary. BUT the semantics implied by the three following
+ /// lines state that the corresponding tag contents are in fact
+ /// the ones of a BinEntry.
+ /// In order to fix things "Quick and Dirty" the dictionnary was
+ /// altered on PURPOUS 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
+ /// wether the following tags are either:
+ /// - multivaluated US, and hence loaded as ValEntry, but afterwards
+ /// also used as BinEntry, which requires the proper conversion,
+ /// - OW, and hence loaded as BinEntry, but afterwards also used
+ /// as ValEntry, which requires the proper conversion.
+ LoadEntryBinArea(0x0028,0x1201); // R LUT
+ LoadEntryBinArea(0x0028,0x1202); // G LUT
+ LoadEntryBinArea(0x0028,0x1203); // B LUT
- LoadEntryVoidArea(0x0028,0x1221); // Segmented Red Palette Color LUT Data
- LoadEntryVoidArea(0x0028,0x1222); // Segmented Green Palette Color LUT Data
- LoadEntryVoidArea(0x0028,0x1223); // Segmented Blue Palette Color LUT Data
+ // Segmented Red Palette Color LUT Data
+ LoadEntryBinArea(0x0028,0x1221);
+ // Segmented Green Palette Color LUT Data
+ LoadEntryBinArea(0x0028,0x1222);
+ // Segmented Blue Palette Color LUT Data
+ LoadEntryBinArea(0x0028,0x1223);
}
//FIXME later : how to use it?
- LoadEntryVoidArea(0x0028,0x3006); //LUT Data (CTX dependent)
+ LoadEntryBinArea(0x0028,0x3006); //LUT Data (CTX dependent)
CloseFile();
// --------------------------------------------------------------
- // Special Patch to allow gdcm to read ACR-LibIDO formated images
+ // Specific code to allow gdcm to read ACR-LibIDO formated images
+ // Note: ACR-LibIDO is an extension of the ACR standard that was
+ // used at CREATIS. For the time being (say a couple years)
+ // we keep this kludge to allow a smooth move to gdcm for
+ // CREATIS developpers (sorry folks).
//
// if recognition code tells us we deal with a LibIDO image
// we switch lineNumber and columnNumber
RecCode == "CANRME_AILIBOD1_1." ) // for brain-damaged softwares
// with "little-endian strings"
{
- Filetype = gdcmACR_LIBIDO;
+ Filetype = ACR_LIBIDO;
std::string rows = GetEntryByNumber(0x0028, 0x0010);
std::string columns = GetEntryByNumber(0x0028, 0x0011);
SetEntryByNumber(columns, 0x0028, 0x0010);
SetEntryByNumber(rows , 0x0028, 0x0011);
}
- // ----------------- End of Special Patch ----------------
+ // ----------------- End of ACR-LibIDO kludge ------------------
- printLevel = 1; // 'Medium' print level by default
+ PrintLevel = 1; // 'Medium' print level by default
}
/**
- * \brief constructor
- * @param exception_on_error
+ * \brief This default constructor doesn't parse the file. You should
+ * then invoke \ref Document::SetFileName and then the parsing.
*/
-gdcmDocument::gdcmDocument(bool exception_on_error)
- :gdcmElementSet(-1) {
- (void)exception_on_error;
- //enableSequences=0; // ?!? JPR
+Document::Document() : ElementSet(-1)
+{
+ Fp = 0;
SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE);
Initialise();
-
- printLevel = 1; // 'Medium' print level by default
+ SwapCode = 0;
+ Filetype = ExplicitVR;
+ PrintLevel = 1; // 'Medium' print level by default
}
/**
* \brief Canonical destructor.
*/
-gdcmDocument::~gdcmDocument (void) {
+Document::~Document ()
+{
RefPubDict = NULL;
RefShaDict = NULL;
// Recursive clean up of sequences
- for (TagDocEntryHT::iterator it = tagHT.begin(); it != tagHT.end(); ++it )
+ for (TagDocEntryHT::const_iterator it = TagHT.begin();
+ it != TagHT.end(); ++it )
{
- delete it->second;
+ //delete it->second; //temp remove
}
- tagHT.clear();
+ TagHT.clear();
+ delete RLEInfo;
+ delete JPEGInfo;
}
//-----------------------------------------------------------------------------
* \brief Prints The Dict Entries of THE public Dicom Dictionary
* @return
*/
-void gdcmDocument::PrintPubDict(std::ostream & os) {
+void Document::PrintPubDict(std::ostream & os)
+{
RefPubDict->Print(os);
}
* \brief Prints The Dict Entries of THE shadow Dicom Dictionary
* @return
*/
-void gdcmDocument::PrintShaDict(std::ostream & os) {
+void Document::PrintShaDict(std::ostream & os)
+{
RefShaDict->Print(os);
}
/**
* \brief Get the public dictionary used
*/
-gdcmDict *gdcmDocument::GetPubDict(void) {
+Dict* Document::GetPubDict()
+{
return RefPubDict;
}
/**
* \brief Get the shadow dictionary used
*/
-gdcmDict *gdcmDocument::GetShaDict(void) {
+Dict* Document::GetShaDict()
+{
return RefShaDict;
}
* \brief Set the shadow dictionary used
* \param dict dictionary to use in shadow
*/
-bool gdcmDocument::SetShaDict(gdcmDict *dict){
- RefShaDict=dict;
+bool Document::SetShaDict(Dict *dict)
+{
+ RefShaDict = dict;
return !RefShaDict;
}
* \brief Set the shadow dictionary used
* \param dictName name of the dictionary to use in shadow
*/
-bool gdcmDocument::SetShaDict(DictKey dictName){
- RefShaDict=gdcmGlobal::GetDicts()->GetDict(dictName);
+bool Document::SetShaDict(DictKey const & dictName)
+{
+ RefShaDict = Global::GetDicts()->GetDict(dictName);
return !RefShaDict;
}
/**
* \brief This predicate, based on hopefully reasonable heuristics,
- * decides whether or not the current gdcmDocument was properly parsed
+ * decides whether or not the current Document was properly parsed
* and contains the mandatory information for being considered as
* a well formed and usable Dicom/Acr File.
- * @return true when gdcmDocument is the one of a reasonable Dicom/Acr file,
+ * @return true when Document is the one of a reasonable Dicom/Acr file,
* false otherwise.
*/
-bool gdcmDocument::IsReadable(void) {
-
- if(Filetype==gdcmUnknown) {
- std::cout << " gdcmDocument::IsReadable: Filetype " << Filetype
- << " " << "gdcmUnknown " << gdcmUnknown << std::endl; //JPR
- dbg.Verbose(0, "gdcmDocument::IsReadable: wrong filetype");
+bool Document::IsReadable()
+{
+ if( Filetype == Unknown)
+ {
+ dbg.Verbose(0, "Document::IsReadable: wrong filetype");
return false;
}
- if(tagHT.empty()) {
- dbg.Verbose(0, "gdcmDocument::IsReadable: no tags in internal"
+ if( TagHT.empty() )
+ {
+ dbg.Verbose(0, "Document::IsReadable: no tags in internal"
" hash table.");
return false;
}
- return(true);
+ return true;
}
/**
* \brief Internal function that checks whether the Transfer Syntax given
* as argument is the one present in the current document.
- * @param SyntaxToCheck The transfert syntax we need to check against.
+ * @param syntaxToCheck The transfert syntax we need to check against.
* @return True when SyntaxToCheck corresponds to the Transfer Syntax of
* the current document. False either when the document contains
- * no Transfer Syntax, or when the Tranfer Syntaxes don't match.
+ * no Transfer Syntax, or when the Tranfer Syntaxes doesn't match.
*/
-bool gdcmDocument::IsGivenTransferSyntax(const std::string & SyntaxToCheck)
+TransferSyntaxType Document::GetTransferSyntax()
{
- gdcmDocEntry *Entry = GetDocEntryByNumber(0x0002, 0x0010);
- if ( !Entry )
- return false;
+ DocEntry *entry = GetDocEntryByNumber(0x0002, 0x0010);
+ if ( !entry )
+ {
+ return UnknownTS;
+ }
// The entry might be present but not loaded (parsing and loading
- // happen at differente stages): try loading and proceed with check...
- LoadDocEntrySafe(Entry);
- if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(Entry) )
+ // happen at different stages): try loading and proceed with check...
+ LoadDocEntrySafe(entry);
+ if (ValEntry* valEntry = dynamic_cast< ValEntry* >(entry) )
{
- std::string Transfer = ValEntry->GetValue();
+ std::string transfer = valEntry->GetValue();
// The actual transfer (as read from disk) might be padded. We
// first need to remove the potential padding. We can make the
// weak assumption that padding was not executed with digits...
- while ( ! isdigit(Transfer[Transfer.length()-1]) )
+ if ( transfer.length() == 0 )
{
- Transfer.erase(Transfer.length()-1, 1);
+ // for brain damaged headers
+ return UnknownTS;
+ }
+ while ( !isdigit(transfer[transfer.length()-1]) )
+ {
+ transfer.erase(transfer.length()-1, 1);
+ }
+ for (int i = 0; TransferSyntaxStrings[i] != NULL; i++)
+ {
+ if ( TransferSyntaxStrings[i] == transfer )
+ {
+ return TransferSyntaxType(i);
+ }
}
- if ( Transfer == SyntaxToCheck )
- return true;
}
- return false;
-}
-
-/**
- * \brief Determines if the Transfer Syntax of the present document
- * corresponds to a Implicit Value Representation of
- * Little Endian.
- * \sa \ref gdcmDocument::IsGivenTransferSyntax.
- * @return True when ImplicitVRLittleEndian found. False in all other cases.
- */
-bool gdcmDocument::IsImplicitVRLittleEndianTransferSyntax(void)
-{
- return IsGivenTransferSyntax(UI1_2_840_10008_1_2);
-}
-
-/**
- * \brief Determines if the Transfer Syntax was already encountered
- * and if it corresponds to a ExplicitVRLittleEndian one.
- * @return True when ExplicitVRLittleEndian found. False in all other cases.
- */
-bool gdcmDocument::IsExplicitVRLittleEndianTransferSyntax(void)
-{
- return IsGivenTransferSyntax(UI1_2_840_10008_1_2_1);
+ return UnknownTS;
}
-/**
- * \brief Determines if the Transfer Syntax was already encountered
- * and if it corresponds to a DeflatedExplicitVRLittleEndian one.
- * @return True when DeflatedExplicitVRLittleEndian found. False in all other cases.
- */
-bool gdcmDocument::IsDeflatedExplicitVRLittleEndianTransferSyntax(void)
-{
- return IsGivenTransferSyntax(UI1_2_840_10008_1_2_1_99);
-}
-
-/**
- * \brief Determines if the Transfer Syntax was already encountered
- * and if it corresponds to a Explicit VR Big Endian one.
- * @return True when big endian found. False in all other cases.
- */
-bool gdcmDocument::IsExplicitVRBigEndianTransferSyntax(void)
+bool Document::IsJPEGLossless()
{
- return IsGivenTransferSyntax(UI1_2_840_10008_1_2_2);
-}
-
-/**
- * \brief Determines if the Transfer Syntax was already encountered
- * and if it corresponds to a JPEGBaseLineProcess1 one.
- * @return True when JPEGBaseLineProcess1found. False in all other cases.
- */
-bool gdcmDocument::IsJPEGBaseLineProcess1TransferSyntax(void)
-{
- return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_50);
+ TransferSyntaxType r = GetTransferSyntax();
+ return r == JPEGFullProgressionProcess10_12
+ || r == JPEGLosslessProcess14
+ || r == JPEGLosslessProcess14_1;
}
/**
* \brief Determines if the Transfer Syntax was already encountered
- * and if it corresponds to a JPEGExtendedProcess2-4 one.
- * @return True when JPEGExtendedProcess2-4 found. False in all other cases.
- */
-bool gdcmDocument::IsJPEGExtendedProcess2_4TransferSyntax(void)
-{
- return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_51);
-}
-
-/**
- * \brief Determines if the Transfer Syntax was already encountered
- * and if it corresponds to a JPEGExtendeProcess3-5 one.
- * @return True when JPEGExtendedProcess3-5 found. False in all other cases.
- */
-bool gdcmDocument::IsJPEGExtendedProcess3_5TransferSyntax(void)
-{
- return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_52);
-}
-
-/**
- * \brief Determines if the Transfer Syntax was already encountered
- * and if it corresponds to a JPEGSpectralSelectionProcess6-8 one.
- * @return True when JPEGSpectralSelectionProcess6-8 found. False in all
+ * and if it corresponds to a JPEG2000 one
+ * @return True when JPEG2000 (Lossly or LossLess) found. False in all
* other cases.
*/
-bool gdcmDocument::IsJPEGSpectralSelectionProcess6_8TransferSyntax(void)
+bool Document::IsJPEG2000()
{
- return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_53);
+ TransferSyntaxType r = GetTransferSyntax();
+ return r == JPEG2000Lossless || r == JPEG2000;
}
/**
- * \brief Determines if the Transfer Syntax was already encountered
- * and if it corresponds to a RLE Lossless one.
- * @return True when RLE Lossless found. False in all
- * other cases.
+ * \brief Determines if the Transfer Syntax corresponds to any form
+ * of Jpeg encoded Pixel data.
+ * @return True when any form of JPEG found. False otherwise.
*/
-bool gdcmDocument::IsRLELossLessTransferSyntax(void)
+bool Document::IsJPEG()
{
- return IsGivenTransferSyntax(UI1_2_840_10008_1_2_5);
+ TransferSyntaxType r = GetTransferSyntax();
+ return r == JPEGBaselineProcess1
+ || r == JPEGExtendedProcess2_4
+ || r == JPEGExtendedProcess3_5
+ || r == JPEGSpectralSelectionProcess6_8
+ || IsJPEGLossless()
+ || IsJPEG2000();
}
/**
- * \brief Determines if Transfer Syntax was already encountered
- * and if it corresponds to a JPEG Lossless one.
- * @return True when RLE Lossless found. False in all
- * other cases.
+ * \brief Determines if the Transfer Syntax corresponds to encapsulated
+ * of encoded Pixel Data (as opposed to native).
+ * @return True when encapsulated. False when native.
*/
-
-bool gdcmDocument::IsJPEGLossless(void)
+bool Document::IsEncapsulate()
{
- return ( IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_55)
- || IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_57)
- || IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_70) );
-}
-
-/**
- * \brief Determines if the Transfer Syntax was already encountered
- * and if it corresponds to a JPEG2000 one
- * @return True when JPEG2000 (Lossly or LossLess) found. False in all
- * other cases.
- */
-bool gdcmDocument::IsJPEG2000(void)
-{
- return ( IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_90)
- || IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_91) );
+ TransferSyntaxType r = GetTransferSyntax();
+ return IsJPEG() || r == RLELossless;
}
/**
* \brief Predicate for dicom version 3 file.
* @return True when the file is a dicom version 3.
*/
-bool gdcmDocument::IsDicomV3(void) {
+bool Document::IsDicomV3()
+{
// Checking if Transfert Syntax exists is enough
// 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 GetDocEntryByNumber(0x0002, 0x0010) != NULL;
}
/**
* (ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown)
* @return the FileType code
*/
-FileType gdcmDocument::GetFileType(void) {
+FileType Document::GetFileType()
+{
return Filetype;
}
/**
- * \brief opens the file
- * @param exception_on_error
- * @return
+ * \brief Tries to open the file \ref Document::Filename and
+ * checks the preamble when existing.
+ * @return The FILE pointer on success.
*/
-FILE *gdcmDocument::OpenFile(bool exception_on_error)
- throw(gdcmFileError)
+std::ifstream* Document::OpenFile()
{
- fp=fopen(Filename.c_str(),"rb");
-
- if(!fp)
- {
- if(exception_on_error)
- throw gdcmFileError("gdcmDocument::gdcmDocument(const char *, bool)");
- else
- {
- dbg.Verbose(0, "gdcmDocument::OpenFile cannot open file: ",
- Filename.c_str());
- return NULL;
- }
- }
-
- if ( fp )
- {
- guint16 zero;
- fread(&zero, (size_t)2, (size_t)1, fp);
-
- //ACR -- or DICOM with no Preamble --
- if( zero == 0x0008 || zero == 0x0800 || zero == 0x0002 || zero == 0x0200)
- return fp;
+ if (Filename.length() == 0) return 0;
+ if(Fp)
+ {
+ dbg.Verbose( 0,
+ "Document::OpenFile is already opened when opening: ",
+ Filename.c_str());
+ }
- //DICOM
- fseek(fp, 126L, SEEK_CUR);
- char dicm[4];
- fread(dicm, (size_t)4, (size_t)1, fp);
- if( memcmp(dicm, "DICM", 4) == 0 )
- return fp;
+ Fp = new std::ifstream(Filename.c_str(), std::ios::in | std::ios::binary);
- fclose(fp);
- dbg.Verbose(0, "gdcmDocument::OpenFile not DICOM/ACR", Filename.c_str());
- }
- else {
- dbg.Verbose(0, "gdcmDocument::OpenFile cannot open file", Filename.c_str());
- }
- return NULL;
+ if(!Fp)
+ {
+ dbg.Verbose( 0,
+ "Document::OpenFile cannot open file: ",
+ Filename.c_str());
+ return 0;
+ }
+
+ uint16_t zero;
+ Fp->read((char*)&zero, (size_t)2 );
+
+ //ACR -- or DICOM with no Preamble --
+ if( zero == 0x0008 || zero == 0x0800 || zero == 0x0002 || zero == 0x0200 )
+ {
+ return Fp;
+ }
+
+ //DICOM
+ Fp->seekg(126L, std::ios_base::cur);
+ char dicm[4];
+ Fp->read(dicm, (size_t)4);
+ if( memcmp(dicm, "DICM", 4) == 0 )
+ {
+ return Fp;
+ }
+
+ CloseFile();
+ dbg.Verbose( 0,
+ "Document::OpenFile not DICOM/ACR (missing preamble)",
+ Filename.c_str());
+
+ return 0;
}
/**
* \brief closes the file
* @return TRUE if the close was successfull
*/
-bool gdcmDocument::CloseFile(void) {
- int closed = fclose(fp);
- fp = (FILE *)0;
- if (! closed)
- return false;
- return true;
+bool Document::CloseFile()
+{
+ if( Fp )
+ {
+ Fp->close();
+ delete Fp;
+ Fp = 0;
+ }
+
+ return true; //FIXME how do we detect a non-close ifstream ?
}
/**
* (ACR-NEMA, ExplicitVR, ImplicitVR)
* \return Always true.
*/
-void gdcmDocument::Write(FILE* fp,FileType filetype) {
-
+void Document::Write(std::ofstream* fp, FileType filetype)
+{
/// \todo move the following lines (and a lot of others, to be written)
- /// to a future function CheckAndCorrectHeader
-
- /// WARNING : Si on veut ecrire du DICOM V3 a partir d'un DcmHeader ACR-NEMA
- /// no way (check : FileType est un champ de gdcmDocument ...)
- /// a moins de se livrer a un tres complique ajout des champs manquants.
- /// faire un CheckAndCorrectHeader (?)
-
- if (filetype == gdcmImplicitVR)
+ /// to a future function CheckAndCorrectHeader
+ /// (necessary if user wants to write a DICOM V3 file
+ /// starting from an ACR-NEMA (V2) Header
+
+ if (filetype == ImplicitVR)
{
- std::string implicitVRTransfertSyntax = UI1_2_840_10008_1_2;
- ReplaceOrCreateByNumber(implicitVRTransfertSyntax,0x0002, 0x0010);
+ std::string ts =
+ Util::DicomString( TransferSyntaxStrings[ImplicitVRLittleEndian] );
+ ReplaceOrCreateByNumber(ts, 0x0002, 0x0010);
/// \todo Refer to standards on page 21, chapter 6.2
/// "Value representation": values with a VR of UI shall be
SetEntryLengthByNumber(18, 0x0002, 0x0010);
}
- if (filetype == gdcmExplicitVR)
+ if (filetype == ExplicitVR)
{
- std::string explicitVRTransfertSyntax = UI1_2_840_10008_1_2_1;
- ReplaceOrCreateByNumber(explicitVRTransfertSyntax,0x0002, 0x0010);
+ std::string ts =
+ Util::DicomString( TransferSyntaxStrings[ExplicitVRLittleEndian] );
+ ReplaceOrCreateByNumber(ts, 0x0002, 0x0010); //LEAK
/// \todo Refer to standards on page 21, chapter 6.2
/// "Value representation": values with a VR of UI shall be
* UpdateGroupLength(true,ACR);
*/
- gdcmElementSet::Write(fp,filetype); // This one is recursive
+ ElementSet::Write(fp, filetype); // This one is recursive
}
/**
* \brief Modifies the value of a given Header Entry (Dicom Element)
* when it exists. Create it with the given value when unexistant.
- * @param Value (string) Value to be set
- * @param Group Group number of the Entry
- * @param Elem Element number of the Entry
+ * @param value (string) Value to be set
+ * @param group Group number of the Entry
+ * @param elem Element number of the Entry
+ * @param VR V(alue) R(epresentation) of the Entry -if private Entry-
* \return pointer to the modified/created Header Entry (NULL when creation
* failed).
- */
-
-gdcmValEntry * gdcmDocument::ReplaceOrCreateByNumber(
- std::string Value,
- guint16 Group,
- guint16 Elem )
+ */
+ValEntry* Document::ReplaceOrCreateByNumber(
+ std::string const & value,
+ uint16_t group,
+ uint16_t elem,
+ TagName const & vr )
{
- gdcmDocEntry* CurrentEntry;
- gdcmValEntry* ValEntry;
-
- CurrentEntry = GetDocEntryByNumber( Group, Elem);
- if (!CurrentEntry)
+ ValEntry* valEntry = 0;
+ DocEntry* currentEntry = GetDocEntryByNumber( group, elem);
+
+ if (!currentEntry)
{
- // The entry wasn't present and we simply create the required ValEntry:
- CurrentEntry = NewDocEntryByNumber(Group, Elem);
- if (!CurrentEntry)
+ // check if (group,element) DictEntry exists
+ // if it doesn't, create an entry in DictSet::VirtualEntry
+ // and use it
+
+ // Find out if the tag we received is in the dictionaries:
+ Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
+ DictEntry* dictEntry = pubDict->GetDictEntryByNumber(group, elem);
+ if (!dictEntry)
{
- dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: call to"
+ currentEntry = NewDocEntryByNumber(group, elem, vr);
+ }
+ else
+ {
+ currentEntry = NewDocEntryByNumber(group, elem);
+ }
+
+ if (!currentEntry)
+ {
+ dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: call to"
" NewDocEntryByNumber failed.");
return NULL;
}
- ValEntry = new gdcmValEntry(CurrentEntry);
- if ( !AddEntry(ValEntry))
+ valEntry = new ValEntry(currentEntry);
+ if ( !AddEntry(valEntry))
{
- dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: AddEntry"
+ delete valEntry;
+ dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry"
" failed allthough this is a creation.");
}
+ // This is the reason why NewDocEntryByNumber are a real
+ // bad habit !!! FIXME
+ delete currentEntry;
}
else
{
- ValEntry = dynamic_cast< gdcmValEntry* >(CurrentEntry);
- if ( !ValEntry )
+ valEntry = dynamic_cast< ValEntry* >(currentEntry);
+ if ( !valEntry ) // Euuuuh? It wasn't a ValEntry
+ // then we change it to a ValEntry ?
+ // Shouldn't it be considered as an error ?
{
- // We need to promote the gdcmDocEntry to a gdcmValEntry:
- ValEntry = new gdcmValEntry(CurrentEntry);
- if (!RemoveEntry(CurrentEntry))
+ // We need to promote the DocEntry to a ValEntry:
+ valEntry = new ValEntry(currentEntry);
+ if (!RemoveEntry(currentEntry))
{
- dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: removal"
+ delete valEntry;
+ dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal"
" of previous DocEntry failed.");
return NULL;
}
- if ( !AddEntry(ValEntry))
+ if ( !AddEntry(valEntry))
{
- dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: adding"
+ delete valEntry;
+ dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: adding"
" promoted ValEntry failed.");
return NULL;
}
}
}
- SetEntryByNumber(Value, Group, Elem);
+ SetEntryByNumber(value, group, elem);
- return ValEntry;
+ return valEntry;
}
/*
* \brief Modifies the value of a given Header Entry (Dicom Element)
* when it exists. Create it with the given value when unexistant.
- * @param voidArea (binary) value to be set
+ * @param binArea (binary) value to be set
* @param Group Group number of the Entry
* @param Elem Element number of the Entry
* \return pointer to the modified/created Header Entry (NULL when creation
* failed).
*/
-gdcmBinEntry * gdcmDocument::ReplaceOrCreateByNumber(
- void *voidArea,
+BinEntry* Document::ReplaceOrCreateByNumber(
+ uint8_t* binArea,
int lgth,
- guint16 Group,
- guint16 Elem)
-{
- gdcmDocEntry* a;
- gdcmBinEntry* b = 0;
- a = GetDocEntryByNumber( Group, Elem);
- if (a == NULL) {
- a =NewBinEntryByNumber(Group, Elem);
- if (a == NULL)
+ uint16_t group,
+ uint16_t elem,
+ TagName const & vr )
+{
+ BinEntry* binEntry = 0;
+ DocEntry* currentEntry = GetDocEntryByNumber( group, elem);
+ if (!currentEntry)
+ {
+
+ // check if (group,element) DictEntry exists
+ // if it doesn't, create an entry in DictSet::VirtualEntry
+ // and use it
+
+ // Find out if the tag we received is in the dictionaries:
+ Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
+ DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem);
+
+ if (!dictEntry)
+ {
+ currentEntry = NewDocEntryByNumber(group, elem, vr);
+ }
+ else
+ {
+ currentEntry = NewDocEntryByNumber(group, elem);
+ }
+ if (!currentEntry)
+ {
+ dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: call to"
+ " NewDocEntryByNumber failed.");
return NULL;
+ }
+ binEntry = new BinEntry(currentEntry);
+ if ( !AddEntry(binEntry))
+ {
+ dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry"
+ " failed allthough this is a creation.");
+ }
+ }
+ else
+ {
+ binEntry = dynamic_cast< BinEntry* >(currentEntry);
+ if ( !binEntry ) // Euuuuh? It wasn't a BinEntry
+ // then we change it to a BinEntry ?
+ // Shouldn't it be considered as an error ?
+ {
+ // We need to promote the DocEntry to a BinEntry:
+ binEntry = new BinEntry(currentEntry);
+ if (!RemoveEntry(currentEntry))
+ {
+ dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal"
+ " of previous DocEntry failed.");
+ return NULL;
+ }
+ if ( !AddEntry(binEntry))
+ {
+ dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: adding"
+ " promoted BinEntry failed.");
+ return NULL;
+ }
+ }
+ }
- b = new gdcmBinEntry(a);
- AddEntry(b);
- }
- SetEntryByNumber(voidArea, lgth, Group, Elem);
- b->SetVoidArea(voidArea);
+ SetEntryByNumber(binArea, lgth, group, elem);
- return b;
+ return binEntry;
}
+/*
+ * \brief Modifies the value of a given Header Entry (Dicom Element)
+ * when it exists. Create it when unexistant.
+ * @param Group Group number of the Entry
+ * @param Elem Element number of the Entry
+ * \return pointer to the modified/created SeqEntry (NULL when creation
+ * failed).
+ */
+SeqEntry* Document::ReplaceOrCreateByNumber( uint16_t group, uint16_t elem)
+{
+ SeqEntry* b = 0;
+ DocEntry* a = GetDocEntryByNumber( group, elem);
+ if (!a)
+ {
+ a = NewSeqEntryByNumber(group, elem);
+ if (!a)
+ {
+ return 0;
+ }
+ b = new SeqEntry(a, 1); // FIXME : 1 (Depth)
+ AddEntry(b);
+ }
+ return b;
+}
+
/**
* \brief Set a new value if the invoked element exists
* Seems to be useless !!!
- * @param Value new element value
- * @param Group group number of the Entry
- * @param Elem element number of the Entry
+ * @param value new element value
+ * @param group group number of the Entry
+ * @param elem element number of the Entry
* \return boolean
*/
-bool gdcmDocument::ReplaceIfExistByNumber(char* Value, guint16 Group, guint16 Elem )
+bool Document::ReplaceIfExistByNumber(std::string const & value,
+ uint16_t group, uint16_t elem )
{
- std::string v = Value;
- SetEntryByNumber(v, Group, Elem);
+ SetEntryByNumber(value, group, elem);
+
return true;
}
* \brief Checks if a given Dicom Element exists within the H table
* @param group Group number of the searched Dicom Element
* @param element Element number of the searched Dicom Element
- * @return number of occurences
+ * @return true is found
*/
-int gdcmDocument::CheckIfEntryExistByNumber(guint16 group, guint16 element ) {
- std::string key = gdcmDictEntry::TranslateToKey(group, element );
- return tagHT.count(key);
+bool Document::CheckIfEntryExistByNumber(uint16_t group, uint16_t element )
+{
+ const std::string &key = DictEntry::TranslateToKey(group, element );
+ return TagHT.count(key) != 0;
}
/**
* @return Corresponding element value when it exists,
* and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
*/
-std::string gdcmDocument::GetEntryByName(TagName tagName) {
- gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
- if( dictEntry == NULL)
+std::string Document::GetEntryByName(TagName const & tagName)
+{
+ DictEntry* dictEntry = RefPubDict->GetDictEntryByName(tagName);
+ if( !dictEntry )
+ {
return GDCM_UNFOUND;
+ }
return GetEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement());
}
* @return Corresponding element value representation when it exists,
* and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
*/
-std::string gdcmDocument::GetEntryVRByName(TagName tagName) {
- gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
+std::string Document::GetEntryVRByName(TagName const& tagName)
+{
+ DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
if( dictEntry == NULL)
+ {
return GDCM_UNFOUND;
+ }
- gdcmDocEntry* elem = GetDocEntryByNumber(dictEntry->GetGroup(),
- dictEntry->GetElement());
+ DocEntry* elem = GetDocEntryByNumber(dictEntry->GetGroup(),
+ dictEntry->GetElement());
return elem->GetVR();
}
-
/**
* \brief Searches within Header Entries (Dicom Elements) parsed with
* the public and private dictionaries
* @return Corresponding element value representation when it exists,
* and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
*/
-std::string gdcmDocument::GetEntryByNumber(guint16 group, guint16 element){
- TagKey key = gdcmDictEntry::TranslateToKey(group, element);
- if ( ! tagHT.count(key))
+std::string Document::GetEntryByNumber(uint16_t group, uint16_t element)
+{
+ TagKey key = DictEntry::TranslateToKey(group, element);
+ /// \todo use map methods, instead of multimap JPR
+ if ( !TagHT.count(key))
+ {
return GDCM_UNFOUND;
- return ((gdcmValEntry *)tagHT.find(key)->second)->GetValue();
+ }
+
+ return ((ValEntry *)TagHT.find(key)->second)->GetValue();
}
/**
* @return Corresponding element value representation when it exists,
* and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
*/
-std::string gdcmDocument::GetEntryVRByNumber(guint16 group, guint16 element) {
- gdcmDocEntry* elem = GetDocEntryByNumber(group, element);
+std::string Document::GetEntryVRByNumber(uint16_t group, uint16_t element)
+{
+ DocEntry* elem = GetDocEntryByNumber(group, element);
if ( !elem )
+ {
return GDCM_UNFOUND;
+ }
return elem->GetVR();
}
* @param element Element number of the searched tag.
* @return Corresponding element length; -2 if not found
*/
-int gdcmDocument::GetEntryLengthByNumber(guint16 group, guint16 element) {
- gdcmDocEntry* elem = GetDocEntryByNumber(group, element);
+int Document::GetEntryLengthByNumber(uint16_t group, uint16_t element)
+{
+ DocEntry* elem = GetDocEntryByNumber(group, element);
if ( !elem )
- return -2;
+ {
+ return -2; //magic number
+ }
return elem->GetLength();
}
/**
* @param tagName name of the searched Dicom Element.
* @return true when found
*/
-bool gdcmDocument::SetEntryByName(std::string content,std::string tagName) {
- gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
- if( dictEntry == NULL)
- return false;
+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 gdcmDocEntry (i.e. a Dicom Element)
+ * \brief Accesses an existing DocEntry (i.e. a Dicom Element)
* through it's (group, element) and modifies it's content with
* the given value.
* @param content new value (string) to substitute with
* @param group group number of the Dicom Element to modify
* @param element element number of the Dicom Element to modify
*/
-bool gdcmDocument::SetEntryByNumber(std::string content,
- guint16 group,
- guint16 element)
+bool Document::SetEntryByNumber(std::string const& content,
+ uint16_t group, uint16_t element)
{
- gdcmValEntry* ValEntry = GetValEntryByNumber(group, element);
- if (!ValEntry)
+ int c;
+ int l;
+
+ ValEntry* valEntry = GetValEntryByNumber(group, element);
+ if (!valEntry )
{
- dbg.Verbose(0, "gdcmDocument::SetEntryByNumber: no corresponding",
+ dbg.Verbose(0, "Document::SetEntryByNumber: no corresponding",
" ValEntry (try promotion first).");
return false;
}
- // Non even content must be padded with a space (020H).
- if((content.length())%2) {
- content = content + '\0';
- }
- ValEntry->SetValue(content);
-
+ // Non even content must be padded with a space (020H)...
+ std::string finalContent = Util::DicomString( content.c_str() );
+ assert( !(finalContent.size() % 2) );
+ valEntry->SetValue(finalContent);
+
// Integers have a special treatement for their length:
- VRKey vr = ValEntry->GetVR();
- if( (vr == "US") || (vr == "SS") )
- ValEntry->SetLength(2);
- else if( (vr == "UL") || (vr == "SL") )
- ValEntry->SetLength(4);
- else
- ValEntry->SetLength(content.length());
+ l = finalContent.length();
+ if ( l != 0) // To avoid to be cheated by 'zero length' integers
+ {
+ VRKey vr = valEntry->GetVR();
+ if( vr == "US" || vr == "SS" )
+ {
+ // for multivaluated items
+ c = Util::CountSubstring(content, "\\") + 1;
+ l = c*2;
+ }
+ else if( vr == "UL" || vr == "SL" )
+ {
+ // for multivaluated items
+ c = Util::CountSubstring(content, "\\") + 1;
+ l = c*4;;
+ }
+ }
+ valEntry->SetLength(l);
return true;
}
/**
- * \brief Accesses an existing gdcmDocEntry (i.e. a Dicom Element)
+ * \brief Accesses an existing DocEntry (i.e. a Dicom Element)
* through it's (group, element) and modifies it's content with
* the given value.
- * @param content new value (void *) to substitute with
+ * @param content new value (void* -> uint8_t*) to substitute with
* @param lgth new value length
* @param group group number of the Dicom Element to modify
* @param element element number of the Dicom Element to modify
*/
-bool gdcmDocument::SetEntryByNumber(void *content,
- int lgth,
- guint16 group,
- guint16 element)
+bool Document::SetEntryByNumber(uint8_t*content, int lgth,
+ uint16_t group, uint16_t element)
{
(void)lgth; //not used
- TagKey key = gdcmDictEntry::TranslateToKey(group, element);
- if ( ! tagHT.count(key))
+ TagKey key = DictEntry::TranslateToKey(group, element);
+ if ( !TagHT.count(key))
+ {
return false;
+ }
-/* Hope Binray field length is never wrong
+/* Hope Binary field length is *never* wrong
if(lgth%2) // Non even length are padded with a space (020H).
{
lgth++;
//content = content + '\0'; // fing a trick to enlarge a binary field?
}
*/
- gdcmBinEntry * a;
- a = (gdcmBinEntry *)tagHT[key];
- a->SetVoidArea(content);
- //a->SetLength(lgth); // ???
+ BinEntry* a = (BinEntry *)TagHT[key];
+ a->SetBinArea(content);
+ a->SetLength(lgth);
+ a->SetValue(GDCM_BINLOADED);
+
return true;
}
/**
- * \brief Accesses an existing gdcmDocEntry (i.e. a Dicom Element)
+ * \brief Accesses an existing DocEntry (i.e. a Dicom Element)
* in the PubDocEntrySet of this instance
* through it's (group, element) and modifies it's length with
* the given value.
* @param element element number of the Entry to modify
* @return true on success, false otherwise.
*/
-bool gdcmDocument::SetEntryLengthByNumber(guint32 l,
- guint16 group,
- guint16 element)
+bool Document::SetEntryLengthByNumber(uint32_t l,
+ uint16_t group, uint16_t element)
{
- TagKey key = gdcmDictEntry::TranslateToKey(group, element);
- if ( ! tagHT.count(key))
+ /// \todo use map methods, instead of multimap JPR
+ TagKey key = DictEntry::TranslateToKey(group, element);
+ if ( !TagHT.count(key) )
+ {
return false;
- if (l%2) l++; // length must be even
- ( ((tagHT.equal_range(key)).first)->second )->SetLength(l);
+ }
+ if ( l % 2 )
+ {
+ l++; // length must be even
+ }
+ ( ((TagHT.equal_range(key)).first)->second )->SetLength(l);
return true ;
}
/**
* \brief Gets (from Header) the offset of a 'non string' element value
* (LoadElementValues has already be executed)
- * @param Group group number of the Entry
- * @param Elem element number of the Entry
+ * @param group group number of the Entry
+ * @param elem element number of the Entry
* @return File Offset of the Element Value
*/
-size_t gdcmDocument::GetEntryOffsetByNumber(guint16 Group, guint16 Elem)
+size_t Document::GetEntryOffsetByNumber(uint16_t group, uint16_t elem)
{
- gdcmDocEntry* Entry = GetDocEntryByNumber(Group, Elem);
- if (!Entry)
+ DocEntry* entry = GetDocEntryByNumber(group, elem);
+ if (!entry)
{
- dbg.Verbose(1, "gdcmDocument::GetDocEntryByNumber: no entry present.");
- return (size_t)0;
+ dbg.Verbose(1, "Document::GetDocEntryByNumber: no entry present.");
+ return 0;
}
- return Entry->GetOffset();
+ return entry->GetOffset();
}
/**
* \brief Gets (from Header) a 'non string' element value
* (LoadElementValues has already be executed)
- * @param Group group number of the Entry
- * @param Elem element number of the Entry
+ * @param group group number of the Entry
+ * @param elem element number of the Entry
* @return Pointer to the 'non string' area
*/
-void * gdcmDocument::GetEntryVoidAreaByNumber(guint16 Group, guint16 Elem)
+void* Document::GetEntryBinAreaByNumber(uint16_t group, uint16_t elem)
{
- gdcmDocEntry* Entry = GetDocEntryByNumber(Group, Elem);
- if (!Entry)
+ DocEntry* entry = GetDocEntryByNumber(group, elem);
+ if (!entry)
{
- dbg.Verbose(1, "gdcmDocument::GetDocEntryByNumber: no entry");
- return (NULL);
+ dbg.Verbose(1, "Document::GetDocEntryByNumber: no entry");
+ return 0;
}
- return ((gdcmBinEntry *)Entry)->GetVoidArea();
+ if ( BinEntry* binEntry = dynamic_cast<BinEntry*>(entry) )
+ {
+ return binEntry->GetBinArea();
+ }
+
+ return 0;
}
/**
* \brief Loads (from disk) the element content
* when a string is not suitable
- * @param Group group number of the Entry
- * @param Elem element number of the Entry
+ * @param group group number of the Entry
+ * @param elem element number of the Entry
*/
-void *gdcmDocument::LoadEntryVoidArea(guint16 Group, guint16 Elem)
+void Document::LoadEntryBinArea(uint16_t group, uint16_t elem)
{
- gdcmDocEntry * Element= GetDocEntryByNumber(Group, Elem);
- if ( !Element )
- return NULL;
- size_t o =(size_t)Element->GetOffset();
- fseek(fp, o, SEEK_SET);
- size_t l = Element->GetLength();
- char* a = new char[l];
- if(!a) {
- dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea cannot allocate a");
- return NULL;
+ // Search the corresponding DocEntry
+ DocEntry *docElement = GetDocEntryByNumber(group, elem);
+ if ( !docElement )
+ return;
+
+ size_t o =(size_t)docElement->GetOffset();
+ Fp->seekg( o, std::ios_base::beg);
+ size_t l = docElement->GetLength();
+ uint8_t* a = new uint8_t[l];
+ if(!a)
+ {
+ dbg.Verbose(0, "Document::LoadEntryBinArea cannot allocate a");
+ return;
}
- SetEntryVoidAreaByNumber(a, Group, Elem);
- /// \todo check the result
- size_t l2 = fread(a, 1, l ,fp);
- if(l != l2)
+
+ // Read the value
+ Fp->read((char*)a, l);
+ if( Fp->fail() || Fp->eof() )//Fp->gcount() == 1
{
delete[] a;
- return NULL;
+ return;
+ }
+
+ // Set the value to the DocEntry
+ if( !SetEntryBinAreaByNumber( a, group, elem ) )
+ {
+ delete[] a;
+ dbg.Verbose(0, "Document::LoadEntryBinArea setting failed.");
}
- return a;
}
/**
* \brief Loads (from disk) the element content
* when a string is not suitable
- * @param Element Entry whose voidArea is going to be loaded
+ * @param element Entry whose binArea is going to be loaded
*/
-void *gdcmDocument::LoadEntryVoidArea(gdcmBinEntry *Element)
+void Document::LoadEntryBinArea(BinEntry* element)
{
- size_t o =(size_t)Element->GetOffset();
- fseek(fp, o, SEEK_SET);
- size_t l = Element->GetLength();
- char* a = new char[l];
- if(!a) {
- dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea cannot allocate a");
- return NULL;
+ size_t o =(size_t)element->GetOffset();
+ Fp->seekg(o, std::ios_base::beg);
+ size_t l = element->GetLength();
+ uint8_t* a = new uint8_t[l];
+ if( !a )
+ {
+ dbg.Verbose(0, "Document::LoadEntryBinArea cannot allocate a");
+ return;
}
- Element->SetVoidArea((void *)a);
+
/// \todo check the result
- size_t l2 = fread(a, 1, l ,fp);
- if(l != l2)
+ Fp->read((char*)a, l);
+ if( Fp->fail() || Fp->eof()) //Fp->gcount() == 1
{
delete[] a;
- return NULL;
+ return;
}
- return a;
+
+ element->SetBinArea((uint8_t*)a);
}
/**
* @param element Element number of the searched Dicom Element
* @return
*/
-bool gdcmDocument::SetEntryVoidAreaByNumber(void * area,
- guint16 group,
- guint16 element)
+bool Document::SetEntryBinAreaByNumber(uint8_t* area,
+ uint16_t group, uint16_t element)
{
- TagKey key = gdcmDictEntry::TranslateToKey(group, element);
- if ( ! tagHT.count(key))
+ DocEntry* currentEntry = GetDocEntryByNumber(group, element);
+ if ( !currentEntry )
+ {
return false;
- // This was for multimap ?
- (( gdcmBinEntry *)( ((tagHT.equal_range(key)).first)->second ))->SetVoidArea(area);
-
- return true;
+ }
+
+ if ( BinEntry* binEntry = dynamic_cast<BinEntry*>(currentEntry) )
+ {
+ binEntry->SetBinArea( area );
+ return true;
+ }
+
+ return false;
}
/**
* \brief Update the entries with the shadow dictionary.
* Only non even entries are analyzed
*/
-void gdcmDocument::UpdateShaEntries(void) {
- //gdcmDictEntry *entry;
+void Document::UpdateShaEntries()
+{
+ //DictEntry *entry;
std::string vr;
/// \todo TODO : still any use to explore recursively the whole structure?
* @return Corresponding Dicom Element when it exists, and NULL
* otherwise.
*/
- gdcmDocEntry *gdcmDocument::GetDocEntryByName(std::string tagName) {
- gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
- if( dictEntry == NULL)
+DocEntry* Document::GetDocEntryByName(TagName const & tagName)
+{
+ DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
+ if( !dictEntry )
+ {
return NULL;
+ }
- return(GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()));
+ return GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement());
}
/**
* @param element Element number of the searched Dicom Element
* @return
*/
-gdcmDocEntry* gdcmDocument::GetDocEntryByNumber(guint16 group, guint16 element)
+DocEntry* Document::GetDocEntryByNumber(uint16_t group, uint16_t element)
{
- TagKey key = gdcmDictEntry::TranslateToKey(group, element);
- if ( ! tagHT.count(key))
+ TagKey key = DictEntry::TranslateToKey(group, element);
+ if ( !TagHT.count(key))
+ {
return NULL;
- return tagHT.find(key)->second;
+ }
+ return TagHT.find(key)->second;
}
/**
- * \brief Same as \ref gdcmDocument::GetDocEntryByNumber except it only
+ * \brief Same as \ref Document::GetDocEntryByNumber except it only
* returns a result when the corresponding entry is of type
* ValEntry.
* @return When present, the corresponding ValEntry.
*/
-gdcmValEntry* gdcmDocument::GetValEntryByNumber(guint16 group, guint16 element)
+ValEntry* Document::GetValEntryByNumber(uint16_t group, uint16_t element)
{
- gdcmDocEntry* CurrentEntry = GetDocEntryByNumber(group, element);
- if (! CurrentEntry)
- return (gdcmValEntry*)0;
- if ( gdcmValEntry* ValEntry = dynamic_cast<gdcmValEntry*>(CurrentEntry) )
- {
- return ValEntry;
- }
- dbg.Verbose(0, "gdcmDocument::GetValEntryByNumber: unfound ValEntry.");
- return (gdcmValEntry*)0;
+ DocEntry* currentEntry = GetDocEntryByNumber(group, element);
+ if ( !currentEntry )
+ {
+ return 0;
+ }
+ if ( ValEntry* valEntry = dynamic_cast<ValEntry*>(currentEntry) )
+ {
+ return valEntry;
+ }
+ dbg.Verbose(0, "Document::GetValEntryByNumber: unfound ValEntry.");
+
+ return 0;
}
/**
* @param entry Header Entry whose value shall be loaded.
* @return
*/
-void gdcmDocument::LoadDocEntrySafe(gdcmDocEntry * entry) {
- long PositionOnEntry = ftell(fp);
+void Document::LoadDocEntrySafe(DocEntry * entry)
+{
+ long PositionOnEntry = Fp->tellg();
LoadDocEntry(entry);
- fseek(fp, PositionOnEntry, SEEK_SET);
+ Fp->seekg(PositionOnEntry, std::ios_base::beg);
}
/**
* processor order.
* @return The properly swaped 32 bits integer.
*/
-guint32 gdcmDocument::SwapLong(guint32 a) {
- switch (sw) {
+uint32_t Document::SwapLong(uint32_t a)
+{
+ switch (SwapCode)
+ {
case 0 :
break;
case 4321 :
break;
case 2143 :
- a=( ((a<<8) & 0xff00ff00) | ((a>>8) & 0x00ff00ff) );
+ a=( ((a<< 8) & 0xff00ff00) | ((a>>8) & 0x00ff00ff) );
break;
default :
- std::cout << "swapCode= " << sw << std::endl;
- dbg.Error(" gdcmDocument::SwapLong : unset swap code");
- a=0;
+ //std::cout << "swapCode= " << SwapCode << std::endl;
+ dbg.Error(" Document::SwapLong : unset swap code");
+ a = 0;
}
return a;
}
* processor order.
* @return The properly unswaped 32 bits integer.
*/
-guint32 gdcmDocument::UnswapLong(guint32 a) {
+uint32_t Document::UnswapLong(uint32_t a)
+{
return SwapLong(a);
}
* \brief Swaps the bytes so they agree with the processor order
* @return The properly swaped 16 bits integer.
*/
-guint16 gdcmDocument::SwapShort(guint16 a) {
- if ( (sw==4321) || (sw==2143) )
- a =(((a<<8) & 0x0ff00) | ((a>>8)&0x00ff));
+uint16_t Document::SwapShort(uint16_t a)
+{
+ if ( SwapCode == 4321 || SwapCode == 2143 )
+ {
+ a = ((( a << 8 ) & 0x0ff00 ) | (( a >> 8 ) & 0x00ff ) );
+ }
return a;
}
* \brief Unswaps the bytes so they agree with the processor order
* @return The properly unswaped 16 bits integer.
*/
-guint16 gdcmDocument::UnswapShort(guint16 a) {
+uint16_t Document::UnswapShort(uint16_t a)
+{
return SwapShort(a);
}
* \brief Parses a DocEntrySet (Zero-level DocEntries or SQ Item DocEntries)
* @return length of the parsed set.
*/
-
-long gdcmDocument::ParseDES(gdcmDocEntrySet *set, long offset, long l_max, bool delim_mode) {
-
- gdcmDocEntry *NewDocEntry = (gdcmDocEntry *)0;
- gdcmValEntry *NewValEntry = (gdcmValEntry *)0;
- gdcmBinEntry *bn;
- gdcmSeqEntry *sq;
- VRKey vr;
- unsigned long l = 0;
- int depth;
-
- depth = set->GetDepthLevel();
- while (true) {
+void Document::ParseDES(DocEntrySet *set, long offset,
+ long l_max, bool delim_mode)
+{
+ DocEntry *newDocEntry = 0;
- if ( !delim_mode && ftell(fp)-offset >= l_max) {
- break;
+ while (true)
+ {
+ if ( !delim_mode && (Fp->tellg()-offset) >= l_max)
+ {
+ break;
}
- NewDocEntry = ReadNextDocEntry( );
- if (!NewDocEntry)
+ newDocEntry = ReadNextDocEntry( );
+ if ( !newDocEntry )
+ {
break;
- // NewDocEntry->Print(); cout << endl; //JPR
- vr = NewDocEntry->GetVR();
- if (vr!="SQ")
+ }
+
+ VRKey vr = newDocEntry->GetVR();
+ if ( vr != "SQ" )
{
- if ( gdcmGlobal::GetVR()->IsVROfGdcmStringRepresentable(vr) )
+ if ( Global::GetVR()->IsVROfGdcmStringRepresentable(vr) )
{
- /////// ValEntry
- NewValEntry = new gdcmValEntry(NewDocEntry->GetDictEntry());
- NewValEntry->Copy(NewDocEntry);
- NewValEntry->SetDepthLevel(depth);
- set->AddEntry(NewValEntry);
- LoadDocEntry(NewValEntry);
- if (NewValEntry->isItemDelimitor())
+ /////////////////////// ValEntry
+ ValEntry* newValEntry =
+ new ValEntry( newDocEntry->GetDictEntry() );
+ 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 ) )
+ {
+ (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 ) )
+ {
+ newValEntry->SetKey( parentSQItem->GetBaseTagKey()
+ + newValEntry->GetKey() );
+ }
+
+ set->AddEntry( newValEntry );
+ LoadDocEntry( newValEntry );
+ if (newValEntry->IsItemDelimitor())
+ {
break;
- if ( !delim_mode && ftell(fp)-offset >= l_max)
+ }
+ if ( !delim_mode && (Fp->tellg()-offset) >= l_max)
{
break;
}
}
else
{
- if ( ! gdcmGlobal::GetVR()->IsVROfGdcmBinaryRepresentable(vr) )
+ if ( ! Global::GetVR()->IsVROfGdcmBinaryRepresentable(vr) )
{
////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR
- dbg.Verbose(0, "gdcmDocument::ParseDES: neither Valentry, "
+ dbg.Verbose(0, "Document::ParseDES: neither Valentry, "
"nor BinEntry. Probably unknown VR.");
}
- ////// BinEntry or UNKOWN VR:
- bn = new gdcmBinEntry(NewDocEntry->GetDictEntry());
- bn->Copy(NewDocEntry);
- set->AddEntry(bn);
- LoadDocEntry(bn);
+ //////////////////// BinEntry or UNKOWN VR:
+ BinEntry* newBinEntry =
+ new BinEntry( newDocEntry->GetDictEntry() ); //LEAK
+ newBinEntry->Copy( newDocEntry );
+
+ // 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() );
+ }
+
+ set->AddEntry( newBinEntry );
+ LoadDocEntry( newBinEntry );
}
- if (NewDocEntry->GetGroup() == 0x7fe0 &&
- NewDocEntry->GetElement() == 0x0010 )
+ if ( ( newDocEntry->GetGroup() == 0x7fe0 )
+ && ( newDocEntry->GetElement() == 0x0010 ) )
{
- if (NewDocEntry->GetReadLength()==0xffffffff)
+ TransferSyntaxType ts = GetTransferSyntax();
+ if ( ts == RLELossless )
{
- // Broken US.3405.1.dcm
- Parse7FE0(); // to skip the pixels
- // (multipart JPEG/RLE are trouble makers)
+ long PositionOnEntry = Fp->tellg();
+ Fp->seekg( newDocEntry->GetOffset(), std::ios_base::beg );
+ ComputeRLEInfo();
+ Fp->seekg( PositionOnEntry, std::ios_base::beg );
}
- else
+ else if ( IsJPEG() )
{
- SkipToNextDocEntry(NewDocEntry);
- l = NewDocEntry->GetFullLength();
+ long PositionOnEntry = Fp->tellg();
+ Fp->seekg( newDocEntry->GetOffset(), std::ios_base::beg );
+ ComputeJPEGFragmentInfo();
+ Fp->seekg( PositionOnEntry, std::ios_base::beg );
}
}
- else
- {
- // to be sure we are at the beginning
- SkipToNextDocEntry(NewDocEntry);
- l = NewDocEntry->GetFullLength();
- }
+
+ // Just to make sure we are at the beginning of next entry.
+ SkipToNextDocEntry(newDocEntry);
}
else
- { // VR = "SQ"
-
- l=NewDocEntry->GetReadLength();
- if (l != 0) // don't mess the delim_mode for zero-length sequence
- if (l == 0xffffffff)
+ {
+ // VR = "SQ"
+ unsigned long l = newDocEntry->GetReadLength();
+ if ( l != 0 ) // don't mess the delim_mode for zero-length sequence
+ {
+ if ( l == 0xffffffff )
+ {
delim_mode = true;
+ }
else
+ {
delim_mode = false;
+ }
+ }
// no other way to create it ...
- sq = new gdcmSeqEntry(NewDocEntry->GetDictEntry(),
- set->GetDepthLevel());
- sq->Copy(NewDocEntry);
- sq->SetDelimitorMode(delim_mode);
- sq->SetDepthLevel(depth);
+ 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 ) )
+ {
+ (void)dummy;
+ newSeqEntry->SetDepthLevel( 1 );
+ newSeqEntry->SetKey( newSeqEntry->GetKey() );
+ }
+ // 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 ) )
+ {
+ newSeqEntry->SetDepthLevel( parentSQItem->GetDepthLevel() + 1 );
+ newSeqEntry->SetKey( parentSQItem->GetBaseTagKey()
+ + newSeqEntry->GetKey() );
+ }
- if (l != 0)
+ if ( l != 0 )
{ // Don't try to parse zero-length sequences
- long lgt = ParseSQ( sq,
- NewDocEntry->GetOffset(),
- l, delim_mode);
- (void)lgt; //not used...
+ ParseSQ( newSeqEntry,
+ newDocEntry->GetOffset(),
+ l, delim_mode);
}
- set->AddEntry(sq);
- if ( !delim_mode && ftell(fp)-offset >= l_max)
+ set->AddEntry( newSeqEntry );
+ if ( !delim_mode && (Fp->tellg()-offset) >= l_max)
{
break;
}
}
- delete NewDocEntry;
+ delete newDocEntry;
}
- return l; // Probably useless
}
/**
* \brief Parses a Sequence ( SeqEntry after SeqEntry)
* @return parsed length for this level
*/
-long gdcmDocument::ParseSQ(gdcmSeqEntry *set,
- long offset, long l_max, bool delim_mode)
+void Document::ParseSQ( SeqEntry* seqEntry,
+ long offset, long l_max, bool delim_mode)
{
int SQItemNumber = 0;
-
- gdcmDocEntry *NewDocEntry = (gdcmDocEntry *)0;
- gdcmSQItem *itemSQ;
bool dlm_mod;
- int lgr, lgth;
- unsigned int l;
- int depth = set->GetDepthLevel();
- (void)depth; //not used
-
- while (true) {
- NewDocEntry = ReadNextDocEntry();
- if (!NewDocEntry)
+ while (true)
+ {
+ DocEntry* newDocEntry = ReadNextDocEntry();
+ if ( !newDocEntry )
+ {
+ // FIXME Should warn user
break;
- if(delim_mode) {
- if (NewDocEntry->isSequenceDelimitor()) {
- set->SetSequenceDelimitationItem(NewDocEntry);
+ }
+ if( delim_mode )
+ {
+ if ( newDocEntry->IsSequenceDelimitor() )
+ {
+ seqEntry->SetSequenceDelimitationItem( newDocEntry );
break;
- }
+ }
}
- if (!delim_mode && (ftell(fp)-offset) >= l_max) {
+ if ( !delim_mode && (Fp->tellg()-offset) >= l_max)
+ {
break;
}
- itemSQ = new gdcmSQItem(set->GetDepthLevel());
- itemSQ->AddEntry(NewDocEntry);
- l= NewDocEntry->GetReadLength();
+ SQItem *itemSQ = new SQItem( seqEntry->GetDepthLevel() );
+ std::ostringstream newBase;
+ newBase << seqEntry->GetKey()
+ << "/"
+ << SQItemNumber
+ << "#";
+ itemSQ->SetBaseTagKey( newBase.str() );
+ unsigned int l = newDocEntry->GetReadLength();
- if (l == 0xffffffff)
+ if ( l == 0xffffffff )
+ {
dlm_mod = true;
+ }
else
- dlm_mod=false;
+ {
+ dlm_mod = false;
+ }
- lgr=ParseDES(itemSQ, NewDocEntry->GetOffset(), l, dlm_mod);
+ ParseDES(itemSQ, newDocEntry->GetOffset(), l, dlm_mod);
- set->AddEntry(itemSQ,SQItemNumber);
- SQItemNumber ++;
- if (!delim_mode && (ftell(fp)-offset) >= l_max) {
+ seqEntry->AddEntry( itemSQ, SQItemNumber );
+ SQItemNumber++;
+ if ( !delim_mode && ( Fp->tellg() - offset ) >= l_max )
+ {
break;
}
}
- lgth = ftell(fp) - offset;
- return lgth;
}
/**
* \brief Loads the element content if its length doesn't exceed
- * the value specified with gdcmDocument::SetMaxSizeLoadEntry()
- * @param Entry Header Entry (Dicom Element) to be dealt with
+ * the value specified with Document::SetMaxSizeLoadEntry()
+ * @param entry Header Entry (Dicom Element) to be dealt with
*/
-void gdcmDocument::LoadDocEntry(gdcmDocEntry *Entry)
+void Document::LoadDocEntry(DocEntry* entry)
{
- size_t item_read;
- guint16 group = Entry->GetGroup();
- std::string vr= Entry->GetVR();
- guint32 length = Entry->GetLength();
+ uint16_t group = entry->GetGroup();
+ std::string vr = entry->GetVR();
+ uint32_t length = entry->GetLength();
- fseek(fp, (long)Entry->GetOffset(), SEEK_SET);
+ Fp->seekg((long)entry->GetOffset(), std::ios_base::beg);
// A SeQuence "contains" a set of Elements.
// (fffe e000) tells us an Element is beginning
// (fffe e00d) tells us an Element just ended
// (fffe e0dd) tells us the current SeQuence just ended
- if( group == 0xfffe ) {
+ if( group == 0xfffe )
+ {
// NO more value field for SQ !
return;
}
// When the length is zero things are easy:
- if ( length == 0 ) {
- ((gdcmValEntry *)Entry)->SetValue("");
+ if ( length == 0 )
+ {
+ ((ValEntry *)entry)->SetValue("");
return;
}
// the element content and it's length.
std::ostringstream s;
- if (length > MaxSizeLoadEntry) {
- if (gdcmBinEntry* BinEntryPtr = dynamic_cast< gdcmBinEntry* >(Entry) )
- {
- s << "gdcm::NotLoaded (BinEntry)";
- s << " Address:" << (long)Entry->GetOffset();
- s << " Length:" << Entry->GetLength();
- s << " x(" << std::hex << Entry->GetLength() << ")";
- BinEntryPtr->SetValue(s.str());
+ if (length > MaxSizeLoadEntry)
+ {
+ if (BinEntry* binEntryPtr = dynamic_cast< BinEntry* >(entry) )
+ {
+ //s << "gdcm::NotLoaded (BinEntry)";
+ s << GDCM_NOTLOADED;
+ s << " Address:" << (long)entry->GetOffset();
+ s << " Length:" << entry->GetLength();
+ s << " x(" << std::hex << entry->GetLength() << ")";
+ binEntryPtr->SetValue(s.str());
}
- // to be sure we are at the end of the value ...
- fseek(fp,(long)Entry->GetOffset()+(long)Entry->GetLength(),SEEK_SET);
- return;
// Be carefull : a BinEntry IS_A ValEntry ...
- if (gdcmValEntry* ValEntryPtr = dynamic_cast< gdcmValEntry* >(Entry) )
+ else if (ValEntry* valEntryPtr = dynamic_cast< ValEntry* >(entry) )
+ {
+ // s << "gdcm::NotLoaded. (ValEntry)";
+ s << GDCM_NOTLOADED;
+ s << " Address:" << (long)entry->GetOffset();
+ s << " Length:" << entry->GetLength();
+ s << " x(" << std::hex << entry->GetLength() << ")";
+ valEntryPtr->SetValue(s.str());
+ }
+ else
{
- s << "gdcm::NotLoaded. (ValEntry)";
- s << " Address:" << (long)Entry->GetOffset();
- s << " Length:" << Entry->GetLength();
- s << " x(" << std::hex << Entry->GetLength() << ")";
- ValEntryPtr->SetValue(s.str());
+ // fusible
+ std::cout<< "MaxSizeLoadEntry exceeded, neither a BinEntry "
+ << "nor a ValEntry ?! Should never print that !" << std::endl;
}
+
// to be sure we are at the end of the value ...
- fseek(fp,(long)Entry->GetOffset()+(long)Entry->GetLength(),SEEK_SET);
+ Fp->seekg((long)entry->GetOffset()+(long)entry->GetLength(),
+ std::ios_base::beg);
return;
}
// When we find a BinEntry not very much can be done :
- if (gdcmBinEntry* BinEntryPtr = dynamic_cast< gdcmBinEntry* >(Entry) ) {
-
- LoadEntryVoidArea(BinEntryPtr);
- s << "gdcm::Loaded (BinEntry)";
- BinEntryPtr->SetValue(s.str());
+ if (BinEntry* binEntryPtr = dynamic_cast< BinEntry* >(entry) )
+ {
+ s << GDCM_BINLOADED;
+ binEntryPtr->SetValue(s.str());
+ LoadEntryBinArea(binEntryPtr); // last one, not to erase length !
return;
}
-
- // Any compacter code suggested (?)
- if ( IsDocEntryAnInteger(Entry) ) {
- guint32 NewInt;
- std::ostringstream s;
+ /// \todo Any compacter code suggested (?)
+ if ( IsDocEntryAnInteger(entry) )
+ {
+ uint32_t NewInt;
int nbInt;
- // When short integer(s) are expected, read and convert the following
- // n *two characters properly i.e. as short integers as opposed to strings.
- // Elements with Value Multiplicity > 1
- // contain a set of integers (not a single one)
- if (vr == "US" || vr == "SS") {
+ // When short integer(s) are expected, read and convert the following
+ // n *two characters properly i.e. consider them as short integers as
+ // opposed to strings.
+ // Elements with Value Multiplicity > 1
+ // contain a set of integers (not a single one)
+ if (vr == "US" || vr == "SS")
+ {
nbInt = length / 2;
NewInt = ReadInt16();
s << NewInt;
- if (nbInt > 1){
- for (int i=1; i < nbInt; i++) {
+ if (nbInt > 1)
+ {
+ for (int i=1; i < nbInt; i++)
+ {
s << '\\';
NewInt = ReadInt16();
s << NewInt;
}
}
}
- // When integer(s) are expected, read and convert the following
- // n * four characters properly i.e. as integers as opposed to strings.
- // Elements with Value Multiplicity > 1
- // contain a set of integers (not a single one)
- else if (vr == "UL" || vr == "SL") {
+ // See above comment on multiple integers (mutatis mutandis).
+ else if (vr == "UL" || vr == "SL")
+ {
nbInt = length / 4;
NewInt = ReadInt32();
s << NewInt;
- if (nbInt > 1) {
- for (int i=1; i < nbInt; i++) {
+ if (nbInt > 1)
+ {
+ for (int i=1; i < nbInt; i++)
+ {
s << '\\';
NewInt = ReadInt32();
s << NewInt;
s << std::ends; // to avoid oddities on Solaris
#endif //GDCM_NO_ANSI_STRING_STREAM
- ((gdcmValEntry *)Entry)->SetValue(s.str());
+ ((ValEntry *)entry)->SetValue(s.str());
return;
}
- // We need an additional byte for storing \0 that is not on disk
- std::string NewValue(length,0);
- item_read = fread(&(NewValue[0]), (size_t)length, (size_t)1, fp);
- if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(Entry) ) {
- if ( item_read != 1 ) {
- dbg.Verbose(1, "gdcmDocument::LoadElementValue","unread element value");
- ValEntry->SetValue("gdcm::UnRead");
+ // FIXME: We need an additional byte for storing \0 that is not on disk
+ char *str = new char[length+1];
+ Fp->read(str, (size_t)length);
+ str[length] = '\0'; //this is only useful when length is odd
+ // Special DicomString call to properly handle \0 and even length
+ std::string newValue;
+ if( length % 2 )
+ {
+ newValue = Util::DicomString(str, length+1);
+ //dbg.Verbose(0, "Warning: bad length: ", length );
+ dbg.Verbose(0, "For string :", newValue.c_str());
+ // Since we change the length of string update it length
+ entry->SetReadLength(length+1);
+ }
+ else
+ {
+ newValue = Util::DicomString(str, length);
+ }
+ delete[] str;
+
+ if ( ValEntry* valEntry = dynamic_cast<ValEntry* >(entry) )
+ {
+ if ( Fp->fail() || Fp->eof())//Fp->gcount() == 1
+ {
+ dbg.Verbose(1, "Document::LoadDocEntry",
+ "unread element value");
+ valEntry->SetValue(GDCM_UNREAD);
return;
}
- if( (vr == "UI") ) // Because of correspondance with the VR dic
- ValEntry->SetValue(NewValue.c_str());
+ if( vr == "UI" )
+ {
+ // Because of correspondance with the VR dic
+ valEntry->SetValue(newValue);
+ }
else
- ValEntry->SetValue(NewValue);
- } else {
- // fusible
- std::cout << "Should have a ValEntry, here !" << std::endl;
+ {
+ valEntry->SetValue(newValue);
+ }
+ }
+ else
+ {
+ dbg.Error(true, "Document::LoadDocEntry"
+ "Should have a ValEntry, here !");
}
-
}
/**
* \brief Find the value Length of the passed Header Entry
- * @param Entry Header Entry whose length of the value shall be loaded.
+ * @param entry Header Entry whose length of the value shall be loaded.
*/
- void gdcmDocument::FindDocEntryLength (gdcmDocEntry *Entry) {
- guint16 element = Entry->GetElement();
- //guint16 group = Entry->GetGroup(); //FIXME
- std::string vr = Entry->GetVR();
- guint16 length16;
-
+void Document::FindDocEntryLength( DocEntry *entry )
+ throw ( FormatError )
+{
+ uint16_t element = entry->GetElement();
+ std::string vr = entry->GetVR();
+ uint16_t length16;
- if ( (Filetype == gdcmExplicitVR) && (! Entry->IsImplicitVR()) )
+ if ( Filetype == ExplicitVR && !entry->IsImplicitVR() )
{
- if ( (vr=="OB") || (vr=="OW") || (vr=="SQ") || (vr=="UN") )
+ if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UN" )
{
- // The following reserved two bytes (see PS 3.5-2001, section
- // 7.1.2 Data element structure with explicit vr p27) must be
+ // The following reserved two bytes (see PS 3.5-2003, section
+ // "7.1.2 Data element structure with explicit vr", p 27) must be
// skipped before proceeding on reading the length on 4 bytes.
- fseek(fp, 2L, SEEK_CUR);
- guint32 length32 = ReadInt32();
+ Fp->seekg( 2L, std::ios_base::cur);
+ uint32_t length32 = ReadInt32();
- if ( (vr == "OB") && (length32 == 0xffffffff) )
+ if ( (vr == "OB" || vr == "OW") && length32 == 0xffffffff )
{
- Entry->SetLength(FindDocEntryLengthOB());
+ uint32_t lengthOB;
+ try
+ {
+ /// \todo rename that to FindDocEntryLengthOBOrOW since
+ /// the above test is on both OB and OW...
+ lengthOB = FindDocEntryLengthOB();
+ }
+ catch ( FormatUnexpected )
+ {
+ // Computing the length failed (this happens with broken
+ // files like gdcm-JPEG-LossLess3a.dcm). We still have a
+ // chance to get the pixels by deciding the element goes
+ // until the end of the file. Hence we artificially fix the
+ // the length and proceed.
+ long currentPosition = Fp->tellg();
+ Fp->seekg(0L,std::ios_base::end);
+ long lengthUntilEOF = Fp->tellg() - currentPosition;
+ Fp->seekg(currentPosition, std::ios_base::beg);
+ entry->SetLength(lengthUntilEOF);
+ return;
+ }
+ entry->SetLength(lengthOB);
return;
}
- FixDocEntryFoundLength(Entry, length32);
+ FixDocEntryFoundLength(entry, length32);
return;
}
// endian encoding". When this is the case, chances are we have got our
// hands on a big endian encoded file: we switch the swap code to
// big endian and proceed...
- if ( (element == 0x0000) && (length16 == 0x0400) )
+ if ( element == 0x0000 && length16 == 0x0400 )
{
- if ( ! IsExplicitVRBigEndianTransferSyntax() )
+ TransferSyntaxType ts = GetTransferSyntax();
+ if ( ts != ExplicitVRBigEndian )
{
- dbg.Verbose(0, "gdcmDocument::FindLength", "not explicit VR");
- errno = 1;
+ throw FormatError( "Document::FindDocEntryLength()",
+ " not explicit VR." );
return;
}
length16 = 4;
SwitchSwapToBigEndian();
// Restore the unproperly loaded values i.e. the group, the element
// and the dictionary entry depending on them.
- guint16 CorrectGroup = SwapShort(Entry->GetGroup());
- guint16 CorrectElem = SwapShort(Entry->GetElement());
- gdcmDictEntry * NewTag = GetDictEntryByNumber(CorrectGroup,
- CorrectElem);
- if (!NewTag)
+ uint16_t correctGroup = SwapShort( entry->GetGroup() );
+ uint16_t correctElem = SwapShort( entry->GetElement() );
+ DictEntry* newTag = GetDictEntryByNumber( correctGroup,
+ correctElem );
+ if ( !newTag )
{
// This correct tag is not in the dictionary. Create a new one.
- NewTag = NewVirtualDictEntry(CorrectGroup, CorrectElem);
+ newTag = NewVirtualDictEntry(correctGroup, correctElem);
}
// FIXME this can create a memory leaks on the old entry that be
// left unreferenced.
- Entry->SetDictEntry(NewTag);
+ entry->SetDictEntry( newTag );
}
// Heuristic: well, some files are really ill-formed.
if ( length16 == 0xffff)
{
+ // 0xffff means that we deal with 'Unknown Length' Sequence
length16 = 0;
- // Length16= 0xffff means that we deal with
- // 'Unknown Length' Sequence
}
- FixDocEntryFoundLength(Entry, (guint32)length16);
+ FixDocEntryFoundLength( entry, (uint32_t)length16 );
return;
}
else
// not coexist in a Data Set and Data Sets nested within it".]
// Length is on 4 bytes.
- FixDocEntryFoundLength(Entry, ReadInt32());
+ FixDocEntryFoundLength( entry, ReadInt32() );
return;
}
}
/**
* \brief Find the Value Representation of the current Dicom Element.
- * @param Entry
+ * @param entry
*/
-void gdcmDocument::FindDocEntryVR( gdcmDocEntry *Entry)
+void Document::FindDocEntryVR( DocEntry *entry )
{
- if (Filetype != gdcmExplicitVR)
+ if ( Filetype != ExplicitVR )
+ {
return;
+ }
- char VR[3];
+ char vr[3];
- long PositionOnEntry = ftell(fp);
+ long positionOnEntry = Fp->tellg();
// Warning: we believe this is explicit VR (Value Representation) because
// we used a heuristic that found "UL" in the first tag. Alas this
// doesn't guarantee that all the tags will be in explicit VR. In some
// is in explicit VR and try to fix things if it happens not to be
// the case.
- (void)fread (&VR, (size_t)2,(size_t)1, fp);
- VR[2]=0;
- if(!CheckDocEntryVR(Entry,VR))
+ Fp->read (vr, (size_t)2);
+ vr[2] = 0;
+
+ if( !CheckDocEntryVR(entry, vr) )
{
- fseek(fp, PositionOnEntry, SEEK_SET);
+ Fp->seekg(positionOnEntry, std::ios_base::beg);
// When this element is known in the dictionary we shall use, e.g. for
// the semantics (see the usage of IsAnInteger), the VR proposed by the
// dictionary entry. Still we have to flag the element as implicit since
// we know now our assumption on expliciteness is not furfilled.
// avoid .
- if ( Entry->IsVRUnknown() )
- Entry->SetVR("Implicit");
- Entry->SetImplicitVR();
+ if ( entry->IsVRUnknown() )
+ {
+ entry->SetVR("Implicit");
+ }
+ entry->SetImplicitVR();
}
}
* \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 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
*/
-bool gdcmDocument::CheckDocEntryVR(gdcmDocEntry *Entry, VRKey vr)
+bool Document::CheckDocEntryVR(DocEntry *entry, VRKey vr)
{
- char msg[100]; // for sprintf
- bool RealExplicit = true;
+ std::string msg;
+ bool realExplicit = true;
// Assume we are reading a falsely explicit VR file i.e. we reached
// a tag where we expect reading a VR but are in fact we read the
// expected VR read happens to be non-ascii characters we consider
// we hit falsely explicit VR tag.
- if ( (!isalpha(vr[0])) && (!isalpha(vr[1])) )
- RealExplicit = false;
+ if ( !isalpha(vr[0]) && !isalpha(vr[1]) )
+ {
+ realExplicit = false;
+ }
// CLEANME searching the dicom_vr at each occurence is expensive.
// PostPone this test in an optional integrity check at the end
// of parsing or only in debug mode.
- if ( RealExplicit && !gdcmGlobal::GetVR()->Count(vr) )
- RealExplicit= false;
+ if ( realExplicit && !Global::GetVR()->Count(vr) )
+ {
+ realExplicit = false;
+ }
- if ( !RealExplicit )
+ if ( !realExplicit )
{
// We thought this was explicit VR, but we end up with an
// implicit VR tag. Let's backtrack.
- sprintf(msg,"Falsely explicit vr file (%04x,%04x)\n",
- Entry->GetGroup(),Entry->GetElement());
- dbg.Verbose(1, "gdcmDocument::FindVR: ",msg);
- if (Entry->GetGroup()%2 && Entry->GetElement() == 0x0000) { // Group length is UL !
- gdcmDictEntry* NewEntry = NewVirtualDictEntry(
- Entry->GetGroup(),Entry->GetElement(),
- "UL","FIXME","Group Length");
- Entry->SetDictEntry(NewEntry);
+ msg = Util::Format("Falsely explicit vr file (%04x,%04x)\n",
+ entry->GetGroup(), entry->GetElement());
+ dbg.Verbose(1, "Document::FindVR: ", msg.c_str());
+
+ if( entry->GetGroup() % 2 && entry->GetElement() == 0x0000)
+ {
+ // Group length is UL !
+ DictEntry* newEntry = NewVirtualDictEntry(
+ entry->GetGroup(), entry->GetElement(),
+ "UL", "FIXME", "Group Length");
+ entry->SetDictEntry( newEntry );
}
return false;
}
- if ( Entry->IsVRUnknown() )
+ if ( entry->IsVRUnknown() )
{
// When not a dictionary entry, we can safely overwrite the VR.
- if (Entry->GetElement() == 0x0000) { // Group length is UL !
- Entry->SetVR("UL");
- } else {
- Entry->SetVR(vr);
+ if( entry->GetElement() == 0x0000 )
+ {
+ // Group length is UL !
+ entry->SetVR("UL");
+ }
+ else
+ {
+ entry->SetVR(vr);
}
}
- else if ( Entry->GetVR() != vr )
+ else if ( entry->GetVR() != vr )
{
// The VR present in the file and the dictionary disagree. We assume
// the file writer knew best and use the VR of the file. Since it would
// be unwise to overwrite the VR of a dictionary (since it would
// compromise it's next user), we need to clone the actual DictEntry
// and change the VR for the read one.
- gdcmDictEntry* NewEntry = NewVirtualDictEntry(
- Entry->GetGroup(),Entry->GetElement(),
- vr,"FIXME",Entry->GetName());
- Entry->SetDictEntry(NewEntry);
+ DictEntry* newEntry = NewVirtualDictEntry(
+ entry->GetGroup(), entry->GetElement(),
+ vr, "FIXME", entry->GetName());
+ entry->SetDictEntry(newEntry);
}
+
return true;
}
* \brief Get the transformed value of the header entry. The VR value
* is used to define the transformation to operate on the value
* \warning NOT end user intended method !
- * @param Entry
+ * @param entry entry to tranform
* @return Transformed entry value
*/
-std::string gdcmDocument::GetDocEntryValue(gdcmDocEntry *Entry)
+std::string Document::GetDocEntryValue(DocEntry *entry)
{
- if ( (IsDocEntryAnInteger(Entry)) && (Entry->IsImplicitVR()) )
+ if ( IsDocEntryAnInteger(entry) && entry->IsImplicitVR() )
{
- std::string val=((gdcmValEntry *)Entry)->GetValue();
- std::string vr=Entry->GetVR();
- guint32 length = Entry->GetLength();
+ std::string val = ((ValEntry *)entry)->GetValue();
+ std::string vr = entry->GetVR();
+ uint32_t length = entry->GetLength();
std::ostringstream s;
int nbInt;
- // When short integer(s) are expected, read and convert the following
- // n * 2 bytes properly i.e. as a multivaluated strings
- // (each single value is separated fromthe next one by '\'
- // as usual for standard multivaluated filels
- // Elements with Value Multiplicity > 1
- // contain a set of short integers (not a single one)
+ // When short integer(s) are expected, read and convert the following
+ // n * 2 bytes properly i.e. as a multivaluated strings
+ // (each single value is separated fromthe next one by '\'
+ // as usual for standard multivaluated filels
+ // Elements with Value Multiplicity > 1
+ // contain a set of short integers (not a single one)
- if (vr == "US" || vr == "SS")
+ if( vr == "US" || vr == "SS" )
{
- guint16 NewInt16;
+ uint16_t newInt16;
nbInt = length / 2;
for (int i=0; i < nbInt; i++)
{
- if(i!=0)
+ if( i != 0 )
+ {
s << '\\';
- NewInt16 = (val[2*i+0]&0xFF)+((val[2*i+1]&0xFF)<<8);
- NewInt16 = SwapShort(NewInt16);
- s << NewInt16;
+ }
+ newInt16 = ( val[2*i+0] & 0xFF ) + ( ( val[2*i+1] & 0xFF ) << 8);
+ newInt16 = SwapShort( newInt16 );
+ s << newInt16;
}
}
- // When integer(s) are expected, read and convert the following
- // n * 4 bytes properly i.e. as a multivaluated strings
- // (each single value is separated fromthe next one by '\'
- // as usual for standard multivaluated filels
- // Elements with Value Multiplicity > 1
- // contain a set of integers (not a single one)
- else if (vr == "UL" || vr == "SL")
+ // When integer(s) are expected, read and convert the following
+ // n * 4 bytes properly i.e. as a multivaluated strings
+ // (each single value is separated fromthe next one by '\'
+ // as usual for standard multivaluated filels
+ // Elements with Value Multiplicity > 1
+ // contain a set of integers (not a single one)
+ else if( vr == "UL" || vr == "SL" )
{
- guint32 NewInt32;
+ uint32_t newInt32;
nbInt = length / 4;
for (int i=0; i < nbInt; i++)
{
- if(i!=0)
+ if( i != 0)
+ {
s << '\\';
- NewInt32= (val[4*i+0]&0xFF)+((val[4*i+1]&0xFF)<<8)+
- ((val[4*i+2]&0xFF)<<16)+((val[4*i+3]&0xFF)<<24);
- NewInt32=SwapLong(NewInt32);
- s << NewInt32;
+ }
+ newInt32 = ( val[4*i+0] & 0xFF )
+ + (( val[4*i+1] & 0xFF ) << 8 )
+ + (( val[4*i+2] & 0xFF ) << 16 )
+ + (( val[4*i+3] & 0xFF ) << 24 );
+ newInt32 = SwapLong( newInt32 );
+ s << newInt32;
}
}
#ifdef GDCM_NO_ANSI_STRING_STREAM
return s.str();
}
- return ((gdcmValEntry *)Entry)->GetValue();
+ return ((ValEntry *)entry)->GetValue();
}
/**
* value is used to define the reverse transformation to operate on
* the value
* \warning NOT end user intended method !
- * @param Entry
+ * @param entry Entry to reverse transform
* @return Reverse transformed entry value
*/
-std::string gdcmDocument::GetDocEntryUnvalue(gdcmDocEntry *Entry)
+std::string Document::GetDocEntryUnvalue(DocEntry* entry)
{
- if ( (IsDocEntryAnInteger(Entry)) && (Entry->IsImplicitVR()) )
+ if ( IsDocEntryAnInteger(entry) && entry->IsImplicitVR() )
{
- std::string vr=Entry->GetVR();
- std::ostringstream s;
+ std::string vr = entry->GetVR();
std::vector<std::string> tokens;
+ std::ostringstream s;
- if (vr == "US" || vr == "SS")
+ if ( vr == "US" || vr == "SS" )
{
- guint16 NewInt16;
+ uint16_t newInt16;
- tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
- Tokenize (((gdcmValEntry *)Entry)->GetValue(), tokens, "\\");
- for (unsigned int i=0; i<tokens.size();i++)
+ tokens.erase( tokens.begin(), tokens.end()); // clean any previous value
+ Util::Tokenize (((ValEntry *)entry)->GetValue(), tokens, "\\");
+ for (unsigned int i=0; i<tokens.size(); i++)
{
- NewInt16 = atoi(tokens[i].c_str());
- s<<(NewInt16&0xFF)<<((NewInt16>>8)&0xFF);
+ newInt16 = atoi(tokens[i].c_str());
+ s << ( newInt16 & 0xFF )
+ << (( newInt16 >> 8 ) & 0xFF );
}
tokens.clear();
}
- if (vr == "UL" || vr == "SL")
+ if ( vr == "UL" || vr == "SL")
{
- guint32 NewInt32;
+ uint32_t newInt32;
tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
- Tokenize (((gdcmValEntry *)Entry)->GetValue(), tokens, "\\");
+ Util::Tokenize (((ValEntry *)entry)->GetValue(), tokens, "\\");
for (unsigned int i=0; i<tokens.size();i++)
{
- NewInt32 = atoi(tokens[i].c_str());
- s<<(char)(NewInt32&0xFF)<<(char)((NewInt32>>8)&0xFF)
- <<(char)((NewInt32>>16)&0xFF)<<(char)((NewInt32>>24)&0xFF);
+ newInt32 = atoi(tokens[i].c_str());
+ s << (char)( newInt32 & 0xFF )
+ << (char)(( newInt32 >> 8 ) & 0xFF )
+ << (char)(( newInt32 >> 16 ) & 0xFF )
+ << (char)(( newInt32 >> 24 ) & 0xFF );
}
tokens.clear();
}
return s.str();
}
- return ((gdcmValEntry *)Entry)->GetValue();
+ return ((ValEntry *)entry)->GetValue();
}
/**
* \brief Skip a given Header Entry
* \warning NOT end user intended method !
- * @param entry
+ * @param entry entry to skip
*/
-void gdcmDocument::SkipDocEntry(gdcmDocEntry *entry)
+void Document::SkipDocEntry(DocEntry *entry)
{
SkipBytes(entry->GetLength());
}
/**
* \brief Skips to the begining of the next Header Entry
* \warning NOT end user intended method !
- * @param entry
+ * @param entry entry to skip
*/
-void gdcmDocument::SkipToNextDocEntry(gdcmDocEntry *entry)
+void Document::SkipToNextDocEntry(DocEntry *entry)
{
- (void)fseek(fp, (long)(entry->GetOffset()), SEEK_SET);
- (void)fseek(fp, (long)(entry->GetReadLength()), SEEK_CUR);
+ Fp->seekg((long)(entry->GetOffset()), std::ios_base::beg);
+ Fp->seekg( (long)(entry->GetReadLength()), std::ios_base::cur);
}
/**
* \brief When the length of an element value is obviously wrong (because
* the parser went Jabberwocky) one can hope improving things by
* applying some heuristics.
+ * @param entry entry to check
+ * @param foundLength fist assumption about length
*/
-void gdcmDocument::FixDocEntryFoundLength(gdcmDocEntry *Entry,
- guint32 FoundLength)
+void Document::FixDocEntryFoundLength(DocEntry *entry,
+ uint32_t foundLength)
{
- Entry->SetReadLength(FoundLength); // will be updated only if a bug is found
- if ( FoundLength == 0xffffffff) {
- FoundLength = 0;
+ entry->SetReadLength( foundLength ); // will be updated only if a bug is found
+ if ( foundLength == 0xffffffff)
+ {
+ foundLength = 0;
}
- guint16 gr =Entry->GetGroup();
- guint16 el =Entry->GetElement();
+ uint16_t gr = entry->GetGroup();
+ uint16_t el = entry->GetElement();
- if (FoundLength%2) {
+ if ( foundLength % 2)
+ {
std::ostringstream s;
s << "Warning : Tag with uneven length "
- << FoundLength
+ << foundLength
<< " in x(" << std::hex << gr << "," << el <<")" << std::dec;
dbg.Verbose(0, s.str().c_str());
}
// are no longer in user (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 ( foundLength == 13)
+ {
+ // Only happens for this length !
+ if ( entry->GetGroup() != 0x0008
+ || ( entry->GetElement() != 0x0070
+ && entry->GetElement() != 0x0080 ) )
{
- FoundLength = 10;
- Entry->SetReadLength(10); /// \todo a bug is to be fixed !?
+ 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 ( entry->GetGroup() == 0x0009
+ && ( entry->GetElement() == 0x1113
+ || entry->GetElement() == 0x1114 ) )
{
- FoundLength = 4;
- Entry->SetReadLength(4); /// \todo a bug is to be fixed !?
+ foundLength = 4;
+ entry->SetReadLength(4); /// \todo a bug is to be fixed !?
}
- //////// Deal with sequences, but only on users request:
- else
- if ( ( Entry->GetVR() == "SQ") && enableSequences)
+ else if ( entry->GetVR() == "SQ" )
{
- FoundLength = 0; // ReadLength is unchanged
+ foundLength = 0; // ReadLength is unchanged
}
//////// 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( entry->GetGroup() == 0xfffe )
{
// According to the norm, fffe|0000 shouldn't exist. BUT the Philips
// image gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm happens to
// causes extra troubles...
- if( Entry->GetElement() != 0x0000 )
+ if( entry->GetElement() != 0x0000 )
{
- FoundLength = 0;
+ foundLength = 0;
}
}
- Entry->SetUsableLength(FoundLength);
+ entry->SetUsableLength(foundLength);
}
/**
* \brief Apply some heuristics to predict whether the considered
* element value contains/represents an integer or not.
- * @param Entry The element value on which to apply the predicate.
+ * @param entry The element value on which to apply the predicate.
* @return The result of the heuristical predicate.
*/
-bool gdcmDocument::IsDocEntryAnInteger(gdcmDocEntry *Entry) {
- guint16 element = Entry->GetElement();
- guint16 group = Entry->GetGroup();
- std::string vr = Entry->GetVR();
- guint32 length = Entry->GetLength();
+bool Document::IsDocEntryAnInteger(DocEntry *entry)
+{
+ uint16_t element = entry->GetElement();
+ uint16_t group = entry->GetGroup();
+ 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
// a priori know we are dealing with an integer, then we shall be
// able to swap it's element value properly.
if ( element == 0 ) // This is the group length of the group
{
- if (length == 4)
+ if ( length == 4 )
+ {
return true;
+ }
else
{
// Allthough this should never happen, still some images have a
// encounter such an ill-formed image, we simply display a warning
// message and proceed on parsing (while crossing fingers).
std::ostringstream s;
- int filePosition = ftell(fp);
+ long filePosition = Fp->tellg();
s << "Erroneous Group Length element length on : (" \
<< std::hex << group << " , " << element
<< ") -before- position x(" << filePosition << ")"
<< "lgt : " << length;
- dbg.Verbose(0, "gdcmDocument::IsDocEntryAnInteger", s.str().c_str() );
+ dbg.Verbose(0, "Document::IsDocEntryAnInteger", s.str().c_str() );
}
}
- if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") )
+ if ( vr == "UL" || vr == "US" || vr == "SL" || vr == "SS" )
+ {
return true;
+ }
return false;
}
* @return
*/
- guint32 gdcmDocument::FindDocEntryLengthOB(void) {
+uint32_t Document::FindDocEntryLengthOB()
+ throw( FormatUnexpected )
+{
// See PS 3.5-2001, section A.4 p. 49 on encapsulation of encoded pixel data.
- guint16 g;
- guint16 n;
- long PositionOnEntry = ftell(fp);
- bool FoundSequenceDelimiter = false;
- guint32 TotalLength = 0;
- guint32 ItemLength;
-
- while ( ! FoundSequenceDelimiter)
- {
- g = ReadInt16();
- n = ReadInt16();
- if (errno == 1)
- return 0;
- TotalLength += 4; // We even have to decount the group and element
+ long positionOnEntry = Fp->tellg();
+ bool foundSequenceDelimiter = false;
+ uint32_t totalLength = 0;
+
+ while ( !foundSequenceDelimiter )
+ {
+ uint16_t group;
+ uint16_t elem;
+ try
+ {
+ group = ReadInt16();
+ elem = ReadInt16();
+ }
+ catch ( FormatError )
+ {
+ throw FormatError("Document::FindDocEntryLengthOB()",
+ " group or element not present.");
+ }
+
+ // We have to decount the group and element we just read
+ totalLength += 4;
- if ( g != 0xfffe && g!=0xb00c ) //for bogus header
+ if ( group != 0xfffe || ( ( elem != 0xe0dd ) && ( elem != 0xe000 ) ) )
{
- char msg[100]; // for sprintf. Sorry
- sprintf(msg,"wrong group (%04x) for an item sequence (%04x,%04x)\n",g, g,n);
- dbg.Verbose(1, "gdcmDocument::FindLengthOB: ",msg);
- errno = 1;
- return 0;
+ dbg.Verbose(1, "Document::FindDocEntryLengthOB: neither an Item "
+ "tag nor a Sequence delimiter tag.");
+ Fp->seekg(positionOnEntry, std::ios_base::beg);
+ throw FormatUnexpected("Document::FindDocEntryLengthOB()",
+ "Neither an Item tag nor a Sequence "
+ "delimiter tag.");
+ }
+
+ if ( elem == 0xe0dd )
+ {
+ foundSequenceDelimiter = true;
}
- if ( n == 0xe0dd || ( g==0xb00c && n==0x0eb6 ) ) // for bogus header
- FoundSequenceDelimiter = true;
- else if ( n != 0xe000 )
+
+ uint32_t itemLength = ReadInt32();
+ // We add 4 bytes since we just read the ItemLength with ReadInt32
+ totalLength += itemLength + 4;
+ SkipBytes(itemLength);
+
+ if ( foundSequenceDelimiter )
{
- char msg[100]; // for sprintf. Sorry
- sprintf(msg,"wrong element (%04x) for an item sequence (%04x,%04x)\n",
- n, g,n);
- dbg.Verbose(1, "gdcmDocument::FindLengthOB: ",msg);
- errno = 1;
- return 0;
+ break;
}
- ItemLength = ReadInt32();
- TotalLength += ItemLength + 4; // We add 4 bytes since we just read
- // the ItemLength with ReadInt32
- SkipBytes(ItemLength);
}
- fseek(fp, PositionOnEntry, SEEK_SET);
- return TotalLength;
+ Fp->seekg( positionOnEntry, std::ios_base::beg);
+ return totalLength;
}
/**
* (swaps it depending on processor endianity)
* @return read value
*/
-guint16 gdcmDocument::ReadInt16() {
- guint16 g;
- size_t item_read;
- item_read = fread (&g, (size_t)2,(size_t)1, fp);
- if ( item_read != 1 ) {
- if(ferror(fp))
- dbg.Verbose(0, "gdcmDocument::ReadInt16", " File Error");
- errno = 1;
- return 0;
+uint16_t Document::ReadInt16()
+ throw( FormatError )
+{
+ uint16_t g;
+ Fp->read ((char*)&g, (size_t)2);
+ if ( Fp->fail() )
+ {
+ throw FormatError( "Document::ReadInt16()", " file error." );
+ }
+ if( Fp->eof() )
+ {
+ throw FormatError( "Document::ReadInt16()", "EOF." );
}
- errno = 0;
- g = SwapShort(g);
+ g = SwapShort(g);
return g;
}
* (swaps it depending on processor endianity)
* @return read value
*/
-guint32 gdcmDocument::ReadInt32() {
- guint32 g;
- size_t item_read;
- item_read = fread (&g, (size_t)4,(size_t)1, fp);
- if ( item_read != 1 ) {
- if(ferror(fp))
- dbg.Verbose(0, "gdcmDocument::ReadInt32", " File Error");
- errno = 1;
- return 0;
+uint32_t Document::ReadInt32()
+ throw( FormatError )
+{
+ uint32_t g;
+ Fp->read ((char*)&g, (size_t)4);
+ if ( Fp->fail() )
+ {
+ throw FormatError( "Document::ReadInt32()", " file error." );
+ }
+ if( Fp->eof() )
+ {
+ throw FormatError( "Document::ReadInt32()", "EOF." );
}
- errno = 0;
g = SwapLong(g);
return g;
}
* \warning NOT end user intended method !
* @return
*/
-void gdcmDocument::SkipBytes(guint32 NBytes) {
+void Document::SkipBytes(uint32_t nBytes)
+{
//FIXME don't dump the returned value
- (void)fseek(fp, (long)NBytes, SEEK_CUR);
+ Fp->seekg((long)nBytes, std::ios_base::cur);
}
/**
* \brief Loads all the needed Dictionaries
* \warning NOT end user intended method !
*/
-void gdcmDocument::Initialise(void)
+void Document::Initialise()
{
- RefPubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict();
+ RefPubDict = Global::GetDicts()->GetDefaultPubDict();
RefShaDict = NULL;
+ RLEInfo = new RLEFramesInfo;
+ JPEGInfo = new JPEGFragmentsInfo;
}
/**
* it's neither ACR-NEMA nor DICOM
* true when we hope ours assuptions are OK
*/
-bool gdcmDocument::CheckSwap() {
-
+bool Document::CheckSwap()
+{
// The only guaranted way of finding the swap code is to find a
// group tag since we know it's length has to be of four bytes i.e.
// 0x00000004. Finding the swap code in then straigthforward. Trouble
// occurs when we can't find such group...
- guint32 x=4; // x : for ntohs
+ uint32_t x = 4; // x : for ntohs
bool net2host; // true when HostByteOrder is the same as NetworkByteOrder
- guint32 s32;
- guint16 s16;
+ uint32_t s32;
+ uint16_t s16;
- int lgrLue;
- char *entCur;
- char deb[HEADER_LENGTH_TO_READ];
+ char deb[256]; //HEADER_LENGTH_TO_READ];
// First, compare HostByteOrder and NetworkByteOrder in order to
// determine if we shall need to swap bytes (i.e. the Endian type).
- if (x==ntohs(x))
+ if ( x == ntohs(x) )
+ {
net2host = true;
+ }
else
- net2host = false;
+ {
+ net2host = false;
+ }
// The easiest case is the one of a DICOM header, since it possesses a
// file preamble where it suffice to look for the string "DICM".
- lgrLue = fread(deb, 1, HEADER_LENGTH_TO_READ, fp);
+ Fp->read(deb, HEADER_LENGTH_TO_READ);
- entCur = deb + 128;
- if(memcmp(entCur, "DICM", (size_t)4) == 0) {
- dbg.Verbose(1, "gdcmDocument::CheckSwap:", "looks like DICOM Version3");
+ char *entCur = deb + 128;
+ if( memcmp(entCur, "DICM", (size_t)4) == 0 )
+ {
+ dbg.Verbose(1, "Document::CheckSwap:", "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"
// but elem 0002,0010 (Transfert Syntax) tells us the file is
// *Implicit* VR. -and it is !-
- if( (memcmp(entCur, "UL", (size_t)2) == 0) ||
- (memcmp(entCur, "OB", (size_t)2) == 0) ||
- (memcmp(entCur, "UI", (size_t)2) == 0) ||
- (memcmp(entCur, "CS", (size_t)2) == 0) ) // CS, to remove later
+ if( memcmp(entCur, "UL", (size_t)2) == 0 ||
+ memcmp(entCur, "OB", (size_t)2) == 0 ||
+ memcmp(entCur, "UI", (size_t)2) == 0 ||
+ memcmp(entCur, "CS", (size_t)2) == 0 ) // CS, to remove later
// when Write DCM *adds*
// FIXME
- // Use gdcmDocument::dicom_vr to test all the possibilities
+ // Use Document::dicom_vr to test all the possibilities
// instead of just checking for UL, OB and UI !? group 0000
{
- Filetype = gdcmExplicitVR;
- dbg.Verbose(1, "gdcmDocument::CheckSwap:",
+ Filetype = ExplicitVR;
+ dbg.Verbose(1, "Document::CheckSwap:",
"explicit Value Representation");
}
else
{
- Filetype = gdcmImplicitVR;
- dbg.Verbose(1, "gdcmDocument::CheckSwap:",
+ Filetype = ImplicitVR;
+ dbg.Verbose(1, "Document::CheckSwap:",
"not an explicit Value Representation");
}
- if (net2host)
+ if ( net2host )
{
- sw = 4321;
- dbg.Verbose(1, "gdcmDocument::CheckSwap:",
+ SwapCode = 4321;
+ dbg.Verbose(1, "Document::CheckSwap:",
"HostByteOrder != NetworkByteOrder");
- }
+ }
else
{
- sw = 0;
- dbg.Verbose(1, "gdcmDocument::CheckSwap:",
+ SwapCode = 0;
+ dbg.Verbose(1, "Document::CheckSwap:",
"HostByteOrder = NetworkByteOrder");
}
// Position the file position indicator at first tag (i.e.
// after the file preamble and the "DICM" string).
- rewind(fp);
- fseek (fp, 132L, SEEK_SET);
+ Fp->seekg(0, std::ios_base::beg);
+ Fp->seekg ( 132L, std::ios_base::beg);
return true;
} // End of DicomV3
// 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, "gdcmDocument::CheckSwap:", "not a DICOM Version3 file");
- rewind(fp);
+ dbg.Verbose(1, "Document::CheckSwap:", "not a DICOM Version3 file");
+ Fp->seekg(0, std::ios_base::beg);
// Our next best chance would be to be considering a 'clean' ACR/NEMA file.
// By clean we mean that the length of the first tag is written down.
// We assume the array of char we are considering contains the binary
// representation of a 32 bits integer. Hence the following dirty
// trick :
- s32 = *((guint32 *)(entCur));
+ s32 = *((uint32_t *)(entCur));
- switch (s32) {
+ switch( s32 )
+ {
case 0x00040000 :
- sw = 3412;
- Filetype = gdcmACR;
+ SwapCode = 3412;
+ Filetype = ACR;
return true;
case 0x04000000 :
- sw = 4321;
- Filetype = gdcmACR;
+ SwapCode = 4321;
+ Filetype = ACR;
return true;
case 0x00000400 :
- sw = 2143;
- Filetype = gdcmACR;
+ SwapCode = 2143;
+ Filetype = ACR;
return true;
case 0x00000004 :
- sw = 0;
- Filetype = gdcmACR;
+ SwapCode = 0;
+ Filetype = ACR;
return true;
default :
-
- // We are out of luck. It is not a DicomV3 nor a 'clean' ACR/NEMA file.
- // It is time for despaired wild guesses.
- // So, let's check if this file wouldn't happen to be 'dirty' ACR/NEMA,
- // i.e. the 'group length' element is not present :
-
- // check the supposed to be 'group number'
- // 0x0002 or 0x0004 or 0x0008
- // to determine ' sw' value .
- // Only 0 or 4321 will be possible
- // (no oportunity to check for the formerly well known
- // ACR-NEMA 'Bad Big Endian' or 'Bad Little Endian'
- // if unsuccessfull (i.e. neither 0x0002 nor 0x0200 etc -4, 8-)
- // the file IS NOT ACR-NEMA nor DICOM V3
- // Find a trick to tell it the caller...
+ // We are out of luck. It is not a DicomV3 nor a 'clean' ACR/NEMA file.
+ // It is time for despaired wild guesses.
+ // So, let's check if this file wouldn't happen to be 'dirty' ACR/NEMA,
+ // i.e. the 'group length' element is not present :
+
+ // check the supposed to be 'group number'
+ // 0x0002 or 0x0004 or 0x0008
+ // to determine ' SwapCode' value .
+ // Only 0 or 4321 will be possible
+ // (no oportunity to check for the formerly well known
+ // ACR-NEMA 'Bad Big Endian' or 'Bad Little Endian'
+ // if unsuccessfull (i.e. neither 0x0002 nor 0x0200 etc -4, 8-)
+ // the file IS NOT ACR-NEMA nor DICOM V3
+ // Find a trick to tell it the caller...
- s16 = *((guint16 *)(deb));
+ s16 = *((uint16_t *)(deb));
- switch (s16) {
- case 0x0002 :
- case 0x0004 :
- case 0x0008 :
- sw = 0;
- Filetype = gdcmACR;
- return true;
- case 0x0200 :
- case 0x0400 :
- case 0x0800 :
- sw = 4321;
- Filetype = gdcmACR;
- return true;
- default :
- dbg.Verbose(0, "gdcmDocument::CheckSwap:",
+ switch ( s16 )
+ {
+ case 0x0002 :
+ case 0x0004 :
+ case 0x0008 :
+ SwapCode = 0;
+ Filetype = ACR;
+ return true;
+ case 0x0200 :
+ case 0x0400 :
+ case 0x0800 :
+ SwapCode = 4321;
+ Filetype = ACR;
+ return true;
+ default :
+ dbg.Verbose(0, "Document::CheckSwap:",
"ACR/NEMA unfound swap info (Really hopeless !)");
- Filetype = gdcmUnknown;
- return false;
- }
-
- // Then the only info we have is the net2host one.
- //if (! net2host )
- // sw = 0;
+ Filetype = Unknown;
+ return false;
+ }
+ // Then the only info we have is the net2host one.
+ //if (! net2host )
+ // SwapCode = 0;
//else
- // sw = 4321;
+ // SwapCode = 4321;
//return;
}
}
* \brief Restore the unproperly loaded values i.e. the group, the element
* and the dictionary entry depending on them.
*/
-void gdcmDocument::SwitchSwapToBigEndian(void)
+void Document::SwitchSwapToBigEndian()
{
- dbg.Verbose(1, "gdcmDocument::SwitchSwapToBigEndian",
+ dbg.Verbose(1, "Document::SwitchSwapToBigEndian",
"Switching to BigEndian mode.");
- if ( sw == 0 )
+ if ( SwapCode == 0 )
{
- sw = 4321;
- return;
+ SwapCode = 4321;
}
- if ( sw == 4321 )
+ else if ( SwapCode == 4321 )
{
- sw = 0;
- return;
+ SwapCode = 0;
}
- if ( sw == 3412 )
+ else if ( SwapCode == 3412 )
{
- sw = 2143;
- return;
+ SwapCode = 2143;
+ }
+ else if ( SwapCode == 2143 )
+ {
+ SwapCode = 3412;
}
- if ( sw == 2143 )
- sw = 3412;
}
/**
* \brief during parsing, Header Elements too long are not loaded in memory
- * @param NewSize
+ * @param newSize
*/
-void gdcmDocument::SetMaxSizeLoadEntry(long NewSize)
+void Document::SetMaxSizeLoadEntry(long newSize)
{
- if (NewSize < 0)
+ if ( newSize < 0 )
+ {
return;
- if ((guint32)NewSize >= (guint32)0xffffffff)
+ }
+ if ((uint32_t)newSize >= (uint32_t)0xffffffff )
{
MaxSizeLoadEntry = 0xffffffff;
return;
}
- MaxSizeLoadEntry = NewSize;
+ MaxSizeLoadEntry = newSize;
}
/**
* \brief Header Elements too long will not be printed
- * \todo See comments of \ref gdcmDocument::MAX_SIZE_PRINT_ELEMENT_VALUE
- * @param NewSize
+ * \todo See comments of \ref Document::MAX_SIZE_PRINT_ELEMENT_VALUE
+ * @param newSize
*/
-void gdcmDocument::SetMaxSizePrintEntry(long NewSize)
+void Document::SetMaxSizePrintEntry(long newSize)
{
- if (NewSize < 0)
+ //DOH !! This is exactly SetMaxSizeLoadEntry FIXME FIXME
+ if ( newSize < 0 )
+ {
return;
- if ((guint32)NewSize >= (guint32)0xffffffff)
+ }
+ if ((uint32_t)newSize >= (uint32_t)0xffffffff )
{
MaxSizePrintEntry = 0xffffffff;
return;
}
- MaxSizePrintEntry = NewSize;
+ MaxSizePrintEntry = newSize;
}
+/**
+ * \brief Handle broken private tag from Philips NTSCAN
+ * where the endianess is being switch to BigEndian for no
+ * apparent reason
+ * @return no return
+ */
+void Document::HandleBrokenEndian(uint16_t group, uint16_t elem)
+{
+ // Endian reversion. Some files contain groups of tags with reversed endianess.
+ static int reversedEndian = 0;
+ // try to fix endian switching in the middle of headers
+ if ((group == 0xfeff) && (elem == 0x00e0))
+ {
+ // start endian swap mark for group found
+ reversedEndian++;
+ SwitchSwapToBigEndian();
+ // fix the tag
+ group = 0xfffe;
+ elem = 0xe000;
+ }
+ else if ((group == 0xfffe) && (elem == 0xe00d) && reversedEndian)
+ {
+ // end of reversed endian group
+ reversedEndian--;
+ SwitchSwapToBigEndian();
+ }
+
+}
+
/**
* \brief Read the next tag but WITHOUT loading it's value
* (read the 'Group Number', the 'Element Number',
* gets the VR, gets the length, gets the offset value)
* @return On succes the newly created DocEntry, NULL on failure.
*/
-gdcmDocEntry *gdcmDocument::ReadNextDocEntry(void) {
- guint16 g,n;
- gdcmDocEntry *NewEntry;
- g = ReadInt16();
- n = ReadInt16();
-
- if (errno == 1)
+DocEntry* Document::ReadNextDocEntry()
+{
+ uint16_t group;
+ uint16_t elem;
+
+ try
+ {
+ group = ReadInt16();
+ elem = ReadInt16();
+ }
+ catch ( FormatError e )
+ {
// We reached the EOF (or an error occured) therefore
// header parsing has to be considered as finished.
- return (gdcmDocEntry *)0;
+ //std::cout << e;
+ return 0;
+ }
- NewEntry = NewDocEntryByNumber(g, n);
- FindDocEntryVR(NewEntry);
- FindDocEntryLength(NewEntry);
+ HandleBrokenEndian(group, elem);
+ DocEntry *newEntry = NewDocEntryByNumber(group, elem);
+ FindDocEntryVR(newEntry);
- if (errno == 1) {
+ try
+ {
+ FindDocEntryLength(newEntry);
+ }
+ catch ( FormatError e )
+ {
// Call it quits
- delete NewEntry;
- return NULL;
+ //std::cout << e;
+ delete newEntry;
+ return 0;
}
- NewEntry->SetOffset(ftell(fp));
- return NewEntry;
+
+ newEntry->SetOffset(Fp->tellg());
+
+ return newEntry;
}
* @param group The generated tag must belong to this group.
* @return The element of tag with given group which is fee.
*/
-guint32 gdcmDocument::GenerateFreeTagKeyInGroup(guint16 group)
+uint32_t Document::GenerateFreeTagKeyInGroup(uint16_t group)
{
- for (guint32 elem = 0; elem < UINT32_MAX; elem++)
+ for (uint32_t elem = 0; elem < UINT32_MAX; elem++)
{
- TagKey key = gdcmDictEntry::TranslateToKey(group, elem);
- if (tagHT.count(key) == 0)
+ TagKey key = DictEntry::TranslateToKey(group, elem);
+ if (TagHT.count(key) == 0)
+ {
return elem;
+ }
}
return UINT32_MAX;
}
-
/**
- * \brief Assuming the internal file pointer \ref gdcmDocument::fp
- * is placed at the beginning of a tag (TestGroup, TestElement),
- * read the length associated to the Tag.
- * \warning On success the internal file pointer \ref gdcmDocument::fp
- * is modified to point after the tag and it's length.
+ * \brief Assuming the internal file pointer \ref Document::Fp
+ * is placed at the beginning of a tag check whether this
+ * tag is (TestGroup, TestElement).
+ * \warning On success the internal file pointer \ref Document::Fp
+ * is modified to point after the tag.
* On failure (i.e. when the tag wasn't the expected tag
* (TestGroup, TestElement) the internal file pointer
- * \ref gdcmDocument::fp is restored to it's original position.
- * @param TestGroup The expected group of the tag.
- * @param TestElement The expected Element of the tag.
- * @return On success returns the length associated to the tag. On failure
- * returns 0.
+ * \ref Document::Fp is restored to it's original position.
+ * @param testGroup The expected group of the tag.
+ * @param testElement The expected Element of the tag.
+ * @return True on success, false otherwise.
*/
-guint32 gdcmDocument::ReadTagLength(guint16 TestGroup, guint16 TestElement)
+bool Document::ReadTag(uint16_t testGroup, uint16_t testElement)
{
- guint16 ItemTagGroup;
- guint16 ItemTagElement;
- long PositionOnEntry = ftell(fp);
- long CurrentPosition = ftell(fp); // On debugging purposes
+ long positionOnEntry = Fp->tellg();
+ long currentPosition = Fp->tellg(); // On debugging purposes
//// Read the Item Tag group and element, and make
- // sure they are respectively 0xfffe and 0xe000:
- ItemTagGroup = ReadInt16();
- ItemTagElement = ReadInt16();
- if ( (ItemTagGroup != TestGroup) || (ItemTagElement != TestElement ) )
+ // sure they are what we expected:
+ uint16_t itemTagGroup;
+ uint16_t itemTagElement;
+ try
+ {
+ itemTagGroup = ReadInt16();
+ itemTagElement = ReadInt16();
+ }
+ catch ( FormatError e )
+ {
+ //std::cerr << e << std::endl;
+ return false;
+ }
+ if ( itemTagGroup != testGroup || itemTagElement != testElement )
{
std::ostringstream s;
s << " We should have found tag (";
- s << std::hex << TestGroup << "," << TestElement << ")" << std::endl;
+ s << std::hex << testGroup << "," << testElement << ")" << std::endl;
s << " but instead we encountered tag (";
- s << std::hex << ItemTagGroup << "," << ItemTagElement << ")"
+ s << std::hex << itemTagGroup << "," << itemTagElement << ")"
<< std::endl;
- s << " at address: " << (unsigned)CurrentPosition << std::endl;
- dbg.Verbose(0, "gdcmDocument::ReadItemTagLength: wrong Item Tag found:");
+ s << " at address: " << (unsigned)currentPosition << std::endl;
+ dbg.Verbose(0, "Document::ReadItemTagLength: wrong Item Tag found:");
dbg.Verbose(0, s.str().c_str());
- fseek(fp, PositionOnEntry, SEEK_SET);
+ Fp->seekg(positionOnEntry, std::ios_base::beg);
+
+ return false;
+ }
+ return true;
+}
+
+/**
+ * \brief Assuming the internal file pointer \ref Document::Fp
+ * is placed at the beginning of a tag (TestGroup, TestElement),
+ * read the length associated to the Tag.
+ * \warning On success the internal file pointer \ref Document::Fp
+ * is modified to point after the tag and it's length.
+ * On failure (i.e. when the tag wasn't the expected tag
+ * (TestGroup, TestElement) the internal file pointer
+ * \ref Document::Fp is restored to it's original position.
+ * @param testGroup The expected group of the tag.
+ * @param testElement The expected Element of the tag.
+ * @return On success returns the length associated to the tag. On failure
+ * returns 0.
+ */
+uint32_t Document::ReadTagLength(uint16_t testGroup, uint16_t testElement)
+{
+ long positionOnEntry = Fp->tellg();
+ (void)positionOnEntry;
+
+ if ( !ReadTag(testGroup, testElement) )
+ {
return 0;
}
//// Then read the associated Item Length
- CurrentPosition=ftell(fp);
- guint32 ItemLength;
- ItemLength = ReadInt32();
+ 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, "gdcmDocument::ReadItemTagLength: ", s.str().c_str());
+ << itemLength << std::endl;
+ s << " at address: " << (unsigned)currentPosition << std::endl;
+ dbg.Verbose(0, "Document::ReadItemTagLength: ", s.str().c_str());
}
- return ItemLength;
+ return itemLength;
}
/**
- * \brief Read the length of an exptected Item tag i.e. (0xfffe, 0xe000).
- * \sa \ref gdcmDocument::ReadTagLength
- * \warning See warning of \ref gdcmDocument::ReadTagLength
- * @return On success returns the length associated to the item tag.
- * On failure returns 0.
- */
-guint32 gdcmDocument::ReadItemTagLength(void)
+ * \brief When parsing the Pixel Data of an encapsulated file, read
+ * the basic offset table (when present, and BTW dump it).
+ */
+void Document::ReadAndSkipEncapsulatedBasicOffsetTable()
{
- return ReadTagLength(0xfffe, 0xe000);
+ //// Read the Basic Offset Table Item Tag length...
+ uint32_t itemLength = ReadTagLength(0xfffe, 0xe000);
+
+ // When present, read the basic offset table itself.
+ // Notes: - since the presence of this basic offset table is optional
+ // we can't rely on it for the implementation, and we will simply
+ // trash it's content (when present).
+ // - still, when present, we could add some further checks on the
+ // lengths, but we won't bother with such fuses for the time being.
+ if ( itemLength != 0 )
+ {
+ char* basicOffsetTableItemValue = new char[itemLength + 1];
+ Fp->read(basicOffsetTableItemValue, itemLength);
+
+#ifdef GDCM_DEBUG
+ for (unsigned int i=0; i < itemLength; i += 4 )
+ {
+ 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());
+ }
+#endif //GDCM_DEBUG
+
+ delete[] basicOffsetTableItemValue;
+ }
}
/**
- * \brief Read the length of an expected Sequence Delimiter tag i.e.
- * (0xfffe, 0xe0dd).
- * \sa \ref gdcmDocument::ReadTagLength
- * \warning See warning of \ref gdcmDocument::ReadTagLength
- * @return On success returns the length associated to the Sequence
- * Delimiter tag. On failure returns 0.
+ * \brief Parse pixel data from disk of [multi-]fragment RLE encoding.
+ * Compute the RLE extra information and store it in \ref RLEInfo
+ * for later pixel retrieval usage.
*/
-guint32 gdcmDocument::ReadSequenceDelimiterTagLength(void)
+void Document::ComputeRLEInfo()
{
- return ReadTagLength(0xfffe, 0xe0dd);
-}
+ TransferSyntaxType ts = GetTransferSyntax();
+ if ( ts != RLELossless )
+ {
+ return;
+ }
+
+ // Encoded pixel data: for the time being we are only concerned with
+ // Jpeg or RLE Pixel data encodings.
+ // As stated in PS 3.5-2003, section 8.2 p44:
+ // "If sent in Encapsulated Format (i.e. other than the Native Format) the
+ // value representation OB is used".
+ // Hence we expect an OB value representation. Concerning OB VR,
+ // the section PS 3.5-2003, section A.4.c p 58-59, states:
+ // "For the Value Representations OB and OW, the encoding shall meet the
+ // following specifications depending on the Data element tag:"
+ // [...snip...]
+ // - the first item in the sequence of items before the encoded pixel
+ // data stream shall be basic offset table item. The basic offset table
+ // item value, however, is not required to be present"
+
+ ReadAndSkipEncapsulatedBasicOffsetTable();
+
+ // Encapsulated RLE Compressed Images (see PS 3.5-2003, Annex G)
+ // Loop on the individual frame[s] and store the information
+ // on the RLE fragments in a RLEFramesInfo.
+ // Note: - when only a single frame is present, this is a
+ // classical image.
+ // - when more than one frame are present, then we are in
+ // the case of a multi-frame image.
+ long frameLength;
+ while ( (frameLength = ReadTagLength(0xfffe, 0xe000)) )
+ {
+ // Parse the RLE Header and store the corresponding RLE Segment
+ // Offset Table information on fragments of this current Frame.
+ // Note that the fragment pixels themselves are not loaded
+ // (but just skipped).
+ long frameOffset = Fp->tellg();
+
+ uint32_t nbRleSegments = ReadInt32();
+ if ( nbRleSegments > 16 )
+ {
+ // There should be at most 15 segments (refer to RLEFrame class)
+ dbg.Verbose(0, "Document::ComputeRLEInfo: too many segments.");
+ }
+
+ uint32_t rleSegmentOffsetTable[15];
+ for( int k = 1; k <= 15; k++ )
+ {
+ rleSegmentOffsetTable[k] = ReadInt32();
+ }
+ // Deduce from both the RLE Header and the frameLength the
+ // fragment length, and again store this info in a
+ // RLEFramesInfo.
+ long rleSegmentLength[15];
+ // skipping (not reading) RLE Segments
+ if ( nbRleSegments > 1)
+ {
+ for(unsigned int k = 1; k <= nbRleSegments-1; k++)
+ {
+ rleSegmentLength[k] = rleSegmentOffsetTable[k+1]
+ - rleSegmentOffsetTable[k];
+ SkipBytes(rleSegmentLength[k]);
+ }
+ }
+
+ rleSegmentLength[nbRleSegments] = frameLength
+ - rleSegmentOffsetTable[nbRleSegments];
+ SkipBytes(rleSegmentLength[nbRleSegments]);
+
+ // Store the collected info
+ RLEFrame* newFrameInfo = new RLEFrame;
+ newFrameInfo->NumberFragments = nbRleSegments;
+ for( unsigned int uk = 1; uk <= nbRleSegments; uk++ )
+ {
+ newFrameInfo->Offset[uk] = frameOffset + rleSegmentOffsetTable[uk];
+ newFrameInfo->Length[uk] = rleSegmentLength[uk];
+ }
+ RLEInfo->Frames.push_back( newFrameInfo );
+ }
+
+ // Make sure that at the end of the item we encounter a 'Sequence
+ // Delimiter Item':
+ if ( !ReadTag(0xfffe, 0xe0dd) )
+ {
+ dbg.Verbose(0, "Document::ComputeRLEInfo: no sequence delimiter ");
+ dbg.Verbose(0, " item at end of RLE item sequence");
+ }
+}
/**
- * \brief Parse pixel data from disk for multi-fragment Jpeg/Rle files
- * No other way so 'skip' the Data
- *
+ * \brief Parse pixel data from disk of [multi-]fragment Jpeg encoding.
+ * Compute the jpeg extra information (fragment[s] offset[s] and
+ * length) and store it[them] in \ref JPEGInfo for later pixel
+ * retrieval usage.
*/
-
-void gdcmDocument::Parse7FE0 (void)
+void Document::ComputeJPEGFragmentInfo()
{
- gdcmDocEntry* Element = GetDocEntryByNumber(0x0002, 0x0010);
- if ( !Element )
- return;
-
- if ( IsImplicitVRLittleEndianTransferSyntax()
- || IsExplicitVRLittleEndianTransferSyntax()
- || IsExplicitVRBigEndianTransferSyntax() /// \todo 1.2.2 ??? A verifier !
- || IsDeflatedExplicitVRLittleEndianTransferSyntax() )
+ // If you need to, look for comments of ComputeRLEInfo().
+ if ( ! IsJPEG() )
+ {
return;
-
- // ---------------- for Parsing : Position on begining of Jpeg/RLE Pixels
+ }
- //// Read the Basic Offset Table Item Tag length...
- guint32 ItemLength = ReadItemTagLength();
-
- //// ... and then read length[s] itself[themselves]. We don't use
- // the values read (BTW what is the purpous of those lengths ?)
- if (ItemLength != 0) {
- // BTW, what is the purpous of those length anyhow !?
- char * BasicOffsetTableItemValue = new char[ItemLength + 1];
- fread(BasicOffsetTableItemValue, ItemLength, 1, fp);
- for (unsigned int i=0; i < ItemLength; i += 4){
- guint32 IndividualLength;
- IndividualLength = str2num(&BasicOffsetTableItemValue[i],guint32);
- std::ostringstream s;
- s << " Read one length: ";
- s << std::hex << IndividualLength << std::endl;
- dbg.Verbose(0, "gdcmDocument::Parse7FE0: ", s.str().c_str());
- }
+ ReadAndSkipEncapsulatedBasicOffsetTable();
+
+ // Loop on the fragments[s] and store the parsed information in a
+ // JPEGInfo.
+ long fragmentLength;
+ while ( (fragmentLength = ReadTagLength(0xfffe, 0xe000)) )
+ {
+ long fragmentOffset = Fp->tellg();
+
+ // Store the collected info
+ JPEGFragment* newFragment = new JPEGFragment;
+ newFragment->Offset = fragmentOffset;
+ newFragment->Length = fragmentLength;
+ JPEGInfo->Fragments.push_back( newFragment );
+
+ SkipBytes( fragmentLength );
}
- if ( ! IsRLELossLessTransferSyntax() )
+ // Make sure that at the end of the item we encounter a 'Sequence
+ // Delimiter Item':
+ if ( !ReadTag(0xfffe, 0xe0dd) )
{
- // JPEG Image
-
- //// We then skip (not reading them) all the fragments of images:
- while ( (ItemLength = ReadItemTagLength()) )
- {
- SkipBytes(ItemLength);
- }
-
+ dbg.Verbose(0, "Document::ComputeRLEInfo: no sequence delimiter ");
+ dbg.Verbose(0, " item at end of JPEG item sequence");
}
- else
+}
+
+/**
+ * \brief Walk recursively the given \ref DocEntrySet, and feed
+ * the given hash table (\ref TagDocEntryHT) with all the
+ * \ref DocEntry (Dicom entries) encountered.
+ * This method does the job for \ref BuildFlatHashTable.
+ * @param builtHT Where to collect all the \ref DocEntry encountered
+ * when recursively walking the given set.
+ * @param set The structure to be traversed (recursively).
+ */
+void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT,
+ DocEntrySet* set )
+{
+ if (ElementSet* elementSet = dynamic_cast< ElementSet* > ( set ) )
{
- // RLE Image
- long ftellRes;
- long RleSegmentLength[15], fragmentLength;
-
- // while 'Sequence Delimiter Item' (fffe,e0dd) not found
- while ( (fragmentLength = ReadSequenceDelimiterTagLength()) )
- {
- // Parse fragments of the current Fragment (Frame)
- //------------------ scanning (not reading) fragment pixels
- guint32 nbRleSegments = ReadInt32();
- printf(" Nb of RLE Segments : %d\n",nbRleSegments);
-
- //// Reading RLE Segments Offset Table
- guint32 RleSegmentOffsetTable[15];
- for(int k=1; k<=15; k++) {
- ftellRes=ftell(fp);
- RleSegmentOffsetTable[k] = ReadInt32();
- printf(" at : %x Offset Segment %d : %d (%x)\n",
- (unsigned)ftellRes,k,RleSegmentOffsetTable[k],
- RleSegmentOffsetTable[k]);
+ TagDocEntryHT const & currentHT = elementSet->GetTagHT();
+ for( TagDocEntryHT::const_iterator i = currentHT.begin();
+ i != currentHT.end();
+ ++i)
+ {
+ DocEntry* entry = i->second;
+ if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
+ {
+ const ListSQItem& items = seqEntry->GetSQItems();
+ for( ListSQItem::const_iterator item = items.begin();
+ item != items.end();
+ ++item)
+ {
+ BuildFlatHashTableRecurse( builtHT, *item );
+ }
+ continue;
}
+ builtHT[entry->GetKey()] = entry;
+ }
+ return;
+ }
- // skipping (not reading) RLE Segments
- if (nbRleSegments>1) {
- for(unsigned int k=1; k<=nbRleSegments-1; k++) {
- RleSegmentLength[k]= RleSegmentOffsetTable[k+1]
- - RleSegmentOffsetTable[k];
- ftellRes=ftell(fp);
- printf (" Segment %d : Length = %d x(%x) Start at %x\n",
- k,(unsigned)RleSegmentLength[k],
- (unsigned)RleSegmentLength[k], (unsigned)ftellRes);
- SkipBytes(RleSegmentLength[k]);
- }
- }
+ 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) )
+ {
+ const ListSQItem& items = seqEntry->GetSQItems();
+ for( ListSQItem::const_iterator item = items.begin();
+ item != items.end();
+ ++item)
+ {
+ BuildFlatHashTableRecurse( builtHT, *item );
+ }
+ continue;
+ }
+ builtHT[entry->GetKey()] = entry;
+ }
- RleSegmentLength[nbRleSegments]= fragmentLength
- - RleSegmentOffsetTable[nbRleSegments];
- ftellRes=ftell(fp);
- printf (" Segment %d : Length = %d x(%x) Start at %x\n",
- nbRleSegments,(unsigned)RleSegmentLength[nbRleSegments],
- (unsigned)RleSegmentLength[nbRleSegments],(unsigned)ftellRes);
- SkipBytes(RleSegmentLength[nbRleSegments]);
- }
}
}
+/**
+ * \brief Build a \ref TagDocEntryHT (i.e. a std::map<>) from the current
+ * Document.
+ *
+ * The structure used by a Document (through \ref ElementSet),
+ * in order to old the parsed entries of a Dicom header, is a recursive
+ * one. This is due to the fact that the sequences (when present)
+ * can be nested. Additionaly, the sequence items (represented in
+ * gdcm as \ref SQItem) add an extra complexity to the data
+ * structure. Hence, a gdcm user whishing to visit all the entries of
+ * a Dicom header will need to dig in the gdcm internals (which
+ * implies exposing all the internal data structures to the API).
+ * In order to avoid this burden to the user, \ref BuildFlatHashTable
+ * recursively builds a temporary hash table, which holds all the
+ * Dicom entries in a flat structure (a \ref TagDocEntryHT i.e. a
+ * std::map<>).
+ * \warning Of course there is NO integrity constrain between the
+ * returned \ref TagDocEntryHT and the \ref ElementSet used
+ * to build it. Hence if the underlying \ref ElementSet is
+ * altered, then it is the caller responsability to invoke
+ * \ref BuildFlatHashTable again...
+ * @return The flat std::map<> we juste build.
+ */
+TagDocEntryHT* Document::BuildFlatHashTable()
+{
+ TagDocEntryHT* FlatHT = new TagDocEntryHT;
+ BuildFlatHashTableRecurse( *FlatHT, this );
+ return FlatHT;
+}
+
/**
- * \brief Compares two documents, according to \ref gdcmDicomDir rules
+ * \brief Compares two documents, according to \ref DicomDir rules
* \warning Does NOT work with ACR-NEMA files
* \todo Find a trick to solve the pb (use RET fields ?)
* @param document
* @return true if 'smaller'
*/
-bool gdcmDocument::operator<(gdcmDocument &document)
+bool Document::operator<(Document &document)
{
- std::string s1,s2;
-
// Patient Name
- s1=this->GetEntryByNumber(0x0010,0x0010);
- s2=document.GetEntryByNumber(0x0010,0x0010);
+ std::string s1 = GetEntryByNumber(0x0010,0x0010);
+ std::string s2 = document.GetEntryByNumber(0x0010,0x0010);
if(s1 < s2)
+ {
return true;
- else if(s1 > s2)
+ }
+ else if( s1 > s2 )
+ {
return false;
+ }
else
{
// Patient ID
- s1=this->GetEntryByNumber(0x0010,0x0020);
- s2=document.GetEntryByNumber(0x0010,0x0020);
- if (s1 < s2)
- return true;
- else if (s1 > s2)
+ s1 = GetEntryByNumber(0x0010,0x0020);
+ s2 = document.GetEntryByNumber(0x0010,0x0020);
+ if ( s1 < s2 )
+ {
return true;
+ }
+ else if ( s1 > s2 )
+ {
+ return false;
+ }
else
{
// Study Instance UID
- s1=this->GetEntryByNumber(0x0020,0x000d);
- s2=document.GetEntryByNumber(0x0020,0x000d);
- if (s1 < s2)
+ s1 = GetEntryByNumber(0x0020,0x000d);
+ s2 = document.GetEntryByNumber(0x0020,0x000d);
+ if ( s1 < s2 )
+ {
return true;
- else if(s1 > s2)
+ }
+ else if( s1 > s2 )
+ {
return false;
+ }
else
{
// Serie Instance UID
- s1=this->GetEntryByNumber(0x0020,0x000e);
- s2=document.GetEntryByNumber(0x0020,0x000e);
- if (s1 < s2)
+ s1 = GetEntryByNumber(0x0020,0x000e);
+ s2 = document.GetEntryByNumber(0x0020,0x000e);
+ if ( s1 < s2 )
+ {
return true;
- else if(s1 > s2)
+ }
+ else if( s1 > s2 )
+ {
return false;
+ }
}
}
}
return false;
}
+} // end namespace gdcm
//-----------------------------------------------------------------------------