X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.cxx;h=9eadf2c706b8eb4e8710de6255e92516a1f0a4c8;hb=e8c9887a86dcff58228e477b76b9ec361d27f4c9;hp=2c356eddcd422d44c195a916320044c4f9df3edc;hpb=74e3bc05fade5a18f193e7d1122c74756c0e689e;p=gdcm.git diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index 2c356edd..9eadf2c7 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmHeader.cxx,v $ Language: C++ - Date: $Date: 2005/01/06 16:05:06 $ - Version: $Revision: 1.221 $ + Date: $Date: 2005/01/10 17:09:49 $ + Version: $Revision: 1.228 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -34,7 +34,7 @@ namespace gdcm * \brief Constructor * @param filename name of the file whose header we want to analyze */ -Header::Header( std::string const & filename ): +Header::Header( std::string const &filename ): Document( filename ) { // for some ACR-NEMA images GrPixel, NumPixel is *not* 7fe0,0010 @@ -44,11 +44,11 @@ Header::Header( std::string const & filename ): // is found by indirection through the "Image Location"). // Inside the group pointed by "Image Location" the searched element // is conventionally the element 0x0010 (when the norm is respected). - // When the "Image Location" is absent we default to group 0x7fe0. + // When the "Image Location" is Missing we default to group 0x7fe0. // Note: this IS the right place for the code // Image Location - const std::string &imgLocation = GetEntryByNumber(0x0028, 0x0200); + const std::string &imgLocation = GetEntry(0x0028, 0x0200); if ( imgLocation == GDCM_UNFOUND ) { // default value @@ -81,7 +81,7 @@ Header::Header( std::string const & filename ): // Let's create a VirtualDictEntry to allow a further VR modification // and force VR to match with BitsAllocated. - DocEntry* entry = GetDocEntryByNumber(GrPixel, NumPixel); + DocEntry *entry = GetDocEntry(GrPixel, NumPixel); if ( entry != 0 ) { @@ -127,29 +127,29 @@ Header::~Header () */ bool Header::Write(std::string fileName, FileType filetype) { - std::ofstream* fp = new std::ofstream(fileName.c_str(), + std::ofstream *fp = new std::ofstream(fileName.c_str(), std::ios::out | std::ios::binary); if (*fp == NULL) { - dbg.Verbose(2, "Failed to open (write) File: " , fileName.c_str()); + gdcmVerboseMacro("Failed to open (write) File: " << fileName.c_str()); return false; } // Bits Allocated - if ( GetEntryByNumber(0x0028,0x0100) == "12") + if ( GetEntry(0x0028,0x0100) == "12") { - SetEntryByNumber("16", 0x0028,0x0100); + SetEntry("16", 0x0028,0x0100); } /// \todo correct 'Pixel group' Length if necessary - int i_lgPix = GetEntryLengthByNumber(GrPixel, NumPixel); + int i_lgPix = GetEntryLength(GrPixel, NumPixel); if (i_lgPix != -2) { // no (GrPixel, NumPixel) element std::string s_lgPix = Util::Format("%d", i_lgPix+12); s_lgPix = Util::DicomString( s_lgPix.c_str() ); - ReplaceOrCreateByNumber(s_lgPix,GrPixel, 0x0000); + ReplaceOrCreate(s_lgPix,GrPixel, 0x0000); } // FIXME : should be nice if we could move it to File @@ -157,38 +157,38 @@ bool Header::Write(std::string fileName, FileType filetype) // Drop Palette Color, if necessary - if ( GetEntryByNumber(0x0028,0x0002).c_str()[0] == '3' ) + if ( GetEntry(0x0028,0x0002).c_str()[0] == '3' ) { // if SamplesPerPixel = 3, sure we don't need any LUT ! // Drop 0028|1101, 0028|1102, 0028|1103 // Drop 0028|1201, 0028|1202, 0028|1203 - DocEntry* e = GetDocEntryByNumber(0x0028,0x01101); + DocEntry *e = GetDocEntry(0x0028,0x01101); if (e) { RemoveEntryNoDestroy(e); } - e = GetDocEntryByNumber(0x0028,0x1102); + e = GetDocEntry(0x0028,0x1102); if (e) { RemoveEntryNoDestroy(e); } - e = GetDocEntryByNumber(0x0028,0x1103); + e = GetDocEntry(0x0028,0x1103); if (e) { RemoveEntryNoDestroy(e); } - e = GetDocEntryByNumber(0x0028,0x01201); + e = GetDocEntry(0x0028,0x01201); if (e) { RemoveEntryNoDestroy(e); } - e = GetDocEntryByNumber(0x0028,0x1202); + e = GetDocEntry(0x0028,0x1202); if (e) { RemoveEntryNoDestroy(e); } - e = GetDocEntryByNumber(0x0028,0x1203); + e = GetDocEntry(0x0028,0x1203); if (e) { RemoveEntryNoDestroy(e); @@ -224,24 +224,24 @@ bool Header::IsReadable() return false; } - const std::string &res = GetEntryByNumber(0x0028, 0x0005); + const std::string &res = GetEntry(0x0028, 0x0005); if ( res != GDCM_UNFOUND && atoi(res.c_str()) > 4 ) { return false; // Image Dimensions } - if ( !GetDocEntryByNumber(0x0028, 0x0100) ) + if ( !GetDocEntry(0x0028, 0x0100) ) { return false; // "Bits Allocated" } - if ( !GetDocEntryByNumber(0x0028, 0x0101) ) + if ( !GetDocEntry(0x0028, 0x0101) ) { return false; // "Bits Stored" } - if ( !GetDocEntryByNumber(0x0028, 0x0102) ) + if ( !GetDocEntry(0x0028, 0x0102) ) { return false; // "High Bit" } - if ( !GetDocEntryByNumber(0x0028, 0x0103) ) + if ( !GetDocEntry(0x0028, 0x0103) ) { return false; // "Pixel Representation" i.e. 'Sign' } @@ -256,7 +256,7 @@ bool Header::IsReadable() */ int Header::GetXSize() { - const std::string &strSize = GetEntryByNumber(0x0028,0x0011); + const std::string &strSize = GetEntry(0x0028,0x0011); if ( strSize == GDCM_UNFOUND ) { return 0; @@ -273,7 +273,7 @@ int Header::GetXSize() */ int Header::GetYSize() { - const std::string &strSize = GetEntryByNumber(0x0028,0x0010); + const std::string &strSize = GetEntry(0x0028,0x0010); if ( strSize != GDCM_UNFOUND ) { return atoi( strSize.c_str() ); @@ -292,7 +292,7 @@ int Header::GetYSize() * \brief Retrieve the number of planes of volume or the number * of frames of a multiframe. * \warning When present we consider the "Number of Frames" as the third - * dimension. When absent we consider the third dimension as + * dimension. When Missing we consider the third dimension as * being the ACR-NEMA "Planes" tag content. * @return The encountered size when found, 1 by default (single image). */ @@ -300,14 +300,14 @@ int Header::GetZSize() { // Both DicomV3 and ACR/Nema consider the "Number of Frames" // as the third dimension. - const std::string &strSize = GetEntryByNumber(0x0028,0x0008); + const std::string &strSize = GetEntry(0x0028,0x0008); if ( strSize != GDCM_UNFOUND ) { return atoi( strSize.c_str() ); } // We then consider the "Planes" entry as the third dimension - const std::string &strSize2 = GetEntryByNumber(0x0028,0x0012); + const std::string &strSize2 = GetEntry(0x0028,0x0012); if ( strSize2 != GDCM_UNFOUND ) { return atoi( strSize2.c_str() ); @@ -324,11 +324,11 @@ int Header::GetZSize() float Header::GetXSpacing() { float xspacing, yspacing; - const std::string &strSpacing = GetEntryByNumber(0x0028,0x0030); + const std::string &strSpacing = GetEntry(0x0028,0x0030); if ( strSpacing == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetXSpacing: unfound Pixel Spacing (0028,0030)"); + gdcmVerboseMacro( "Unfound Pixel Spacing (0028,0030)" ); return 1.; } @@ -355,10 +355,10 @@ float Header::GetXSpacing() if ( xspacing == 0.) { - dbg.Verbose(0, "Header::GetXSpacing: gdcmData/CT-MONO2-8-abdo.dcm problem"); + gdcmVerboseMacro("gdcmData/CT-MONO2-8-abdo.dcm problem"); // seems to be a bug in the header ... nbValues = sscanf( strSpacing.c_str(), "%f\\0\\%f", &yspacing, &xspacing); - assert( nbValues == 2 ); + gdcmAssertMacro( nbValues == 2 ); } return xspacing; @@ -372,11 +372,11 @@ float Header::GetXSpacing() float Header::GetYSpacing() { float yspacing = 1.; - std::string strSpacing = GetEntryByNumber(0x0028,0x0030); + std::string strSpacing = GetEntry(0x0028,0x0030); if ( strSpacing == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetYSpacing: unfound Pixel Spacing (0028,0030)"); + gdcmVerboseMacro("Unfound Pixel Spacing (0028,0030)"); return 1.; } @@ -404,17 +404,18 @@ float Header::GetZSpacing() // disjointes (Spacing between Slices > Slice Thickness) // Slice Thickness : epaisseur de tissus sur laquelle est acquis le signal // ca interesse le physicien de l'IRM, pas le visualisateur de volumes ... - // Si le Spacing Between Slices est absent, + // Si le Spacing Between Slices est Missing, // on suppose que les coupes sont jointives - const std::string &strSpacingBSlices = GetEntryByNumber(0x0018,0x0088); + const std::string &strSpacingBSlices = GetEntry(0x0018,0x0088); if ( strSpacingBSlices == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetZSpacing: unfound StrSpacingBSlices"); - const std::string &strSliceThickness = GetEntryByNumber(0x0018,0x0050); + gdcmVerboseMacro("Unfound Spacing Between Slices (0018,0088)"); + const std::string &strSliceThickness = GetEntry(0x0018,0x0050); if ( strSliceThickness == GDCM_UNFOUND ) { + gdcmVerboseMacro("Unfound Slice Thickness (0018,0050)"); return 1.; } else @@ -438,14 +439,13 @@ float Header::GetRescaleIntercept() { float resInter = 0.; /// 0028 1052 DS IMG Rescale Intercept - const std::string &strRescInter = GetEntryByNumber(0x0028,0x1052); + const std::string &strRescInter = GetEntry(0x0028,0x1052); if ( strRescInter != GDCM_UNFOUND ) { if( sscanf( strRescInter.c_str(), "%f", &resInter) != 1 ) { // bug in the element 0x0028,0x1052 - dbg.Verbose(0, "Header::GetRescaleIntercept: Rescale Slope " - "is empty"); + gdcmVerboseMacro( "Rescale Intercept (0028,1052) is empty." ); } } @@ -460,13 +460,13 @@ float Header::GetRescaleSlope() { float resSlope = 1.; //0028 1053 DS IMG Rescale Slope - std::string strRescSlope = GetEntryByNumber(0x0028,0x1053); + std::string strRescSlope = GetEntry(0x0028,0x1053); if ( strRescSlope != GDCM_UNFOUND ) { if( sscanf( strRescSlope.c_str(), "%f", &resSlope) != 1) { // bug in the element 0x0028,0x1053 - dbg.Verbose(0, "Header::GetRescaleSlope: Rescale Slope is empty"); + gdcmVerboseMacro( "Rescale Slope (0028,1053) is empty."); } } @@ -489,12 +489,12 @@ int Header::GetNumberOfScalarComponents() // 0028 0100 US IMG Bits Allocated // (in order no to be messed up by old RGB images) - if ( GetEntryByNumber(0x0028,0x0100) == "24" ) + if ( GetEntry(0x0028,0x0100) == "24" ) { return 3; } - std::string strPhotometricInterpretation = GetEntryByNumber(0x0028,0x0004); + std::string strPhotometricInterpretation = GetEntry(0x0028,0x0004); if ( ( strPhotometricInterpretation == "PALETTE COLOR ") ) { @@ -534,7 +534,7 @@ int Header::GetNumberOfScalarComponentsRaw() { // 0028 0100 US IMG Bits Allocated // (in order no to be messed up by old RGB images) - if ( Header::GetEntryByNumber(0x0028,0x0100) == "24" ) + if ( Header::GetEntry(0x0028,0x0100) == "24" ) { return 3; } @@ -568,17 +568,15 @@ int Header::GetNumberOfScalarComponentsRaw() float Header::GetXOrigin() { float xImPos, yImPos, zImPos; - std::string strImPos = GetEntryByNumber(0x0020,0x0032); + std::string strImPos = GetEntry(0x0020,0x0032); if ( strImPos == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetXImagePosition: unfound Image " - "Position Patient (0020,0032)"); - strImPos = GetEntryByNumber(0x0020,0x0030); // For ACR-NEMA images + gdcmVerboseMacro( "Unfound Image Position Patient (0020,0032)"); + strImPos = GetEntry(0x0020,0x0030); // For ACR-NEMA images if ( strImPos == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetXImagePosition: unfound Image " - "Position (RET) (0020,0030)"); + gdcmVerboseMacro( "Unfound Image Position (RET) (0020,0030)"); /// \todo How to tell the caller nothing was found ? return 0.; } @@ -601,17 +599,15 @@ float Header::GetXOrigin() float Header::GetYOrigin() { float xImPos, yImPos, zImPos; - std::string strImPos = GetEntryByNumber(0x0020,0x0032); + std::string strImPos = GetEntry(0x0020,0x0032); if ( strImPos == GDCM_UNFOUND) { - dbg.Verbose(0, "Header::GetYImagePosition: unfound Image " - "Position Patient (0020,0032)"); - strImPos = GetEntryByNumber(0x0020,0x0030); // For ACR-NEMA images + gdcmVerboseMacro( "Unfound Image Position Patient (0020,0032)"); + strImPos = GetEntry(0x0020,0x0030); // For ACR-NEMA images if ( strImPos == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetYImagePosition: unfound Image " - "Position (RET) (0020,0030)"); + gdcmVerboseMacro( "Unfound Image Position (RET) (0020,0030)"); /// \todo How to tell the caller nothing was found ? return 0.; } @@ -636,14 +632,13 @@ float Header::GetYOrigin() float Header::GetZOrigin() { float xImPos, yImPos, zImPos; - std::string strImPos = GetEntryByNumber(0x0020,0x0032); + std::string strImPos = GetEntry(0x0020,0x0032); if ( strImPos != GDCM_UNFOUND ) { if( sscanf( strImPos.c_str(), "%f\\%f\\%f", &xImPos, &yImPos, &zImPos) != 3) { - dbg.Verbose(0, "Header::GetZImagePosition: wrong Image " - "Position Patient (0020,0032)"); + gdcmVerboseMacro( "Wrong Image Position Patient (0020,0032)"); return 0.; // bug in the element 0x0020,0x0032 } else @@ -652,13 +647,13 @@ float Header::GetZOrigin() } } - strImPos = GetEntryByNumber(0x0020,0x0030); // For ACR-NEMA images + strImPos = GetEntry(0x0020,0x0030); // For ACR-NEMA images if ( strImPos != GDCM_UNFOUND ) { if( sscanf( strImPos.c_str(), "%f\\%f\\%f", &xImPos, &yImPos, &zImPos ) != 3 ) { - dbg.Verbose(0, "Header::GetZImagePosition: wrong Image Position (RET) (0020,0030)"); + gdcmVerboseMacro( "Wrong Image Position (RET) (0020,0030)"); return 0.; // bug in the element 0x0020,0x0032 } else @@ -667,12 +662,12 @@ float Header::GetZOrigin() } } - std::string strSliceLocation = GetEntryByNumber(0x0020,0x1041); // for *very* old ACR-NEMA images + std::string strSliceLocation = GetEntry(0x0020,0x1041); // for *very* old ACR-NEMA images if ( strSliceLocation != GDCM_UNFOUND ) { if( sscanf( strSliceLocation.c_str(), "%f", &zImPos) != 1) { - dbg.Verbose(0, "Header::GetZImagePosition: wrong Slice Location (0020,1041)"); + gdcmVerboseMacro( "Wrong Slice Location (0020,1041)"); return 0.; // bug in the element 0x0020,0x1041 } else @@ -680,14 +675,14 @@ float Header::GetZOrigin() return zImPos; } } - dbg.Verbose(0, "Header::GetZImagePosition: unfound Slice Location (0020,1041)"); + gdcmVerboseMacro( "Unfound Slice Location (0020,1041)"); - std::string strLocation = GetEntryByNumber(0x0020,0x0050); + std::string strLocation = GetEntry(0x0020,0x0050); if ( strLocation != GDCM_UNFOUND ) { if( sscanf( strLocation.c_str(), "%f", &zImPos) != 1) { - dbg.Verbose(0, "Header::GetZImagePosition: wrong Location (0020,0050)"); + gdcmVerboseMacro( "Wrong Location (0020,0050)"); return 0.; // bug in the element 0x0020,0x0050 } else @@ -695,7 +690,7 @@ float Header::GetZOrigin() return zImPos; } } - dbg.Verbose(0, "Header::GetYImagePosition: unfound Location (0020,0050)"); + gdcmVerboseMacro( "Unfound Location (0020,0050)"); return 0.; // Hopeless } @@ -713,7 +708,7 @@ int Header::GetImageNumber() // faster function. sscanf() can do all possible conversions whereas // atoi() can only do single decimal integer conversions. //0020 0013 IS REL Image Number - std::string strImNumber = GetEntryByNumber(0x0020,0x0013); + std::string strImNumber = GetEntry(0x0020,0x0013); if ( strImNumber != GDCM_UNFOUND ) { return atoi( strImNumber.c_str() ); @@ -728,7 +723,7 @@ int Header::GetImageNumber() ModalityType Header::GetModality() { // 0008 0060 CS ID Modality - std::string strModality = GetEntryByNumber(0x0008,0x0060); + std::string strModality = GetEntry(0x0008,0x0060); if ( strModality != GDCM_UNFOUND ) { if ( strModality.find("AU") < strModality.length()) return AU; @@ -791,11 +786,10 @@ ModalityType Header::GetModality() */ int Header::GetBitsStored() { - std::string strSize = GetEntryByNumber( 0x0028, 0x0101 ); + std::string strSize = GetEntry( 0x0028, 0x0101 ); if ( strSize == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetBitsStored: this is supposed to " - "be mandatory"); + gdcmVerboseMacro("(0028,0101) is supposed to be mandatory"); return 0; // It's supposed to be mandatory // the caller will have to check } @@ -804,17 +798,16 @@ int Header::GetBitsStored() /** * \brief Retrieve the high bit position. - * \warning The method defaults to 0 when information is absent. + * \warning The method defaults to 0 when information is Missing. * The responsability of checking this value is left to the caller. - * @return The high bit positin when present. 0 when absent. + * @return The high bit positin when present. 0 when Missing. */ int Header::GetHighBitPosition() { - std::string strSize = GetEntryByNumber( 0x0028, 0x0102 ); + std::string strSize = GetEntry( 0x0028, 0x0102 ); if ( strSize == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetHighBitPosition: this is supposed " - "to be mandatory"); + gdcmVerboseMacro( "(0028,0102) is supposed to be mandatory"); return 0; } return atoi( strSize.c_str() ); @@ -822,17 +815,16 @@ int Header::GetHighBitPosition() /** * \brief Check wether the pixels are signed or UNsigned data. - * \warning The method defaults to false (UNsigned) when information is absent. + * \warning The method defaults to false (UNsigned) when information is Missing. * The responsability of checking this value is left to the caller. * @return True when signed, false when UNsigned */ bool Header::IsSignedPixelData() { - std::string strSize = GetEntryByNumber( 0x0028, 0x0103 ); + std::string strSize = GetEntry( 0x0028, 0x0103 ); if ( strSize == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::IsSignedPixelData: this is supposed " - "to be mandatory"); + gdcmVerboseMacro( "(0028,0103) is supposed to be mandatory"); return false; } int sign = atoi( strSize.c_str() ); @@ -851,11 +843,10 @@ bool Header::IsSignedPixelData() */ int Header::GetBitsAllocated() { - std::string strSize = GetEntryByNumber(0x0028,0x0100); + std::string strSize = GetEntry(0x0028,0x0100); if ( strSize == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetBitsStored: this is supposed to " - "be mandatory"); + gdcmVerboseMacro( "(0028,0100) is supposed to be mandatory"); return 0; // It's supposed to be mandatory // the caller will have to check } @@ -870,11 +861,10 @@ int Header::GetBitsAllocated() */ int Header::GetSamplesPerPixel() { - const std::string& strSize = GetEntryByNumber(0x0028,0x0002); + const std::string& strSize = GetEntry(0x0028,0x0002); if ( strSize == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetBitsStored: this is supposed to " - "be mandatory"); + gdcmVerboseMacro( "(0028,0002) is supposed to be mandatory"); return 1; // Well, it's supposed to be mandatory ... // but sometimes it's missing : *we* assume Gray pixels } @@ -888,7 +878,7 @@ int Header::GetSamplesPerPixel() */ bool Header::IsMonochrome() { - const std::string& PhotometricInterp = GetEntryByNumber( 0x0028, 0x0004 ); + const std::string& PhotometricInterp = GetEntry( 0x0028, 0x0004 ); if ( Util::DicomStringEqual(PhotometricInterp, "MONOCHROME1") || Util::DicomStringEqual(PhotometricInterp, "MONOCHROME2") ) { @@ -896,8 +886,7 @@ bool Header::IsMonochrome() } if ( PhotometricInterp == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::IsMonochrome: absent Photometric " - "Interpretation"); + gdcmVerboseMacro( "Not found : Photometric Interpretation (0028,0004)"); } return false; } @@ -909,15 +898,14 @@ bool Header::IsMonochrome() */ bool Header::IsPaletteColor() { - std::string PhotometricInterp = GetEntryByNumber( 0x0028, 0x0004 ); + std::string PhotometricInterp = GetEntry( 0x0028, 0x0004 ); if ( PhotometricInterp == "PALETTE COLOR " ) { return true; } if ( PhotometricInterp == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::IsPaletteColor: absent Photometric " - "Interpretation"); + gdcmVerboseMacro( "Not found : Palette color (0028,0004)"); } return false; } @@ -929,15 +917,14 @@ bool Header::IsPaletteColor() */ bool Header::IsYBRFull() { - std::string PhotometricInterp = GetEntryByNumber( 0x0028, 0x0004 ); + std::string PhotometricInterp = GetEntry( 0x0028, 0x0004 ); if ( PhotometricInterp == "YBR_FULL" ) { return true; } if ( PhotometricInterp == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::IsYBRFull: absent Photometric " - "Interpretation"); + gdcmVerboseMacro( "Not found : YBR Full (0028,0004)"); } return false; } @@ -949,9 +936,10 @@ bool Header::IsYBRFull() */ int Header::GetPlanarConfiguration() { - std::string strSize = GetEntryByNumber(0x0028,0x0006); + std::string strSize = GetEntry(0x0028,0x0006); if ( strSize == GDCM_UNFOUND ) { + gdcmVerboseMacro( "Not found : Planar Configuration (0028,0006)"); return 0; } return atoi( strSize.c_str() ); @@ -966,7 +954,7 @@ int Header::GetPixelSize() { // 0028 0100 US IMG Bits Allocated // (in order no to be messed up by old RGB images) - // if (Header::GetEntryByNumber(0x0028,0x0100) == "24") + // if (Header::GetEntry(0x0028,0x0100) == "24") // return 3; std::string pixelType = GetPixelType(); @@ -986,7 +974,7 @@ int Header::GetPixelSize() { return 8; } - dbg.Verbose(0, "Header::GetPixelSize: Unknown pixel type"); + gdcmVerboseMacro( "Unknown pixel type"); return 0; } @@ -1006,10 +994,10 @@ int Header::GetPixelSize() */ std::string Header::GetPixelType() { - std::string bitsAlloc = GetEntryByNumber(0x0028, 0x0100); // Bits Allocated + std::string bitsAlloc = GetEntry(0x0028, 0x0100); // Bits Allocated if ( bitsAlloc == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetPixelType: unfound Bits Allocated"); + gdcmVerboseMacro( "Missing Bits Allocated (0028,0100)"); bitsAlloc = "16"; } @@ -1028,11 +1016,11 @@ std::string Header::GetPixelType() bitsAlloc = "8"; // by old RGB images) } - std::string sign = GetEntryByNumber(0x0028, 0x0103);//"Pixel Representation" + std::string sign = GetEntry(0x0028, 0x0103);//"Pixel Representation" if (sign == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetPixelType: unfound Pixel Representation"); + gdcmVerboseMacro( "Missing Pixel Representation (0028,0103)"); bitsAlloc = "0"; } else if ( sign == "0" ) @@ -1054,7 +1042,7 @@ std::string Header::GetPixelType() */ size_t Header::GetPixelOffset() { - DocEntry* pxlElement = GetDocEntryByNumber(GrPixel,NumPixel); + DocEntry* pxlElement = GetDocEntry(GrPixel,NumPixel); if ( pxlElement ) { return pxlElement->GetOffset(); @@ -1080,7 +1068,7 @@ size_t Header::GetPixelOffset() */ size_t Header::GetPixelAreaLength() { - DocEntry* pxlElement = GetDocEntryByNumber(GrPixel,NumPixel); + DocEntry* pxlElement = GetDocEntry(GrPixel,NumPixel); if ( pxlElement ) { return pxlElement->GetLength(); @@ -1108,32 +1096,32 @@ bool Header::HasLUT() { // Check the presence of the LUT Descriptors, and LUT Tables // LutDescriptorRed - if ( !GetDocEntryByNumber(0x0028,0x1101) ) + if ( !GetDocEntry(0x0028,0x1101) ) { return false; } // LutDescriptorGreen - if ( !GetDocEntryByNumber(0x0028,0x1102) ) + if ( !GetDocEntry(0x0028,0x1102) ) { return false; } // LutDescriptorBlue - if ( !GetDocEntryByNumber(0x0028,0x1103) ) + if ( !GetDocEntry(0x0028,0x1103) ) { return false; } // Red Palette Color Lookup Table Data - if ( !GetDocEntryByNumber(0x0028,0x1201) ) + if ( !GetDocEntry(0x0028,0x1201) ) { return false; } // Green Palette Color Lookup Table Data - if ( !GetDocEntryByNumber(0x0028,0x1202) ) + if ( !GetDocEntry(0x0028,0x1202) ) { return false; } // Blue Palette Color Lookup Table Data - if ( !GetDocEntryByNumber(0x0028,0x1203) ) + if ( !GetDocEntry(0x0028,0x1203) ) { return false; } @@ -1158,7 +1146,7 @@ int Header::GetLUTNbits() //Just hope Lookup Table Desc-Red = Lookup Table Desc-Red // = Lookup Table Desc-Blue // Consistency already checked in GetLUTLength - std::string lutDescription = GetEntryByNumber(0x0028,0x1101); + std::string lutDescription = GetEntry(0x0028,0x1101); if ( lutDescription == GDCM_UNFOUND ) { return 0; @@ -1183,19 +1171,17 @@ int Header::GetLUTNbits() std::string Header::GetTransfertSyntaxName() { // use the TS (TS : Transfert Syntax) - std::string transfertSyntax = GetEntryByNumber(0x0002,0x0010); + std::string transfertSyntax = GetEntry(0x0002,0x0010); if ( transfertSyntax == GDCM_NOTLOADED ) { - std::cout << "Transfert Syntax not loaded. " << std::endl - << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE" - << std::endl; + gdcmVerboseMacro( "Transfert Syntax not loaded. " << std::endl + << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE" ); return "Uncompressed ACR-NEMA"; } if ( transfertSyntax == GDCM_UNFOUND ) { - dbg.Verbose(0, "Header::GetTransfertSyntaxName:" - " unfound Transfert Syntax (0002,0010)"); + gdcmVerboseMacro( "Unfound Transfert Syntax (0002,0010)"); return "Uncompressed ACR-NEMA"; } @@ -1221,22 +1207,22 @@ std::string Header::GetTransfertSyntaxName() bool Header::AnonymizeHeader() { // If exist, replace by spaces - SetEntryByNumber (" ",0x0010, 0x2154); // Telephone - SetEntryByNumber (" ",0x0010, 0x1040); // Adress - SetEntryByNumber (" ",0x0010, 0x0020); // Patient ID + SetEntry (" ",0x0010, 0x2154); // Telephone + SetEntry (" ",0x0010, 0x1040); // Adress + SetEntry (" ",0x0010, 0x0020); // Patient ID - DocEntry* patientNameHE = GetDocEntryByNumber (0x0010, 0x0010); + DocEntry* patientNameHE = GetDocEntry (0x0010, 0x0010); if ( patientNameHE ) // we replace it by Study Instance UID (why not) { - std::string studyInstanceUID = GetEntryByNumber (0x0020, 0x000d); + std::string studyInstanceUID = GetEntry (0x0020, 0x000d); if ( studyInstanceUID != GDCM_UNFOUND ) { - ReplaceOrCreateByNumber(studyInstanceUID, 0x0010, 0x0010); + ReplaceOrCreate(studyInstanceUID, 0x0010, 0x0010); } else { - ReplaceOrCreateByNumber("anonymised", 0x0010, 0x0010); + ReplaceOrCreate("anonymised", 0x0010, 0x0010); } } @@ -1307,24 +1293,22 @@ void Header::GetImageOrientationPatient( float iop[6] ) iop[0] = iop[1] = iop[2] = iop[3] = iop[4] = iop[5] = 0.; // 0020 0037 DS REL Image Orientation (Patient) - if ( (strImOriPat = GetEntryByNumber(0x0020,0x0037)) != GDCM_UNFOUND ) + if ( (strImOriPat = GetEntry(0x0020,0x0037)) != GDCM_UNFOUND ) { if( sscanf( strImOriPat.c_str(), "%f\\%f\\%f\\%f\\%f\\%f", &iop[0], &iop[1], &iop[2], &iop[3], &iop[4], &iop[5]) != 6 ) { - dbg.Verbose(0, "Header::GetImageOrientationPatient: " - "wrong Image Orientation Patient (0020,0037)"); + gdcmVerboseMacro( "Wrong Image Orientation Patient (0020,0037). Less than 6 values were found." ); } } //For ACR-NEMA // 0020 0035 DS REL Image Orientation (RET) - else if ( (strImOriPat = GetEntryByNumber(0x0020,0x0035)) != GDCM_UNFOUND ) + else if ( (strImOriPat = GetEntry(0x0020,0x0035)) != GDCM_UNFOUND ) { if( sscanf( strImOriPat.c_str(), "%f\\%f\\%f\\%f\\%f\\%f", &iop[0], &iop[1], &iop[2], &iop[3], &iop[4], &iop[5]) != 6 ) { - dbg.Verbose(0, "Header::GetImageOrientationPatient: " - "wrong Image Orientation Patient (0020,0035)"); + gdcmVerboseMacro( "wrong Image Orientation Patient (0020,0035). Less than 6 values were found." ); } } } @@ -1392,14 +1376,14 @@ void Header::InitializeDefaultHeader() // Special case this is the image (not a string) GrPixel = 0x7fe0; NumPixel = 0x0010; - ReplaceOrCreateByNumber(0, 0, GrPixel, NumPixel); + ReplaceOrCreate(0, 0, GrPixel, NumPixel); // All remaining strings: unsigned int i = 0; DICOM_DEFAULT_VALUE current = defaultvalue[i]; while( current.value ) { - ReplaceOrCreateByNumber(current.value, current.group, current.elem); + ReplaceOrCreate(current.value, current.group, current.elem); current = defaultvalue[++i]; } }