-// gdcmDocument.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: gdcmDocument.cxx,v $
+ Language: C++
+ Date: $Date: 2004/07/16 15:18:05 $
+ Version: $Revision: 1.49 $
+
+ 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.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
#include "gdcmDocument.h"
+#include "gdcmValEntry.h"
+#include "gdcmBinEntry.h"
+#include "gdcmSeqEntry.h"
+
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
#include "gdcmDebug.h"
# 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"
-#define UI1_2_840_10008_1_2_2 "1.2.840.10008.1.2.2"
+// Deflated Explicit VR Little Endian
#define UI1_2_840_10008_1_2_1_99 "1.2.840.10008.1.2.1.99"
-
-typedef struct {
- guint32 totalSQlength;
- guint32 alreadyParsedlength;
-} pileElem;
+// 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))
//-----------------------------------------------------------------------------
// Refer to gdcmDocument::CheckSwap()
const unsigned int gdcmDocument::HEADER_LENGTH_TO_READ = 256;
// Refer to gdcmDocument::SetMaxSizeLoadEntry()
-const unsigned int gdcmDocument::MAX_SIZE_LOAD_ELEMENT_VALUE = 4096;
-
-const unsigned int gdcmDocument::MAX_SIZE_PRINT_ELEMENT_VALUE = 64;
+const unsigned int gdcmDocument::MAX_SIZE_LOAD_ELEMENT_VALUE = 0xfff; // 4096
+const unsigned int gdcmDocument::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff;
//-----------------------------------------------------------------------------
// Constructor / Destructor
* with a FALSE value for the 'enable_sequence' param.
* ('public elements' may be embedded in 'shadow Sequences')
*/
-gdcmDocument::gdcmDocument(const char *inFilename,
- bool exception_on_error,
- bool enable_sequences,
- bool ignore_shadow) {
- enableSequences=enable_sequences;
- ignoreShadow =ignore_shadow;
-
+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
SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE);
- filename = inFilename;
+ Filename = inFilename;
Initialise();
if ( !OpenFile(exception_on_error))
return;
+
+ dbg.Verbose(0, "gdcmDocument::gdcmDocument: starting parsing of file: ",
+ Filename.c_str());
+ rewind(fp);
+
+ fseek(fp,0L,SEEK_END);
+ long lgt = ftell(fp);
+
+ rewind(fp);
+ CheckSwap();
+ long beg = ftell(fp);
+ lgt -= beg;
+
+ SQDepthLevel=0;
+
+ long l=ParseDES( this, beg, lgt, false); // le Load sera fait a la volee
+ (void)l; //is l used anywhere ?
- LoadDocEntries();
- CloseFile();
+ rewind(fp);
+
+ // 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
+
+ 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
+ }
+ //FIXME later : how to use it?
+ LoadEntryVoidArea(0x0028,0x3006); //LUT Data (CTX dependent)
+
+ CloseFile();
+
+ // --------------------------------------------------------------
+ // Special Patch to allow gdcm to read ACR-LibIDO formated images
+ //
+ // if recognition code tells us we deal with a LibIDO image
+ // we switch lineNumber and columnNumber
+ //
+ std::string RecCode;
+ RecCode = GetEntryByNumber(0x0008, 0x0010); // recognition code
+ if (RecCode == "ACRNEMA_LIBIDO_1.1" ||
+ RecCode == "CANRME_AILIBOD1_1." ) // for brain-damaged softwares
+ // with "little-endian strings"
+ {
+ Filetype = gdcmACR_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 ----------------
- wasUpdated = 0; // will be set to 1 if user adds an entry
printLevel = 1; // 'Medium' print level by default
}
* \brief constructor
* @param exception_on_error
*/
-gdcmDocument::gdcmDocument(bool exception_on_error) {
- (void)exception_on_error;
- enableSequences=0;
+gdcmDocument::gdcmDocument(bool exception_on_error)
+ :gdcmElementSet(-1)
+{
+ (void)exception_on_error;
+ //enableSequences=0; // ?!? JPR
SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE);
Initialise();
- wasUpdated = 0; // will be set to 1 if user adds an entry
printLevel = 1; // 'Medium' print level by default
}
/**
* \brief Canonical destructor.
*/
-gdcmDocument::~gdcmDocument (void) {
+gdcmDocument::~gdcmDocument ()
+{
RefPubDict = NULL;
RefShaDict = NULL;
+
+ // Recursive clean up of sequences
+ for (TagDocEntryHT::const_iterator it = tagHT.begin();
+ it != tagHT.end(); ++it )
+ {
+ delete it->second;
+ }
+ tagHT.clear();
}
//-----------------------------------------------------------------------------
// Print
-/**
- * \brief Prints the Doc Entries (Dicom Elements)
- * from the chained list
- * @return
- */
-void gdcmDocument::PrintEntry(std::ostream & os) {
-
- for (ListTag::iterator i = listEntries.begin();
- i != listEntries.end();
- ++i)
- {
- (*i)->SetPrintLevel(printLevel);
- (*i)->Print(os);
- }
-}
-
/**
* \brief Prints The Dict Entries of THE public Dicom Dictionary
* @return
*/
-void gdcmDocument::PrintPubDict(std::ostream & os) {
+void gdcmDocument::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 gdcmDocument::PrintShaDict(std::ostream & os)
+{
RefShaDict->Print(os);
}
/**
* \brief Get the public dictionary used
*/
-gdcmDict *gdcmDocument::GetPubDict(void) {
- return(RefPubDict);
+gdcmDict *gdcmDocument::GetPubDict()
+{
+ return RefPubDict;
}
/**
* \brief Get the shadow dictionary used
*/
-gdcmDict *gdcmDocument::GetShaDict(void) {
- return(RefShaDict);
+gdcmDict *gdcmDocument::GetShaDict()
+{
+ return RefShaDict;
}
/**
* \brief Set the shadow dictionary used
* \param dict dictionary to use in shadow
*/
-bool gdcmDocument::SetShaDict(gdcmDict *dict){
- RefShaDict=dict;
- return(!RefShaDict);
+bool gdcmDocument::SetShaDict(gdcmDict *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);
- return(!RefShaDict);
+bool gdcmDocument::SetShaDict(DictKey dictName)
+{
+ RefShaDict = gdcmGlobal::GetDicts()->GetDict(dictName);
+ return !RefShaDict;
}
/**
* @return true when gdcmDocument is the one of a reasonable Dicom/Acr file,
* false otherwise.
*/
-bool gdcmDocument::IsReadable(void) {
- if(filetype==Unknown) {
- return(false);
+bool gdcmDocument::IsReadable()
+{
+ if( Filetype == gdcmUnknown)
+ {
+ std::cout << " gdcmDocument::IsReadable: Filetype " << Filetype
+ << " " << "gdcmUnknown " << gdcmUnknown << std::endl; //JPR
+ dbg.Verbose(0, "gdcmDocument::IsReadable: wrong filetype");
+ return false;
}
- if(listEntries.size()<=0) {
- return(false);
+
+ if(tagHT.empty())
+ {
+ dbg.Verbose(0, "gdcmDocument::IsReadable: no tags in internal"
+ " hash table.");
+ return false;
}
- return(true);
+ return true;
}
+
/**
- * \brief Determines if the Transfer Syntax was already encountered
- * and if it corresponds to a ImplicitVRLittleEndian one.
- * @return True when ImplicitVRLittleEndian found. False in all other cases.
+ * \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.
+ * @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.
*/
-bool gdcmDocument::IsImplicitVRLittleEndianTransferSyntax(void) {
- gdcmHeaderEntry *Element = GetHeaderEntryByNumber(0x0002, 0x0010);
- if ( !Element )
+bool gdcmDocument::IsGivenTransferSyntax(std::string const & syntaxToCheck)
+{
+ gdcmDocEntry *entry = GetDocEntryByNumber(0x0002, 0x0010);
+ if ( !entry )
+ {
return false;
- LoadHeaderEntrySafe(Element);
+ }
- std::string Transfer = Element->GetValue();
- if ( Transfer == UI1_2_840_10008_1_2 )
- return true;
+ // 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) )
+ {
+ 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]) )
+ {
+ transfer.erase(transfer.length()-1, 1);
+ }
+ 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()
+{
+ 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) {
- gdcmHeaderEntry* Element = GetHeaderEntryByNumber(0x0002, 0x0010);
- if ( !Element )
- return false;
- LoadHeaderEntrySafe(Element);
-
- std::string Transfer = Element->GetValue();
- if ( Transfer == UI1_2_840_10008_1_2_1 )
- return true;
- return false;
+bool gdcmDocument::IsExplicitVRLittleEndianTransferSyntax()
+{
+ return IsGivenTransferSyntax(UI1_2_840_10008_1_2_1);
}
/**
* and if it corresponds to a DeflatedExplicitVRLittleEndian one.
* @return True when DeflatedExplicitVRLittleEndian found. False in all other cases.
*/
-bool gdcmDocument::IsDeflatedExplicitVRLittleEndianTransferSyntax(void) {
- gdcmHeaderEntry* Element = GetHeaderEntryByNumber(0x0002, 0x0010);
- if ( !Element )
- return false;
- LoadHeaderEntrySafe(Element);
-
- std::string Transfer = Element->GetValue();
- if ( Transfer == UI1_2_840_10008_1_2_1_99 )
- return true;
- return false;
+bool gdcmDocument::IsDeflatedExplicitVRLittleEndianTransferSyntax()
+{
+ return IsGivenTransferSyntax(UI1_2_840_10008_1_2_1_99);
}
/**
* 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) {
- gdcmHeaderEntry* Element = GetHeaderEntryByNumber(0x0002, 0x0010);
- if ( !Element )
- return false;
- LoadHeaderEntrySafe(Element);
+bool gdcmDocument::IsExplicitVRBigEndianTransferSyntax()
+{
+ return IsGivenTransferSyntax(UI1_2_840_10008_1_2_2);
+}
- std::string Transfer = Element->GetValue();
- if ( Transfer == UI1_2_840_10008_1_2_2 ) //1.2.2 ??? A verifier !
- return true;
- return false;
+/**
+ * \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()
+{
+ return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_50);
+}
+
+/**
+ * \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()
+{
+ 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()
+{
+ 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
+ * other cases.
+ */
+bool gdcmDocument::IsJPEGSpectralSelectionProcess6_8TransferSyntax()
+{
+ return IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_53);
+}
+
+/**
+ * \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.
+ */
+bool gdcmDocument::IsRLELossLessTransferSyntax()
+{
+ return IsGivenTransferSyntax(UI1_2_840_10008_1_2_5);
+}
+
+/**
+ * \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.
+ */
+
+bool gdcmDocument::IsJPEGLossless()
+{
+ 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()
+{
+ return ( IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_90)
+ || IsGivenTransferSyntax(UI1_2_840_10008_1_2_4_91) );
+}
+
+/**
+ * \brief Predicate for dicom version 3 file.
+ * @return True when the file is a dicom version 3.
+ */
+bool gdcmDocument::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;
}
/**
* (ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown)
* @return the FileType code
*/
-FileType gdcmDocument::GetFileType(void) {
- return(filetype);
+FileType gdcmDocument::GetFileType()
+{
+ return Filetype;
}
/**
FILE *gdcmDocument::OpenFile(bool exception_on_error)
throw(gdcmFileError)
{
- fp=fopen(filename.c_str(),"rb");
- if(exception_on_error)
+ fp = fopen(Filename.c_str(),"rb");
+
+ if(!fp)
{
- if(!fp)
- throw gdcmFileError("gdcmDocument::gdcmDocument(const char *, bool)");
+ 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;
+ uint16_t 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);
+ {
+ return fp;
+ }
//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);
+ {
+ return fp;
+ }
fclose(fp);
- dbg.Verbose(0, "gdcmDocument::OpenFile not DICOM/ACR", filename.c_str());
+ dbg.Verbose(0, "gdcmDocument::OpenFile not DICOM/ACR", Filename.c_str());
}
- else {
- dbg.Verbose(0, "gdcmDocument::OpenFile cannot open file", filename.c_str());
+ else
+ {
+ dbg.Verbose(0, "gdcmDocument::OpenFile cannot open file", Filename.c_str());
}
- return(NULL);
+
+ return 0;
}
/**
* \brief closes the file
* @return TRUE if the close was successfull
*/
-bool gdcmDocument::CloseFile(void) {
+bool gdcmDocument::CloseFile()
+{
int closed = fclose(fp);
fp = (FILE *)0;
- if (! closed)
- return false;
- return true;
+
+ return closed;
}
/**
- * \brief Writes in a file all the Doc Entries (Dicom Elements)
- * of the Chained List
+ * \brief Writes in a file all the Header Entries (Dicom Elements)
* @param fp file pointer on an already open file
- * @param type Type of the File to be written
+ * @param filetype Type of the File to be written
* (ACR-NEMA, ExplicitVR, ImplicitVR)
* \return Always true.
*/
-bool gdcmDocument::Write(FILE *fp, FileType type) {
-/// \todo
-/// ==============
-/// The stuff will have to be rewritten using the SeQuence based
-/// tree-like stucture instead of the chained list .
-/// (so we shall remove the GroupHT from the gdcmDocument)
-/// To be checked
-/// =============
-
+void gdcmDocument::Write(FILE* fp,FileType filetype)
+{
/// \todo move the following lines (and a lot of others, to be written)
/// to a future function CheckAndCorrectHeader
- /// \todo
- /// Question :
- /// Comment pourrait-on savoir si le DcmHeader vient d'un fichier
- /// DicomV3 ou non (FileType est un champ de gdcmDocument ...)
/// WARNING : Si on veut ecrire du DICOM V3 a partir d'un DcmHeader ACR-NEMA
- /// no way
+ /// 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 (type == ImplicitVR)
+ /// faire un CheckAndCorrectHeader (?)
+
+ if (filetype == gdcmImplicitVR)
{
std::string implicitVRTransfertSyntax = UI1_2_840_10008_1_2;
ReplaceOrCreateByNumber(implicitVRTransfertSyntax,0x0002, 0x0010);
/// \todo Refer to standards on page 21, chapter 6.2
/// "Value representation": values with a VR of UI shall be
/// padded with a single trailing null
- /// Dans le cas suivant on doit pader manuellement avec un 0
+ /// in the following case we have to padd manually with a 0
SetEntryLengthByNumber(18, 0x0002, 0x0010);
}
- if (type == ExplicitVR)
+ if (filetype == gdcmExplicitVR)
{
std::string explicitVRTransfertSyntax = UI1_2_840_10008_1_2_1;
ReplaceOrCreateByNumber(explicitVRTransfertSyntax,0x0002, 0x0010);
SetEntryLengthByNumber(20, 0x0002, 0x0010);
}
-
+
/**
* \todo rewrite later, if really usefull
+ * - 'Group Length' element is optional in DICOM
+ * - but un-updated odd groups lengthes can causes pb
+ * (xmedcon breaker)
*
- * --> Warning : un-updated odd groups lengths can causes pb
- * --> (xmedcon breaks)
- * --> to be re- written with future org.
- *
- * if ( (type == ImplicitVR) || (type == ExplicitVR) )
- * UpdateGroupLength(false,type);
- * if ( type == ACR)
+ * if ( (filetype == ImplicitVR) || (filetype == ExplicitVR) )
+ * UpdateGroupLength(false,filetype);
+ * if ( filetype == ACR)
* UpdateGroupLength(true,ACR);
*/
+
+ gdcmElementSet::Write(fp,filetype); // This one is recursive
- WriteEntries(fp,type);
- return(true);
}
/**
* \brief Modifies the value of a given Header Entry (Dicom Element)
* when it exists. Create it with the given value when unexistant.
- * \warning Adds the Header Entry to the HTable, NOT to the chained List
- * @param Value Value to be set
- * @param Group Group of the Entry
- * @param Elem Element of the Entry
+ * @param Value (string) 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).
*/
-gdcmHeaderEntry * gdcmDocument::ReplaceOrCreateByNumber(
- std::string Value,
- guint16 Group,
- guint16 Elem ){
- gdcmHeaderEntry* a;
- a = GetHeaderEntryByNumber( Group, Elem);
- if (a == NULL) {
- a =NewHeaderEntryByNumber(Group, Elem);
- if (a == NULL)
+
+gdcmValEntry * gdcmDocument::ReplaceOrCreateByNumber(
+ std::string value,
+ uint16_t group,
+ uint16_t elem )
+{
+ gdcmValEntry* valEntry;
+
+ gdcmDocEntry* currentEntry = GetDocEntryByNumber( group, elem);
+ if (!currentEntry)
+ {
+ // The entry wasn't present and we simply create the required ValEntry:
+ currentEntry = NewDocEntryByNumber(group, elem);
+ if (!currentEntry)
+ {
+ dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: call to"
+ " NewDocEntryByNumber failed.");
return NULL;
- AddHeaderEntry(a);
- }
- //CLEANME SetEntryByNumber(Value, Group, Elem);
- a->SetValue(Value);
- return(a);
+ }
+ valEntry = new gdcmValEntry(currentEntry);
+ if ( !AddEntry(valEntry))
+ {
+ dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: AddEntry"
+ " failed allthough this is a creation.");
+ }
+ }
+ else
+ {
+ valEntry = dynamic_cast< gdcmValEntry* >(currentEntry);
+ if ( !valEntry )
+ {
+ // We need to promote the gdcmDocEntry to a gdcmValEntry:
+ valEntry = new gdcmValEntry(currentEntry);
+ if (!RemoveEntry(currentEntry))
+ {
+ dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: removal"
+ " of previous DocEntry failed.");
+ return NULL;
+ }
+ if ( !AddEntry(valEntry))
+ {
+ dbg.Verbose(0, "gdcmDocument::ReplaceOrCreateByNumber: adding"
+ " promoted ValEntry failed.");
+ return NULL;
+ }
+ }
+ }
+
+ SetEntryByNumber(value, group, elem);
+
+ 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 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,
+ int lgth,
+ uint16_t group,
+ uint16_t elem)
+{
+ gdcmBinEntry* b = 0;
+ gdcmDocEntry* a = GetDocEntryByNumber( group, elem);
+ if (!a)
+ {
+ a = NewBinEntryByNumber(group, elem);
+ if (!a)
+ {
+ return 0;
+ }
+
+ b = new gdcmBinEntry(a);
+ AddEntry(b);
+ b->SetVoidArea(voidArea);
+ }
+ SetEntryByNumber(voidArea, lgth, group, elem);
+ //b->SetVoidArea(voidArea); //what if b == 0 !!
+
+ return b;
+}
+
/**
* \brief Set a new value if the invoked element exists
* Seems to be useless !!!
* @param Value new element value
- * @param Group group of the Entry
- * @param Elem element of the Entry
+ * @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 gdcmDocument::ReplaceIfExistByNumber(const char* value, uint16_t group,
+ uint16_t elem )
{
- std::string v = Value;
- SetEntryByNumber(v, Group, Elem);
+ std::string v = value;
+ SetEntryByNumber(v, group, elem);
return true;
}
// Protected
/**
- * \brief Checks if a given Dicom Element exists
- * within the H table
- * @param group Group number of the searched Dicom Element
+ * \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
*/
-int gdcmDocument::CheckIfEntryExistByNumber(guint16 group, guint16 element ) {
+int gdcmDocument::CheckIfEntryExistByNumber(uint16_t group, uint16_t element )
+{
std::string key = gdcmDictEntry::TranslateToKey(group, element );
- return (tagHT.count(key));
+ return tagHT.count(key);
}
/**
- * \brief Searches within Doc Entries (Dicom Elements) parsed with
+ * \brief Searches within Header Entries (Dicom Elements) parsed with
* the public and private dictionaries
* for the element value of a given tag.
* \warning Don't use any longer : use GetPubEntryByName
* @return Corresponding element value when it exists,
* and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
*/
-std::string gdcmDocument::GetEntryByName(std::string tagName) {
+std::string gdcmDocument::GetEntryByName(TagName tagName)
+{
gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
- if( dictEntry == NULL)
+ if( !dictEntry )
+ {
return GDCM_UNFOUND;
+ }
- return(GetEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()));
+ return GetEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement());
}
/**
- * \brief Searches within Doc Entries (Dicom Elements) parsed with
+ * \brief Searches within Header Entries (Dicom Elements) parsed with
* the public and private dictionaries
* for the element value representation of a given tag.
*
* @return Corresponding element value representation when it exists,
* and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
*/
-std::string gdcmDocument::GetEntryVRByName(std::string tagName) {
+std::string gdcmDocument::GetEntryVRByName(TagName tagName)
+{
gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
if( dictEntry == NULL)
return GDCM_UNFOUND;
- gdcmHeaderEntry* elem = GetHeaderEntryByNumber(dictEntry->GetGroup(),
- dictEntry->GetElement());
+ gdcmDocEntry* elem = GetDocEntryByNumber(dictEntry->GetGroup(),
+ dictEntry->GetElement());
return elem->GetVR();
}
/**
- * \brief Searches within Doc Entries (Dicom Elements) parsed with
+ * \brief Searches within Header Entries (Dicom Elements) parsed with
* the public and private dictionaries
* for the element value representation of a given tag.
- * @param group Group of the searched tag.
- * @param element Element of the searched tag.
+ * @param group Group number of the searched tag.
+ * @param element Element number of the searched tag.
* @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);
+std::string gdcmDocument::GetEntryByNumber(uint16_t group, uint16_t element)
+{
+ gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element);
+ /// \todo use map methods, instead of multimap JPR
if ( ! tagHT.count(key))
return GDCM_UNFOUND;
- return tagHT.find(key)->second->GetValue();
+ return ((gdcmValEntry *)tagHT.find(key)->second)->GetValue();
}
/**
- * \brief Searches within Doc Entries (Dicom Elements) parsed with
+ * \brief Searches within Header Entries (Dicom Elements) parsed with
* the public and private dictionaries
* for the element value representation of a given tag..
*
* to convert the string typed content to caller's native type
* (think of C++ vs Python). The VR is actually of a higher level
* of semantics than just the native C++ type.
- * @param group Group of the searched tag.
- * @param element Element of the searched tag.
+ * @param group Group number of the searched tag.
+ * @param element Element number of the searched tag.
* @return Corresponding element value representation when it exists,
* and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
*/
-std::string gdcmDocument::GetEntryVRByNumber(guint16 group, guint16 element) {
- gdcmHeaderEntry* elem = GetHeaderEntryByNumber(group, element);
+std::string gdcmDocument::GetEntryVRByNumber(uint16_t group, uint16_t element)
+{
+ gdcmDocEntry* elem = GetDocEntryByNumber(group, element);
if ( !elem )
return GDCM_UNFOUND;
return elem->GetVR();
}
/**
- * \brief Searches within Doc Entries (Dicom Elements) parsed with
+ * \brief Searches within Header Entries (Dicom Elements) parsed with
* the public and private dictionaries
* for the value length of a given tag..
- * @param group Group of the searched tag.
- * @param element Element of the searched tag.
+ * @param group Group number of the searched tag.
+ * @param element Element number of the searched tag.
* @return Corresponding element length; -2 if not found
*/
-int gdcmDocument::GetEntryLengthByNumber(guint16 group, guint16 element) {
- gdcmHeaderEntry* elem = GetHeaderEntryByNumber(group, element);
+int gdcmDocument::GetEntryLengthByNumber(uint16_t group, uint16_t element)
+{
+ gdcmDocEntry* elem = GetDocEntryByNumber(group, element);
if ( !elem )
return -2;
return elem->GetLength();
* @param tagName name of the searched Dicom Element.
* @return true when found
*/
-bool gdcmDocument::SetEntryByName(std::string content,std::string tagName) {
+bool gdcmDocument::SetEntryByName(std::string content,std::string tagName)
+{
gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
if( dictEntry == NULL)
return false;
- return(SetEntryByNumber(content,dictEntry->GetGroup(),
- dictEntry->GetElement()));
+ return SetEntryByNumber(content,dictEntry->GetGroup(),
+ dictEntry->GetElement());
}
/**
- * \brief Accesses an existing gdcmHeaderEntry (i.e. a Dicom Element)
+ * \brief Accesses an existing gdcmDocEntry (i.e. a Dicom Element)
* through it's (group, element) and modifies it's content with
* the given value.
- * \warning Don't use any longer : use SetPubEntryByNumber
- * @param content new value to substitute with
- * @param group group of the Dicom Element to modify
- * @param element element of the Dicom Element to modify
+ * @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)
+ uint16_t group,
+ uint16_t element)
{
- TagKey key = gdcmDictEntry::TranslateToKey(group, element);
- if ( ! tagHT.count(key))
+ gdcmValEntry* ValEntry = GetValEntryByNumber(group, element);
+ if (!ValEntry)
+ {
+ dbg.Verbose(0, "gdcmDocument::SetEntryByNumber: no corresponding",
+ " ValEntry (try promotion first).");
return false;
- int l = content.length();
- if(l%2) // Non even length are padded with a space (020H).
- {
- l++;
- content = content + '\0';
}
-
- gdcmHeaderEntry * a;
- IterHT p;
- TagHeaderEntryHT::iterator p2;
- // DO NOT remove the following lines : they explain the stuff
- //p= tagHT.equal_range(key); // get a pair of iterators first-last synonym
- //p2=p.first; // iterator on the first synonym
- //a=p2->second; // H Table target column (2-nd col)
-
- // or, easier :
- a = ((tagHT.equal_range(key)).first)->second;
-
- a-> SetValue(content);
-
- std::string vr = a->GetVR();
+ // Non even content must be padded with a space (020H).
+ if((content.length())%2) {
+ content = content + '\0';
+ }
+ ValEntry->SetValue(content);
- guint32 lgr;
+ // Integers have a special treatement for their length:
+ gdcmVRKey vr = ValEntry->GetVR();
if( (vr == "US") || (vr == "SS") )
- lgr = 2;
+ ValEntry->SetLength(2);
else if( (vr == "UL") || (vr == "SL") )
- lgr = 4;
+ ValEntry->SetLength(4);
else
- lgr = l;
+ ValEntry->SetLength(content.length());
- a->SetLength(lgr);
return true;
-}
+}
/**
- * \brief Accesses an existing gdcmHeaderEntry (i.e. a Dicom Element)
- * in the PubHeaderEntrySet of this instance
+ * \brief Accesses an existing gdcmDocEntry (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 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,
+ uint16_t group,
+ uint16_t element)
+{
+ (void)lgth; //not used
+ gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element);
+ if ( ! tagHT.count(key))
+ return false;
+
+/* Hope Binaray 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); // ???
+ return true;
+}
+
+/**
+ * \brief Accesses an existing gdcmDocEntry (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.
* \warning Use with extreme caution.
* @param l new length to substitute with
- * @param group group of the Entry to modify
- * @param element element of the Entry to modify
+ * @param group group number of the Entry to modify
+ * @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 gdcmDocument::SetEntryLengthByNumber(uint32_t l,
+ uint16_t group,
+ uint16_t element)
{
- TagKey key = gdcmDictEntry::TranslateToKey(group, element);
+ /// \todo use map methods, instead of multimap JPR
+ gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element);
if ( ! tagHT.count(key))
return false;
if (l%2) l++; // length must be even
/**
* \brief Gets (from Header) the offset of a 'non string' element value
* (LoadElementValues has already be executed)
- * @param Group group of the Entry
- * @param Elem element 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 gdcmDocument::GetEntryOffsetByNumber(uint16_t Group, uint16_t Elem)
{
- gdcmHeaderEntry* Entry = GetHeaderEntryByNumber(Group, Elem);
+ gdcmDocEntry* Entry = GetDocEntryByNumber(Group, Elem);
if (!Entry)
{
- dbg.Verbose(1, "gdcmDocument::GetHeaderEntryByNumber",
- "failed to Locate gdcmHeaderEntry");
+ dbg.Verbose(1, "gdcmDocument::GetDocEntryByNumber: no entry present.");
return (size_t)0;
}
return Entry->GetOffset();
/**
* \brief Gets (from Header) a 'non string' element value
* (LoadElementValues has already be executed)
- * @param Group group of the Entry
- * @param Elem element 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 * gdcmDocument::GetEntryVoidAreaByNumber(uint16_t Group, uint16_t Elem)
{
- gdcmHeaderEntry* Entry = GetHeaderEntryByNumber(Group, Elem);
+ gdcmDocEntry* Entry = GetDocEntryByNumber(Group, Elem);
if (!Entry)
{
- dbg.Verbose(1, "gdcmDocument::GetHeaderEntryByNumber",
- "failed to Locate gdcmHeaderEntry");
+ dbg.Verbose(1, "gdcmDocument::GetDocEntryByNumber: no entry");
return (NULL);
}
- return Entry->GetVoidArea();
+ return ((gdcmBinEntry *)Entry)->GetVoidArea();
}
/**
* \brief Loads (from disk) the element content
* when a string is not suitable
- * @param Group group of the Entry
- * @param Elem element 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 *gdcmDocument::LoadEntryVoidArea(uint16_t Group, uint16_t Elem)
{
- gdcmHeaderEntry * Element= GetHeaderEntryByNumber(Group, 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();
+ size_t l = Element->GetLength();
char* a = new char[l];
- if(!a)
+ if(!a) {
+ dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea cannot allocate a");
return NULL;
-
+ }
+ size_t l2 = fread(a, 1, l ,fp);
+ if(l != l2)
+ {
+ delete[] a;
+ return NULL;
+ }
+ /// \todo Drop any allready existing void area! JPR
SetEntryVoidAreaByNumber(a, Group, Elem);
+ 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
+ */
+void *gdcmDocument::LoadEntryVoidArea(gdcmBinEntry *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;
+ }
+ Element->SetVoidArea((void *)a);
/// \todo check the result
size_t l2 = fread(a, 1, l ,fp);
if(l != l2)
delete[] a;
return NULL;
}
-
return a;
}
/**
* \brief Sets a 'non string' value to a given Dicom Element
- * @param area
- * @param group Group number of the searched Dicom Element
+ * @param area area containing the 'non string' value
+ * @param group Group number of the searched Dicom Element
* @param element Element number of the searched Dicom Element
* @return
*/
bool gdcmDocument::SetEntryVoidAreaByNumber(void * area,
- guint16 group,
- guint16 element)
+ uint16_t group,
+ uint16_t element)
{
- TagKey key = gdcmDictEntry::TranslateToKey(group, element);
+ gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element);
if ( ! tagHT.count(key))
return false;
- ( ((tagHT.equal_range(key)).first)->second )->SetVoidArea(area);
+ // This was for multimap ?
+ (( gdcmBinEntry *)( ((tagHT.equal_range(key)).first)->second ))->SetVoidArea(area);
+
return true;
}
* \brief Update the entries with the shadow dictionary.
* Only non even entries are analyzed
*/
-void gdcmDocument::UpdateShaEntries(void) {
- gdcmDictEntry *entry;
+void gdcmDocument::UpdateShaEntries() {
+ //gdcmDictEntry *entry;
std::string vr;
-
+
+ /// \todo TODO : still any use to explore recursively the whole structure?
+/*
for(ListTag::iterator it=listEntries.begin();
it!=listEntries.end();
++it)
else
vr=(*it)->GetVR();
- (*it)->SetValue(GetHeaderEntryUnvalue(*it));
+ (*it)->SetValue(GetDocEntryUnvalue(*it)); // to go on compiling
if(entry){
// Set the new entry and the new value
(*it)->SetDictEntry(entry);
- CheckHeaderEntryVR(*it,vr);
+ CheckDocEntryVR(*it,vr);
- (*it)->SetValue(GetHeaderEntryValue(*it));
+ (*it)->SetValue(GetDocEntryValue(*it)); // to go on compiling
+
}
else
{
(*it)->SetDictEntry(NewVirtualDictEntry((*it)->GetGroup(),(*it)->GetElement(),vr));
}
}
+*/
}
/**
- * \brief Searches within the Doc Entries for a Dicom Element of
+ * \brief Searches within the Header Entries for a Dicom Element of
* a given tag.
* @param tagName name of the searched Dicom Element.
* @return Corresponding Dicom Element when it exists, and NULL
* otherwise.
*/
- gdcmHeaderEntry *gdcmDocument::GetHeaderEntryByName(std::string tagName) {
+gdcmDocEntry* gdcmDocument::GetDocEntryByName(std::string tagName)
+{
gdcmDictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName);
if( dictEntry == NULL)
return NULL;
- return(GetHeaderEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()));
+ return(GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement()));
}
/**
* @param element Element number of the searched Dicom Element
* @return
*/
-gdcmHeaderEntry* gdcmDocument::GetHeaderEntryByNumber(guint16 group, guint16 element)
-{
- TagKey key = gdcmDictEntry::TranslateToKey(group, element);
- if ( ! tagHT.count(key))
- return NULL;
- return tagHT.find(key)->second;
-}
-
-/**
- * \brief retrieves the Dicom Elements (all of them) using (group, element)
- * @param group Group number of the searched Dicom Element.
- * @param element Element number of the searched Dicom Element.
- * @return a range (i.e.pair<,>) containing all elements whose key is group|element)
- */
-
-IterHT gdcmDocument::GetHeaderEntrySameNumber(guint16 group, guint16 element){
- TagKey key = gdcmDictEntry::TranslateToKey(group, element);
- return (tagHT.equal_range(key));
-}
-
-/**
- * \brief Loads the element while preserving the current
- * underlying file position indicator as opposed to
- * to LoadHeaderEntry that modifies it.
- * @param entry Header Entry whose value shall be loaded.
- * @return
- */
-void gdcmDocument::LoadHeaderEntrySafe(gdcmHeaderEntry * entry) {
- long PositionOnEntry = ftell(fp);
- LoadHeaderEntry(entry);
- fseek(fp, PositionOnEntry, SEEK_SET);
-}
-
-/**
- * \brief Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader
- * \warning : to be re-written using the chained list instead of the H table.
- * \warning : DO NOT use (doesn't work any longer because of the multimap)
- * \todo : to be re-written using the chained list instead of the H table
- * @param SkipSequence TRUE if we don't want to write Sequences (ACR-NEMA Files)
- * @param type Type of the File (ExplicitVR,ImplicitVR, ACR, ...)
- */
-void gdcmDocument::UpdateGroupLength(bool SkipSequence, FileType type) {
- guint16 gr, el;
- std::string vr;
-
- gdcmHeaderEntry *elem;
- char trash[10];
- std::string str_trash;
-
- GroupKey key;
- GroupHT groupHt; // to hold the length of each group
- TagKey tk;
- // remember :
- // typedef std::map<GroupKey, int> GroupHT;
-
- gdcmHeaderEntry *elemZ;
-
- // for each Tag in the DCM Header
-
- for (TagHeaderEntryHT::iterator tag2 = tagHT.begin();
- tag2 != tagHT.end();
- ++tag2)
- {
- elem = tag2->second;
- gr = elem->GetGroup();
- el = elem->GetElement();
- vr = elem->GetVR();
-
- sprintf(trash, "%04x", gr);
- key = trash; // generate 'group tag'
-
- // if the caller decided not to take SEQUENCEs into account
- // e.g : he wants to write an ACR-NEMA File
-
- if (SkipSequence && vr == "SQ")
- continue;
-
- // Still unsolved problem :
- // we cannot find the 'Sequence Delimitation Item'
- // since it's at the end of the Hash Table
- // (fffe,e0dd)
-
- // there is SEQUENCE in ACR-NEMA
- // WARNING :
- // --> la descente a l'interieur' des SQ
- // devrait etre faite avec une liste chainee, pas avec une HTable...
-
- if ( groupHt.count(key) == 0) // we just read the first elem of a given group
- {
- if (el == 0x0000) // the first elem is 0x0000
- {
- groupHt[key] = 0; // initialize group length
- }
- else
- {
- groupHt[key] = 2 + 2 + 4 + elem->GetLength(); // non 0x0000 first group elem
- }
- }
- else // any elem but the first
- {
- if (type == ExplicitVR)
- {
- if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") )
- {
- groupHt[key] += 4; // explicit VR AND OB, OW, SQ : 4 more bytes
- }
- }
- groupHt[key] += 2 + 2 + 4 + elem->GetLength();
- }
- }
-
- unsigned short int gr_bid;
-
- for (GroupHT::iterator g = groupHt.begin(); // for each group we found
- g != groupHt.end();
- ++g)
- {
- // FIXME: g++ -Wall -Wstrict-prototypes reports on following line:
- // warning: unsigned int format, different type arg
- sscanf(g->first.c_str(),"%x",&gr_bid); //FIXME
- tk = g->first + "|0000"; // generate the element full tag
-
- if ( tagHT.count(tk) == 0) // if element 0x0000 not found
- {
- gdcmDictEntry * tagZ = new gdcmDictEntry(gr_bid, 0x0000, "UL");
- elemZ = new gdcmHeaderEntry(tagZ);
- elemZ->SetLength(4);
- AddHeaderEntry(elemZ); // create it
- }
- else
- {
- elemZ=GetHeaderEntryByNumber(gr_bid, 0x0000);
- }
- sprintf(trash ,"%d",g->second);
- str_trash=trash;
- elemZ->SetValue(str_trash);
- }
-}
-
-/**
- * \brief Writes in a file (according to the requested format)
- * the group, the element, the value representation and the length
- * of a single gdcmHeaderEntry passed as argument.
- * @param tag pointer on the gdcmHeaderEntry to be written
- * @param _fp already open file pointer
- * @param type type of the File to be written
- */
-void gdcmDocument::WriteEntryTagVRLength(gdcmHeaderEntry *tag,
- FILE *_fp,
- FileType type)
-{
- guint16 group = tag->GetGroup();
- std::string vr = tag->GetVR();
- guint16 el = tag->GetElement();
- guint32 lgr = tag->GetReadLength();
-
- if ( (group == 0xfffe) && (el == 0x0000) )
- // Fix in order to make some MR PHILIPS images e-film readable
- // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm:
- // we just *always* ignore spurious fffe|0000 tag !
- return;
-
- fwrite ( &group,(size_t)2 ,(size_t)1 ,_fp); //group
- fwrite ( &el,(size_t)2 ,(size_t)1 ,_fp); //element
-
- if ( type == ExplicitVR ) {
-
- // Special case of delimiters:
- if (group == 0xfffe) {
- // Delimiters have NO Value Representation and have NO length.
- // Hence we skip writing the VR and length and we pad by writing
- // 0xffffffff
-
- int ff=0xffffffff;
- fwrite (&ff,(size_t)4 ,(size_t)1 ,_fp);
- return;
- }
-
- guint16 z=0;
- guint16 shortLgr = lgr;
- if (vr == "unkn") { // Unknown was 'written'
- // deal with Little Endian
- fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,_fp);
- fwrite ( &z, (size_t)2 ,(size_t)1 ,_fp);
- } else {
- fwrite (vr.c_str(),(size_t)2 ,(size_t)1 ,_fp);
- if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") )
- {
- fwrite ( &z, (size_t)2 ,(size_t)1 ,_fp);
- fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp);
- } else {
- fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,_fp);
- }
- }
- }
- else // IMPLICIT VR
- {
- fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp);
- }
-}
-
-/**
- * \brief Writes in a file (according to the requested format)
- * the value of a single gdcmHeaderEntry passed as argument.
- * @param tag Pointer on the gdcmHeaderEntry to be written
- * @param _fp Already open file pointer
- * @param type type of the File to be written
- */
-void gdcmDocument::WriteEntryValue(gdcmHeaderEntry *tag, FILE *_fp,FileType type)
-{
- (void)type;
- guint16 group = tag->GetGroup();
- std::string vr = tag->GetVR();
- guint32 lgr = tag->GetReadLength();
-
- if (vr == "SQ")
- // SeQuences have no value:
- return;
- if (group == 0xfffe)
- // Delimiters have no associated value:
- return;
-
- void *voidArea;
- voidArea = tag->GetVoidArea();
- if (voidArea != NULL)
- { // there is a 'non string' LUT, overlay, etc
- fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,_fp); // Elem value
- return;
- }
-
- if (vr == "US" || vr == "SS")
- {
- // some 'Short integer' fields may be mulivaluated
- // each single value is separated from the next one by '\'
- // we split the string and write each value as a short int
- std::vector<std::string> tokens;
- tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
- Tokenize (tag->GetValue(), tokens, "\\");
- for (unsigned int i=0; i<tokens.size();i++)
- {
- guint16 val_uint16 = atoi(tokens[i].c_str());
- void *ptr = &val_uint16;
- fwrite ( ptr,(size_t)2 ,(size_t)1 ,_fp);
- }
- tokens.clear();
- return;
- }
- // some 'Integer' fields may be mulivaluated
- // each single value is separated from the next one by '\'
- // we split the string and write each value as an int
- if (vr == "UL" || vr == "SL")
- {
- std::vector<std::string> tokens;
- tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
- Tokenize (tag->GetValue(), tokens, "\\");
- for (unsigned int i=0; i<tokens.size();i++)
- {
- guint32 val_uint32 = atoi(tokens[i].c_str());
- void *ptr = &val_uint32;
- fwrite ( ptr,(size_t)4 ,(size_t)1 ,_fp);
- }
- tokens.clear();
- return;
- }
- fwrite (tag->GetValue().c_str(), (size_t)lgr ,(size_t)1, _fp); // Elem value
-}
-
-/**
- * \brief Writes in a file (according to the requested format)
- * a single gdcmHeaderEntry passed as argument.
- * \sa WriteEntryValue, WriteEntryTagVRLength.
- * @param tag Pointer on the gdcmHeaderEntry to be written
- * @param _fp Already open file pointer
- * @param type type of the File to be written
- */
-
-bool gdcmDocument::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type)
-{
- guint32 length = tag->GetLength();
-
- // The value of a tag MUST (see the DICOM norm) be an odd number of
- // bytes. When this is not the case, pad with an additional byte:
- if(length%2==1)
- {
- tag->SetValue(tag->GetValue()+"\0");
- tag->SetLength(tag->GetReadLength()+1);
- }
-
- WriteEntryTagVRLength(tag, _fp, type);
- WriteEntryValue(tag, _fp, type);
- return true;
-}
-
-/**
- * \brief writes on disc according to the requested format
- * (ACR-NEMA, ExplicitVR, ImplicitVR) the image
- * using the Chained List
- * \warning does NOT add the missing elements in the header :
- * it's up to the user doing it !
- * (function CheckHeaderCoherence to be written)
- * \warning DON'T try, right now, to write a DICOM image
- * from an ACR Header (meta elements will be missing!)
- * \sa WriteEntriesDeprecated (Special temporary method for Theralys)
- * @param type type of the File to be written
- * (ACR-NEMA, ExplicitVR, ImplicitVR)
- * @param _fp already open file pointer
- */
-
-bool gdcmDocument::WriteEntries(FILE *_fp,FileType type)
-{
- /// \todo (?) check write failures (after *each* fwrite)
-
- for (ListTag::iterator tag2=listEntries.begin();
- tag2 != listEntries.end();
- ++tag2)
- {
- if ( type == ACR ){
- if ((*tag2)->GetGroup() < 0x0008)
- // Ignore pure DICOM V3 groups
- continue;
- if ((*tag2)->GetElement() %2)
- // Ignore the "shadow" groups
- continue;
- if ((*tag2)->GetVR() == "SQ" ) // ignore Sequences
- continue;
- if ((*tag2)->GetSQDepthLevel() != 0) // Not only ignore the SQ element
- continue;
- }
- if (! WriteEntry(*tag2,_fp,type) )
- return false;
- }
- return true;
-}
+gdcmDocEntry* gdcmDocument::GetDocEntryByNumber(uint16_t group,
+ uint16_t element)
+{
+ gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, element);
+ if ( ! tagHT.count(key))
+ return NULL;
+ return tagHT.find(key)->second;
+}
/**
- * \brief writes on disc according to the requested format
- * (ACR-NEMA, ExplicitVR, ImplicitVR) the image,
- * using only the last synonym of each mutimap H Table post.
- * \warning Uses the H Table, instead of the Chained List
- * in order to be compliant with the old way to proceed
- * (added elements taken in to account)
- * Only THERALYS, during a transitory phase is supposed
- * to use this method !!!
- * \warning DON'T try, right now, to write a DICOM image
- * from an ACR Header (meta elements will be missing!)
- * \sa WriteEntries
- * @param _fp already open file pointer
- * @param type type of the File to be written
- * (ACR-NEMA, ExplicitVR, ImplicitVR)
+ * \brief Same as \ref gdcmDocument::GetDocEntryByNumber except it only
+ * returns a result when the corresponding entry is of type
+ * ValEntry.
+ * @return When present, the corresponding ValEntry.
*/
-void gdcmDocument::WriteEntriesDeprecated(FILE *_fp,FileType type) {
-
- // restent a tester les echecs en ecriture (apres chaque fwrite)
+gdcmValEntry* gdcmDocument::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;
+}
- for (TagHeaderEntryHT::iterator tag2=tagHT.begin();
- tag2 != tagHT.end();
- ++tag2){
- if ( type == ACR ){
- if ((*tag2->second).GetGroup() < 0x0008) continue; // ignore pure DICOM V3 groups
- if ((*tag2->second).GetElement() %2) continue; // ignore shadow groups
- if ((*tag2->second).GetVR() == "SQ" ) continue; // ignore Sequences
- if ((*tag2->second).GetSQDepthLevel() != 0) continue; // Not only ignore the SQ element
- }
- if ( ! WriteEntry(tag2->second,_fp,type))
- break;
- }
+/**
+ * \brief Loads the element while preserving the current
+ * underlying file position indicator as opposed to
+ * to LoadDocEntry that modifies it.
+ * @param entry Header Entry whose value shall be loaded.
+ * @return
+ */
+void gdcmDocument::LoadDocEntrySafe(gdcmDocEntry * entry)
+{
+ long PositionOnEntry = ftell(fp);
+ LoadDocEntry(entry);
+ fseek(fp, PositionOnEntry, SEEK_SET);
}
/**
* processor order.
* @return The properly swaped 32 bits integer.
*/
-guint32 gdcmDocument::SwapLong(guint32 a) {
+uint32_t gdcmDocument::SwapLong(uint32_t a)
+{
switch (sw) {
case 0 :
break;
a=( ((a<<8) & 0xff00ff00) | ((a>>8) & 0x00ff00ff) );
break;
default :
+ std::cout << "swapCode= " << sw << std::endl;
dbg.Error(" gdcmDocument::SwapLong : unset swap code");
a=0;
}
- return(a);
-}
+ return a;
+}
/**
* \brief Unswaps back the bytes of 4-byte long integer accordingly to
* processor order.
* @return The properly unswaped 32 bits integer.
*/
-guint32 gdcmDocument::UnswapLong(guint32 a) {
- return (SwapLong(a));
+uint32_t gdcmDocument::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) {
+uint16_t gdcmDocument::SwapShort(uint16_t a)
+{
if ( (sw==4321) || (sw==2143) )
a =(((a<<8) & 0x0ff00) | ((a>>8)&0x00ff));
- return (a);
+ 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) {
- return (SwapShort(a));
+uint16_t gdcmDocument::UnswapShort(uint16_t a)
+{
+ return SwapShort(a);
}
//-----------------------------------------------------------------------------
// Private
+/**
+ * \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;
+ gdcmVRKey vr;
+ unsigned long l = 0;
+ int depth;
+
+ depth = set->GetDepthLevel();
+ while (true) {
+
+ if ( !delim_mode && ftell(fp)-offset >= l_max) {
+ break;
+ }
+ NewDocEntry = ReadNextDocEntry( );
+ if (!NewDocEntry)
+ break;
+
+ vr = NewDocEntry->GetVR();
+ if (vr!="SQ")
+ {
+
+ if ( gdcmGlobal::GetVR()->IsVROfGdcmStringRepresentable(vr) )
+ {
+ /////// ValEntry
+ NewValEntry = new gdcmValEntry(NewDocEntry->GetDictEntry());
+ NewValEntry->Copy(NewDocEntry);
+ NewValEntry->SetDepthLevel(depth);
+ set->AddEntry(NewValEntry);
+ LoadDocEntry(NewValEntry);
+ if (NewValEntry->isItemDelimitor())
+ break;
+ if ( !delim_mode && ftell(fp)-offset >= l_max)
+ {
+ break;
+ }
+ }
+ else
+ {
+ if ( ! gdcmGlobal::GetVR()->IsVROfGdcmBinaryRepresentable(vr) )
+ {
+ ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR
+ dbg.Verbose(0, "gdcmDocument::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);
+ }
+
+ if (NewDocEntry->GetGroup() == 0x7fe0 &&
+ NewDocEntry->GetElement() == 0x0010 )
+ {
+ if (NewDocEntry->GetReadLength()==0xffffffff)
+ {
+ // Broken US.3405.1.dcm
+ Parse7FE0(); // to skip the pixels
+ // (multipart JPEG/RLE are trouble makers)
+ }
+ else
+ {
+ SkipToNextDocEntry(NewDocEntry);
+ l = NewDocEntry->GetFullLength();
+ }
+ }
+ else
+ {
+ // to be sure we are at the beginning
+ SkipToNextDocEntry(NewDocEntry);
+ l = NewDocEntry->GetFullLength();
+ }
+ }
+ else
+ { // VR = "SQ"
+
+ 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);
+
+ if (l != 0)
+ { // Don't try to parse zero-length sequences
+ long lgt = ParseSQ( sq,
+ NewDocEntry->GetOffset(),
+ l, delim_mode);
+ (void)lgt; //not used...
+ }
+ set->AddEntry(sq);
+ if ( !delim_mode && ftell(fp)-offset >= l_max)
+ {
+ break;
+ }
+ }
+ 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)
+{
+ 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)
+ break;
+ if(delim_mode) {
+ if (NewDocEntry->isSequenceDelimitor()) {
+ set->SetSequenceDelimitationItem(NewDocEntry);
+ break;
+ }
+ }
+ if (!delim_mode && (ftell(fp)-offset) >= l_max) {
+ break;
+ }
+
+ itemSQ = new gdcmSQItem(set->GetDepthLevel());
+ itemSQ->AddEntry(NewDocEntry);
+ l= NewDocEntry->GetReadLength();
+
+ if (l == 0xffffffff)
+ dlm_mod = true;
+ else
+ dlm_mod=false;
+
+ lgr=ParseDES(itemSQ, NewDocEntry->GetOffset(), l, dlm_mod);
+
+ set->AddEntry(itemSQ,SQItemNumber);
+ SQItemNumber ++;
+ if (!delim_mode && (ftell(fp)-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
*/
-void gdcmDocument::LoadHeaderEntry(gdcmHeaderEntry *Entry) {
+void gdcmDocument::LoadDocEntry(gdcmDocEntry* 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);
// (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 ) {
- Entry->SetValue("gdcm::Skipped");
+ if( group == 0xfffe )
+ {
+ // NO more value field for SQ !
return;
}
// When the length is zero things are easy:
- if ( length == 0 ) {
- Entry->SetValue("");
+ if ( length == 0 )
+ {
+ ((gdcmValEntry *)Entry)->SetValue("");
return;
}
// The elements whose length is bigger than the specified upper bound
// are not loaded. Instead we leave a short notice of the offset of
// the element content and it's length.
- if (length > MaxSizeLoadEntry) {
- std::ostringstream s;
- s << "gdcm::NotLoaded.";
- s << " Address:" << (long)Entry->GetOffset();
- s << " Length:" << Entry->GetLength();
- s << " x(" << std::hex << Entry->GetLength() << ")";
- Entry->SetValue(s.str());
+
+ 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());
+ }
+ // 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) )
+ {
+ s << "gdcm::NotLoaded. (ValEntry)";
+ s << " Address:" << (long)Entry->GetOffset();
+ s << " Length:" << Entry->GetLength();
+ s << " x(" << std::hex << Entry->GetLength() << ")";
+ ValEntryPtr->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;
+ }
+
+ // 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());
return;
}
- // Any compacter code suggested (?)
- if ( IsHeaderEntryAnInteger(Entry) ) {
- guint32 NewInt;
+ /// \todo Any compacter code suggested (?)
+ if ( IsDocEntryAnInteger(Entry) )
+ {
+ uint32_t NewInt;
std::ostringstream s;
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
- Entry->SetValue(s.str());
+ ((gdcmValEntry *)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 ( item_read != 1 ) {
- dbg.Verbose(1, "gdcmDocument::LoadElementValue","unread element value");
- Entry->SetValue("gdcm::UnRead");
- return;
- }
+ if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(Entry) )
+ {
+ if ( item_read != 1 )
+ {
+ dbg.Verbose(1, "gdcmDocument::LoadDocEntry",
+ "unread element value");
+ ValEntry->SetValue("gdcm::UnRead");
+ return;
+ }
- if( (vr == "UI") ) // Because of correspondance with the VR dic
- Entry->SetValue(NewValue.c_str());
+ if( (vr == "UI") ) // Because of correspondance with the VR dic
+ ValEntry->SetValue(NewValue.c_str());
+ else
+ ValEntry->SetValue(NewValue);
+ }
else
- Entry->SetValue(NewValue);
+ {
+ dbg.Error(true, "gdcmDocument::LoadDocEntry"
+ "Should have a ValEntry, here !");
+ }
}
-/**
- * \brief add a new Dicom Element pointer to
- * the H Table and at the end of the chained List
- * \warning push_bash in listEntries ONLY during ParseHeader
- * \todo something to allow further Elements addition,
- * (at their right place in the chained list)
- * when position to be taken care of
- * @param newHeaderEntry
- */
-void gdcmDocument::AddHeaderEntry(gdcmHeaderEntry *newHeaderEntry) {
- tagHT.insert( PairHT( newHeaderEntry->GetKey(),newHeaderEntry) );
- listEntries.push_back(newHeaderEntry);
- wasUpdated = 1;
-}
/**
* \brief Find the value Length of the passed Header Entry
* @param Entry Header Entry whose length of the value shall be loaded.
*/
- void gdcmDocument::FindHeaderEntryLength (gdcmHeaderEntry *Entry) {
- guint16 element = Entry->GetElement();
- //guint16 group = Entry->GetGroup(); //FIXME
+void gdcmDocument::FindDocEntryLength (gdcmDocEntry *Entry)
+{
+ uint16_t element = Entry->GetElement();
std::string vr = Entry->GetVR();
- guint16 length16;
+ uint16_t length16;
- if ( (filetype == ExplicitVR) && (! Entry->IsImplicitVR()) )
+ if ( (Filetype == gdcmExplicitVR) && (! Entry->IsImplicitVR()) )
{
if ( (vr=="OB") || (vr=="OW") || (vr=="SQ") || (vr=="UN") )
{
// 7.1.2 Data element structure with explicit vr p27) must be
// skipped before proceeding on reading the length on 4 bytes.
fseek(fp, 2L, SEEK_CUR);
- guint32 length32 = ReadInt32();
+ uint32_t length32 = ReadInt32();
if ( (vr == "OB") && (length32 == 0xffffffff) )
{
- Entry->SetLength(FindHeaderEntryLengthOB());
+ uint32_t LengthOB = FindDocEntryLengthOB();
+ if ( errno == 1 )
+ {
+ // 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 = ftell(fp);
+ fseek(fp,0L,SEEK_END);
+ long LengthUntilEOF = ftell(fp) - CurrentPosition;
+ fseek(fp, CurrentPosition, SEEK_SET);
+ Entry->SetLength(LengthUntilEOF);
+ errno = 0;
+ return;
+ }
+ Entry->SetLength(LengthOB);
return;
}
- FixHeaderEntryFoundLength(Entry, length32);
+ FixDocEntryFoundLength(Entry, length32);
return;
}
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());
+ uint16_t CorrectGroup = SwapShort(Entry->GetGroup());
+ uint16_t CorrectElem = SwapShort(Entry->GetElement());
gdcmDictEntry * NewTag = GetDictEntryByNumber(CorrectGroup,
CorrectElem);
if (!NewTag)
Entry->SetDictEntry(NewTag);
}
- // Heuristic: well some files are really ill-formed.
+ // Heuristic: well, some files are really ill-formed.
if ( length16 == 0xffff)
{
length16 = 0;
- //dbg.Verbose(0, "gdcmDocument::FindLength",
- // "Erroneous element length fixed.");
- // Actually, length= 0xffff means that we deal with
- // Unknown Sequence Length
+ // Length16= 0xffff means that we deal with
+ // 'Unknown Length' Sequence
}
- FixHeaderEntryFoundLength(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.
- FixHeaderEntryFoundLength(Entry, ReadInt32());
+ FixDocEntryFoundLength(Entry, ReadInt32());
return;
}
}
* \brief Find the Value Representation of the current Dicom Element.
* @param Entry
*/
-void gdcmDocument::FindHeaderEntryVR( gdcmHeaderEntry *Entry)
+void gdcmDocument::FindDocEntryVR( gdcmDocEntry *Entry)
{
- if (filetype != ExplicitVR)
+ if (Filetype != gdcmExplicitVR)
return;
char VR[3];
(void)fread (&VR, (size_t)2,(size_t)1, fp);
VR[2]=0;
- if(!CheckHeaderEntryVR(Entry,VR))
+ if(!CheckDocEntryVR(Entry,VR))
{
fseek(fp, PositionOnEntry, SEEK_SET);
// When this element is known in the dictionary we shall use, e.g. for
* @return false if the VR is incorrect of if the VR isn't referenced
* otherwise, it returns true
*/
-bool gdcmDocument::CheckHeaderEntryVR(gdcmHeaderEntry *Entry, VRKey vr)
+bool gdcmDocument::CheckDocEntryVR(gdcmDocEntry *Entry, gdcmVRKey vr)
{
char msg[100]; // for sprintf
bool RealExplicit = true;
"UL","FIXME","Group Length");
Entry->SetDictEntry(NewEntry);
}
- return(false);
+ return false;
}
if ( Entry->IsVRUnknown() )
vr,"FIXME",Entry->GetName());
Entry->SetDictEntry(NewEntry);
}
- return(true);
+ return true;
}
/**
* @param Entry
* @return Transformed entry value
*/
-std::string gdcmDocument::GetHeaderEntryValue(gdcmHeaderEntry *Entry)
+std::string gdcmDocument::GetDocEntryValue(gdcmDocEntry *Entry)
{
- if ( (IsHeaderEntryAnInteger(Entry)) && (Entry->IsImplicitVR()) )
+ if ( (IsDocEntryAnInteger(Entry)) && (Entry->IsImplicitVR()) )
{
- std::string val=Entry->GetValue();
+ std::string val=((gdcmValEntry *)Entry)->GetValue();
std::string vr=Entry->GetVR();
- guint32 length = Entry->GetLength();
+ uint32_t length = Entry->GetLength();
std::ostringstream s;
int nbInt;
if (vr == "US" || vr == "SS")
{
- guint16 NewInt16;
+ uint16_t NewInt16;
nbInt = length / 2;
for (int i=0; i < nbInt; i++)
// 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++)
#ifdef GDCM_NO_ANSI_STRING_STREAM
s << std::ends; // to avoid oddities on Solaris
#endif //GDCM_NO_ANSI_STRING_STREAM
- return(s.str());
+ return s.str();
}
- return(Entry->GetValue());
+ return ((gdcmValEntry *)Entry)->GetValue();
}
/**
* @param Entry
* @return Reverse transformed entry value
*/
-std::string gdcmDocument::GetHeaderEntryUnvalue(gdcmHeaderEntry *Entry)
+std::string gdcmDocument::GetDocEntryUnvalue(gdcmDocEntry *Entry)
{
- if ( (IsHeaderEntryAnInteger(Entry)) && (Entry->IsImplicitVR()) )
+ if ( (IsDocEntryAnInteger(Entry)) && (Entry->IsImplicitVR()) )
{
std::string vr=Entry->GetVR();
std::ostringstream s;
if (vr == "US" || vr == "SS")
{
- guint16 NewInt16;
+ uint16_t NewInt16;
tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
- Tokenize (Entry->GetValue(), tokens, "\\");
+ Tokenize (((gdcmValEntry *)Entry)->GetValue(), tokens, "\\");
for (unsigned int i=0; i<tokens.size();i++)
{
NewInt16 = atoi(tokens[i].c_str());
}
if (vr == "UL" || vr == "SL")
{
- guint32 NewInt32;
+ uint32_t NewInt32;
tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
- Tokenize (Entry->GetValue(), tokens, "\\");
+ Tokenize (((gdcmValEntry *)Entry)->GetValue(), tokens, "\\");
for (unsigned int i=0; i<tokens.size();i++)
{
NewInt32 = atoi(tokens[i].c_str());
#ifdef GDCM_NO_ANSI_STRING_STREAM
s << std::ends; // to avoid oddities on Solaris
#endif //GDCM_NO_ANSI_STRING_STREAM
- return(s.str());
+ return s.str();
}
- return(Entry->GetValue());
+ return ((gdcmValEntry *)Entry)->GetValue();
}
/**
* \warning NOT end user intended method !
* @param entry
*/
-void gdcmDocument::SkipHeaderEntry(gdcmHeaderEntry *entry)
+void gdcmDocument::SkipDocEntry(gdcmDocEntry *entry)
+{
+ SkipBytes(entry->GetLength());
+}
+
+/**
+ * \brief Skips to the begining of the next Header Entry
+ * \warning NOT end user intended method !
+ * @param entry
+ */
+void gdcmDocument::SkipToNextDocEntry(gdcmDocEntry *entry)
{
- SkipBytes(entry->GetLength());
+ (void)fseek(fp, (long)(entry->GetOffset()), SEEK_SET);
+ (void)fseek(fp, (long)(entry->GetReadLength()), SEEK_CUR);
}
/**
* \brief When the length of an element value is obviously wrong (because
* the parser went Jabberwocky) one can hope improving things by
- * applying this heuristic.
+ * applying some heuristics.
*/
-void gdcmDocument::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 FoundLength)
+void gdcmDocument::FixDocEntryFoundLength(gdcmDocEntry *Entry,
+ uint32_t FoundLength)
{
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) {
std::ostringstream s;
- s << "Warning : Tag with uneven length " << FoundLength
- << " in x(" << std::hex << gr << "," << el <<")" << std::dec;
- dbg.Verbose(0,s.str().c_str());
+ s << "Warning : Tag with uneven length "
+ << FoundLength
+ << " in x(" << std::hex << gr << "," << el <<")" << std::dec;
+ dbg.Verbose(0, s.str().c_str());
}
- // Sorry for the patch!
- // XMedCom did the trick to read some naughty GE images ...
- if (FoundLength == 13) {
- // The following 'if' will be removed when there is no more
- // images on Creatis HDs with a 13 length for Manufacturer...
- if ( (Entry->GetGroup() != 0x0008) ||
- ( (Entry->GetElement() != 0x0070) && (Entry->GetElement() != 0x0080) ) ){
- // end of remove area
- FoundLength =10;
- Entry->SetReadLength(10); // a bug is to be fixed
+ //////// Fix for some naughty General Electric images.
+ // Allthough not recent many such GE corrupted images are still present
+ // on Creatis hard disks. Hence this fix shall remain when such images
+ // are no longer in user (we are talking a few years, here)...
+ // 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) ) )
+ {
+ FoundLength = 10;
+ Entry->SetReadLength(10); /// \todo a bug is to be fixed !?
}
}
- // to fix some garbage 'Leonardo' Siemens images
- // May be commented out to avoid overhead
- else if ( (Entry->GetGroup() == 0x0009) &&
- ( (Entry->GetElement() == 0x1113) || (Entry->GetElement() == 0x1114) ) ){
- FoundLength =4;
- Entry->SetReadLength(4); // a bug is to be fixed
+ //////// Fix for some brain-dead 'Leonardo' Siemens images.
+ // 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) ) )
+ {
+ FoundLength = 4;
+ Entry->SetReadLength(4); /// \todo a bug is to be fixed !?
}
- // end of fix
- // to try to 'go inside' SeQuences (with length), and not to skip them
- else if ( Entry->GetVR() == "SQ")
- {
- if (enableSequences) // only if the user does want to !
- FoundLength =0; // ReadLength is unchanged
+ //////// Deal with sequences, but only on users request:
+ else
+ if ( ( Entry->GetVR() == "SQ") && enableSequences)
+ {
+ FoundLength = 0; // ReadLength is unchanged
}
- // we found a 'delimiter' element
- // fffe|xxxx is just a marker, we don't take its length into account
- else if(Entry->GetGroup() == 0xfffe)
+ //////// 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)
{
- // *normally, fffe|0000 doesn't exist !
- if( Entry->GetElement() != 0x0000 ) // gdcm-MR-PHILIPS-16-Multi-Seq.dcm
- // causes extra troubles :-(
- FoundLength =0;
+ // 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 )
+ {
+ FoundLength = 0;
+ }
}
Entry->SetUsableLength(FoundLength);
* @param Entry The element value on which to apply the predicate.
* @return The result of the heuristical predicate.
*/
-bool gdcmDocument::IsHeaderEntryAnInteger(gdcmHeaderEntry *Entry) {
- guint16 element = Entry->GetElement();
- guint16 group = Entry->GetGroup();
- std::string vr = Entry->GetVR();
- guint32 length = Entry->GetLength();
+bool gdcmDocument::IsDocEntryAnInteger(gdcmDocEntry *Entry) {
+ uint16_t element = Entry->GetElement();
+ uint16_t group = Entry->GetGroup();
+ 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.
return true;
else
{
+ // Allthough this should never happen, still some images have a
+ // corrupted group length [e.g. have a glance at offset x(8336) of
+ // gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm].
+ // Since for dicom compliant and well behaved headers, the present
+ // test is useless (and might even look a bit paranoid), when we
+ // encounter such an ill-formed image, we simply display a warning
+ // message and proceed on parsing (while crossing fingers).
std::ostringstream s;
int filePosition = ftell(fp);
s << "Erroneous Group Length element length on : (" \
<< std::hex << group << " , " << element
<< ") -before- position x(" << filePosition << ")"
<< "lgt : " << length;
- // These 2 lines commented out : a *very dirty* patch
- // to go on PrintHeader'ing gdcm-MR-PHILIPS-16-Multi-Seq.dcm.
- // have a glance at offset x(8336) ...
- // For *regular* headers, the test is useless..
- // lets's print a warning message and go on,
- // instead of giving up with an error message
-
- //std::cout << s.str().c_str() << std::endl;
- // dbg.Error("gdcmDocument::IsHeaderEntryAnInteger",
- // s.str().c_str());
+ dbg.Verbose(0, "gdcmDocument::IsDocEntryAnInteger", s.str().c_str() );
}
}
+
if ( (vr == "UL") || (vr == "US") || (vr == "SL") || (vr == "SS") )
return true;
return false;
}
+
/**
* \brief Find the Length till the next sequence delimiter
* \warning NOT end user intended method !
* @return
*/
- guint32 gdcmDocument::FindHeaderEntryLengthOB(void) {
+uint32_t gdcmDocument::FindDocEntryLengthOB() {
// See PS 3.5-2001, section A.4 p. 49 on encapsulation of encoded pixel data.
- guint16 g;
- guint16 n;
+ uint16_t g;
+ uint16_t n;
long PositionOnEntry = ftell(fp);
bool FoundSequenceDelimiter = false;
- guint32 TotalLength = 0;
- guint32 ItemLength;
+ uint32_t TotalLength = 0;
+ uint32_t ItemLength;
while ( ! FoundSequenceDelimiter)
{
n = ReadInt16();
if (errno == 1)
return 0;
- TotalLength += 4; // We even have to decount the group and element
+
+ // We have to decount the group and element we just read
+ TotalLength += 4;
- if ( g != 0xfffe && g!=0xb00c ) //for bogus header
+ if ( ( g != 0xfffe )
+ || ( ( n != 0xe0dd ) && ( n != 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);
+ dbg.Verbose(1, "gdcmDocument::FindLengthOB: neither an Item tag "
+ "nor a Sequence delimiter tag.");
+ fseek(fp, PositionOnEntry, SEEK_SET);
errno = 1;
return 0;
}
- if ( n == 0xe0dd || ( g==0xb00c && n==0x0eb6 ) ) // for bogus header
+
+ if ( n == 0xe0dd )
FoundSequenceDelimiter = true;
- else if ( n != 0xe000 )
- {
- 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;
- }
+
ItemLength = ReadInt32();
- TotalLength += ItemLength + 4; // We add 4 bytes since we just read
- // the ItemLength with ReadInt32
+ // We add 4 bytes since we just read the ItemLength with ReadInt32
+ TotalLength += ItemLength + 4;
SkipBytes(ItemLength);
+
+ if ( FoundSequenceDelimiter )
+ break;
}
fseek(fp, PositionOnEntry, SEEK_SET);
return TotalLength;
* (swaps it depending on processor endianity)
* @return read value
*/
-guint16 gdcmDocument::ReadInt16(void) {
- guint16 g;
+uint16_t gdcmDocument::ReadInt16() {
+ uint16_t g;
size_t item_read;
item_read = fread (&g, (size_t)2,(size_t)1, fp);
if ( item_read != 1 ) {
* (swaps it depending on processor endianity)
* @return read value
*/
-guint32 gdcmDocument::ReadInt32(void) {
- guint32 g;
+uint32_t gdcmDocument::ReadInt32() {
+ uint32_t g;
size_t item_read;
item_read = fread (&g, (size_t)4,(size_t)1, fp);
if ( item_read != 1 ) {
* \warning NOT end user intended method !
* @return
*/
-void gdcmDocument::SkipBytes(guint32 NBytes) {
+void gdcmDocument::SkipBytes(uint32_t NBytes) {
//FIXME don't dump the returned value
(void)fseek(fp, (long)NBytes, SEEK_CUR);
}
* \brief Loads all the needed Dictionaries
* \warning NOT end user intended method !
*/
-void gdcmDocument::Initialise(void)
+void gdcmDocument::Initialise()
{
RefPubDict = gdcmGlobal::GetDicts()->GetDefaultPubDict();
- RefShaDict = (gdcmDict*)0;
+ RefShaDict = NULL;
}
/**
// 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;
// Use gdcmDocument::dicom_vr to test all the possibilities
// instead of just checking for UL, OB and UI !? group 0000
{
- filetype = ExplicitVR;
+ Filetype = gdcmExplicitVR;
dbg.Verbose(1, "gdcmDocument::CheckSwap:",
"explicit Value Representation");
}
else
{
- filetype = ImplicitVR;
+ Filetype = gdcmImplicitVR;
dbg.Verbose(1, "gdcmDocument::CheckSwap:",
"not an explicit Value Representation");
}
// 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) {
case 0x00040000 :
sw = 3412;
- filetype = ACR;
+ Filetype = gdcmACR;
return true;
case 0x04000000 :
sw = 4321;
- filetype = ACR;
+ Filetype = gdcmACR;
return true;
case 0x00000400 :
sw = 2143;
- filetype = ACR;
+ Filetype = gdcmACR;
return true;
case 0x00000004 :
sw = 0;
- filetype = ACR;
+ Filetype = gdcmACR;
return true;
default :
// 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 = ACR;
+ Filetype = gdcmACR;
return true;
case 0x0200 :
case 0x0400 :
case 0x0800 :
sw = 4321;
- filetype = ACR;
+ Filetype = gdcmACR;
return true;
default :
dbg.Verbose(0, "gdcmDocument::CheckSwap:",
"ACR/NEMA unfound swap info (Really hopeless !)");
- filetype = Unknown;
+ Filetype = gdcmUnknown;
return false;
}
* \brief Restore the unproperly loaded values i.e. the group, the element
* and the dictionary entry depending on them.
*/
-void gdcmDocument::SwitchSwapToBigEndian(void)
+void gdcmDocument::SwitchSwapToBigEndian()
{
dbg.Verbose(1, "gdcmDocument::SwitchSwapToBigEndian",
"Switching to BigEndian mode.");
{
if (NewSize < 0)
return;
- if ((guint32)NewSize >= (guint32)0xffffffff)
+ if ((uint32_t)NewSize >= (uint32_t)0xffffffff)
{
MaxSizeLoadEntry = 0xffffffff;
return;
{
if (NewSize < 0)
return;
- if ((guint32)NewSize >= (guint32)0xffffffff)
+ if ((uint32_t)NewSize >= (uint32_t)0xffffffff)
{
MaxSizePrintEntry = 0xffffffff;
return;
MaxSizePrintEntry = NewSize;
}
-/**
- * \brief Searches both the public and the shadow dictionary (when they
- * exist) for the presence of the DictEntry with given name.
- * The public dictionary has precedence on the shadow one.
- * @param Name name of the searched DictEntry
- * @return Corresponding DictEntry when it exists, NULL otherwise.
- */
-gdcmDictEntry *gdcmDocument::GetDictEntryByName(std::string Name)
-{
- gdcmDictEntry *found = (gdcmDictEntry *)0;
- if (!RefPubDict && !RefShaDict)
- {
- dbg.Verbose(0, "gdcmDocument::GetDictEntry",
- "we SHOULD have a default dictionary");
- }
- if (RefPubDict)
- {
- found = RefPubDict->GetDictEntryByName(Name);
- if (found)
- return found;
- }
- if (RefShaDict)
- {
- found = RefShaDict->GetDictEntryByName(Name);
- if (found)
- return found;
- }
- return found;
-}
-/**
- * \brief Searches both the public and the shadow dictionary (when they
- * exist) for the presence of the DictEntry with given
- * group and element. The public dictionary has precedence on the
- * shadow one.
- * @param group group of the searched DictEntry
- * @param element element of the searched DictEntry
- * @return Corresponding DictEntry when it exists, NULL otherwise.
- */
-gdcmDictEntry *gdcmDocument::GetDictEntryByNumber(guint16 group,guint16 element)
-{
- gdcmDictEntry *found = (gdcmDictEntry *)0;
- if (!RefPubDict && !RefShaDict)
- {
- dbg.Verbose(0, "gdcmDocument::GetDictEntry",
- "we SHOULD have a default dictionary");
- }
- if (RefPubDict)
- {
- found = RefPubDict->GetDictEntryByNumber(group, element);
- if (found)
- return found;
- }
- if (RefShaDict)
- {
- found = RefShaDict->GetDictEntryByNumber(group, element);
- if (found)
- return found;
- }
- return found;
-}
/**
* \brief Read the next tag but WITHOUT loading it's value
- * @return On succes the newly created HeaderEntry, NULL on failure.
- */
-gdcmHeaderEntry *gdcmDocument::ReadNextHeaderEntry(void) {
- guint16 g,n;
- gdcmHeaderEntry *NewEntry;
- g = ReadInt16();
- n = ReadInt16();
+ * (read the 'Group Number', the 'Element Number',
+ * gets the Dict Entry
+ * gets the VR, gets the length, gets the offset value)
+ * @return On succes the newly created DocEntry, NULL on failure.
+ */
+gdcmDocEntry *gdcmDocument::ReadNextDocEntry() {
+ uint16_t g = ReadInt16();
+ uint16_t n = ReadInt16();
+ gdcmDocEntry *NewEntry;
if (errno == 1)
// We reached the EOF (or an error occured) therefore
// header parsing has to be considered as finished.
- return (gdcmHeaderEntry *)0;
+ return (gdcmDocEntry *)0;
-// Pb : how to propagate the element length (used in SkipHeaderEntry)
-// direct call to SkipBytes ?
-
-// if (ignoreShadow == 1 && g%2 ==1)
- // if user wants to skip shadow groups
- // and current element *is* a shadow element
- // we don't create anything
-// return (gdcmHeaderEntry *)1; // to tell caller it's NOT finished
-
- NewEntry = NewHeaderEntryByNumber(g, n);
- FindHeaderEntryVR(NewEntry);
- FindHeaderEntryLength(NewEntry);
+ NewEntry = NewDocEntryByNumber(g, n);
+ FindDocEntryVR(NewEntry);
+ FindDocEntryLength(NewEntry);
- if (errno == 1) {
+ if (errno == 1)
+ {
// Call it quits
+ delete NewEntry;
return NULL;
}
NewEntry->SetOffset(ftell(fp));
return NewEntry;
}
+
+/**
+ * \brief Generate a free gdcmTagKey i.e. a gdcmTagKey that is not present
+ * in the TagHt dictionary.
+ * @param group The generated tag must belong to this group.
+ * @return The element of tag with given group which is fee.
+ */
+uint32_t gdcmDocument::GenerateFreeTagKeyInGroup(uint16_t group)
+{
+ for (uint32_t elem = 0; elem < UINT32_MAX; elem++)
+ {
+ gdcmTagKey key = gdcmDictEntry::TranslateToKey(group, elem);
+ if (tagHT.count(key) == 0)
+ return elem;
+ }
+ return UINT32_MAX;
+}
+
/**
- * \brief Build a new Element Value from all the low level arguments.
- * Check for existence of dictionary entry, and build
- * a default one when absent.
- * @param Name Name of the underlying DictEntry
+ * \brief Assuming the internal file pointer \ref gdcmDocument::fp
+ * is placed at the beginning of a tag check whether this
+ * tag is (TestGroup, TestElement).
+ * \warning On success the internal file pointer \ref gdcmDocument::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 True on success, false otherwise.
*/
-gdcmHeaderEntry *gdcmDocument::NewHeaderEntryByName(std::string Name)
+bool gdcmDocument::ReadTag(uint16_t TestGroup, uint16_t TestElement)
{
- gdcmDictEntry *NewTag = GetDictEntryByName(Name);
- if (!NewTag)
- NewTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", "unkn", Name);
+ uint16_t ItemTagGroup;
+ uint16_t ItemTagElement;
+ long PositionOnEntry = ftell(fp);
+ long CurrentPosition = ftell(fp); // On debugging purposes
- gdcmHeaderEntry* NewEntry = new gdcmHeaderEntry(NewTag);
- if (!NewEntry)
+ //// Read the Item Tag group and element, and make
+ // sure they are what we expected:
+ ItemTagGroup = ReadInt16();
+ ItemTagElement = ReadInt16();
+ if ( (ItemTagGroup != TestGroup) || (ItemTagElement != TestElement ) )
{
- dbg.Verbose(1, "gdcmDocument::ObtainHeaderEntryByName",
- "failed to allocate gdcmHeaderEntry");
- return (gdcmHeaderEntry *)0;
+ std::ostringstream s;
+ s << " We should have found tag (";
+ s << std::hex << TestGroup << "," << TestElement << ")" << std::endl;
+ s << " but instead we encountered tag (";
+ s << std::hex << ItemTagGroup << "," << ItemTagElement << ")"
+ << std::endl;
+ s << " at address: " << (unsigned)CurrentPosition << std::endl;
+ dbg.Verbose(0, "gdcmDocument::ReadItemTagLength: wrong Item Tag found:");
+ dbg.Verbose(0, s.str().c_str());
+ fseek(fp, PositionOnEntry, SEEK_SET);
+ return false;
}
- return NewEntry;
-}
+ return true;
+}
/**
- * \brief Request a new virtual dict entry to the dict set
- * @param group group of the underlying DictEntry
- * @param element element of the underlying DictEntry
- * @param vr VR of the underlying DictEntry
- * @param fourth owner group
- * @param name english name
+ * \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.
+ * 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.
*/
-gdcmDictEntry *gdcmDocument::NewVirtualDictEntry(guint16 group, guint16 element,
- std::string vr,
- std::string fourth,
- std::string name)
+uint32_t gdcmDocument::ReadTagLength(uint16_t TestGroup, uint16_t TestElement)
{
- return gdcmGlobal::GetDicts()->NewVirtualDictEntry(group,element,vr,fourth,name);
+ long PositionOnEntry = ftell(fp);
+ (void)PositionOnEntry;
+
+ if ( !ReadTag(TestGroup, TestElement) )
+ {
+ return 0;
+ }
+
+ //// Then read the associated Item Length
+ long CurrentPosition = ftell(fp);
+ uint32_t ItemLength;
+ 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());
+ }
+ return ItemLength;
}
/**
- * \brief Build a new Element Value from all the low level arguments.
- * Check for existence of dictionary entry, and build
- * a default one when absent.
- * @param Group group of the underlying DictEntry
- * @param Elem element of the underlying DictEntry
+ * \brief Parse pixel data from disk for multi-fragment Jpeg/Rle files
+ * No other way so 'skip' the Data
+ *
*/
-gdcmHeaderEntry *gdcmDocument::NewHeaderEntryByNumber(guint16 Group, guint16 Elem)
+void gdcmDocument::Parse7FE0 ()
{
- // Find out if the tag we encountered is in the dictionaries:
- gdcmDictEntry *DictEntry = GetDictEntryByNumber(Group, Elem);
- if (!DictEntry)
- DictEntry = NewVirtualDictEntry(Group, Elem);
+ gdcmDocEntry* Element = GetDocEntryByNumber(0x0002, 0x0010);
+ if ( !Element )
+ return;
+
+ if ( IsImplicitVRLittleEndianTransferSyntax()
+ || IsExplicitVRLittleEndianTransferSyntax()
+ || IsExplicitVRBigEndianTransferSyntax() /// \todo 1.2.2 ??? A verifier !
+ || IsDeflatedExplicitVRLittleEndianTransferSyntax() )
+ return;
+
+ // ---------------- for Parsing : Position on begining of Jpeg/RLE Pixels
+
+ //// Read the Basic Offset Table Item Tag length...
+ uint32_t ItemLength = ReadTagLength(0xfffe, 0xe000);
+
+ //// ... 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){
+ uint32_t IndividualLength;
+ IndividualLength = str2num(&BasicOffsetTableItemValue[i],uint32_t);
+ std::ostringstream s;
+ s << " Read one length: ";
+ s << std::hex << IndividualLength << std::endl;
+ dbg.Verbose(0, "gdcmDocument::Parse7FE0: ", s.str().c_str());
+ }
+ }
- gdcmHeaderEntry *NewEntry = new gdcmHeaderEntry(DictEntry);
- if (!NewEntry)
+ if ( ! IsRLELossLessTransferSyntax() )
{
- dbg.Verbose(1, "gdcmDocument::NewHeaderEntryByNumber",
- "failed to allocate gdcmHeaderEntry");
- return NULL;
+ // JPEG Image
+
+ //// We then skip (not reading them) all the fragments of images:
+ while ( (ItemLength = ReadTagLength(0xfffe, 0xe000)) )
+ {
+ SkipBytes(ItemLength);
+ }
+ }
+ else
+ {
+ // RLE Image
+ long ftellRes;
+ long RleSegmentLength[15], fragmentLength;
+
+ // While we find some items:
+ while ( (fragmentLength = ReadTagLength(0xfffe, 0xe000)) )
+ {
+ // Parse fragments of the current Fragment (Frame)
+ //------------------ scanning (not reading) fragment pixels
+ uint32_t nbRleSegments = ReadInt32();
+
+ //// Reading RLE Segments Offset Table
+ uint32_t RleSegmentOffsetTable[15];
+ for(int k=1; k<=15; k++) {
+ ftellRes=ftell(fp);
+ RleSegmentOffsetTable[k] = ReadInt32();
+ }
+
+ // 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);
+ SkipBytes(RleSegmentLength[k]);
+ }
+ }
+
+ RleSegmentLength[nbRleSegments]= fragmentLength
+ - RleSegmentOffsetTable[nbRleSegments];
+ ftellRes=ftell(fp);
+ SkipBytes(RleSegmentLength[nbRleSegments]);
+ }
+
+ // Make sure that at the end of the item we encounter a 'Sequence
+ // Delimiter Item':
+ if ( ! ReadTag(0xfffe, 0xe0dd) )
+ {
+ dbg.Verbose(0, "gdcmDocument::Parse7FE0: no sequence delimiter item");
+ dbg.Verbose(0, " at end of RLE item sequence");
+ }
}
- return NewEntry;
}
-/// \todo Never used; commented out, waiting for removal.
-/**
- * \brief Small utility function that creates a new manually crafted
- * (as opposed as read from the file) gdcmHeaderEntry with user
- * specified name and adds it to the public tag hash table.
- * \note A fake TagKey is generated so the PubDict can keep it's coherence.
- * @param NewTagName The name to be given to this new tag.
- * @param VR The Value Representation to be given to this new tag.
- * @return The newly hand crafted Element Value.
- */
-//gdcmHeaderEntry *gdcmDocument::NewManualHeaderEntryToPubDict(std::string NewTagName,
-// std::string VR)
-//{
-// gdcmHeaderEntry *NewEntry = NULL;
-// guint32 StuffGroup = 0xffff; // Group to be stuffed with additional info
-// guint32 FreeElem = 0;
-// gdcmDictEntry *DictEntry = NULL;
-//
-// FreeElem = GenerateFreeTagKeyInGroup(StuffGroup);
-// if (FreeElem == UINT32_MAX)
-// {
-// dbg.Verbose(1, "gdcmHeader::NewManualHeaderEntryToPubDict",
-// "Group 0xffff in Public Dict is full");
-// return NULL;
-// }
-//
-// DictEntry = NewVirtualDictEntry(StuffGroup, FreeElem,
-// VR, "GDCM", NewTagName);
-// NewEntry = new gdcmHeaderEntry(DictEntry);
-// AddHeaderEntry(NewEntry);
-// return NewEntry;
-//}
-
-/**
- * \brief Generate a free TagKey i.e. a TagKey that is not present
- * in the TagHt dictionary.
- * @param group The generated tag must belong to this group.
- * @return The element of tag with given group which is fee.
+
+
+/**
+ * \brief Compares two documents, according to \ref gdcmDicomDir 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'
*/
-guint32 gdcmDocument::GenerateFreeTagKeyInGroup(guint16 group)
+bool gdcmDocument::operator<(gdcmDocument &document)
{
- for (guint32 elem = 0; elem < UINT32_MAX; elem++)
+ std::string s1,s2;
+
+ // Patient Name
+ s1=this->GetEntryByNumber(0x0010,0x0010);
+ s2=document.GetEntryByNumber(0x0010,0x0010);
+ if(s1 < s2)
+ return true;
+ else if(s1 > s2)
+ return false;
+ else
{
- TagKey key = gdcmDictEntry::TranslateToKey(group, elem);
- if (tagHT.count(key) == 0)
- return elem;
+ // Patient ID
+ s1=this->GetEntryByNumber(0x0010,0x0020);
+ s2=document.GetEntryByNumber(0x0010,0x0020);
+ if (s1 < s2)
+ return true;
+ else if (s1 > s2)
+ return true;
+ else
+ {
+ // Study Instance UID
+ s1=this->GetEntryByNumber(0x0020,0x000d);
+ s2=document.GetEntryByNumber(0x0020,0x000d);
+ if (s1 < s2)
+ return true;
+ else if(s1 > s2)
+ return false;
+ else
+ {
+ // Serie Instance UID
+ s1=this->GetEntryByNumber(0x0020,0x000e);
+ s2=document.GetEntryByNumber(0x0020,0x000e);
+ if (s1 < s2)
+ return true;
+ else if(s1 > s2)
+ return false;
+ }
+ }
}
- return UINT32_MAX;
+ return false;
}
+
//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff