X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeaderHelper.cxx;h=1f38148f95c259b7c94010d1da930901ba49b3c3;hb=aba8714645174c0c7d3c7aadf6af1832743e2971;hp=cb32855dc1c67997fe0a28ecec98fe51e4f2510a;hpb=5f5eda4e34ec5f7975adcb1c3fbc4064f918db98;p=gdcm.git diff --git a/src/gdcmHeaderHelper.cxx b/src/gdcmHeaderHelper.cxx index cb32855d..1f38148f 100644 --- a/src/gdcmHeaderHelper.cxx +++ b/src/gdcmHeaderHelper.cxx @@ -1,68 +1,61 @@ -// $Header: /cvs/public/gdcm/src/Attic/gdcmHeaderHelper.cxx,v 1.2 2003/09/09 08:46:32 malaterre Exp $ - -//This is needed when compiling in debug mode -#ifdef _MSC_VER -#pragma warning ( disable : 4800 ) -// 'identifier' : class 'type' needs to have dll-interface to be used by -// clients of class 'type2' -#pragma warning ( disable : 4251 ) -// 'identifier' : identifier was truncated to 'number' characters in the -// debug information -#pragma warning ( disable : 4786 ) -#endif //_MSC_VER - +// gdcmHeaderHelper.cxx +//----------------------------------------------------------------------------- #include "gdcmHeaderHelper.h" + #include "gdcmUtil.h" //for debug #include #include -#include //for bzero -using namespace std; -//directory manipulation (os indep). -//cygwin ???? -> _WIN32 ?? #ifdef _MSC_VER -#include -int GetDir(string dPath, list &filenames) -{ - WIN32_FIND_DATA FileData; - HANDLE hFile; - hFile = FindFirstFile(dPath.c_str(), &FileData); - if ( hFile == INVALID_HANDLE_VALUE ) - { - //No files ! - return false; - } + #include + + int GetDir(std::string dPath, std::list &filenames) + { + //For now dPath should have an ending "\" + WIN32_FIND_DATA FileData; + HANDLE hFile; + hFile = FindFirstFile((dPath+"*").c_str(), &FileData); + if ( hFile == INVALID_HANDLE_VALUE ) + { + //No files ! + return false; + } - filenames.push_back( FileData.cFileName ); - while( FindNextFile(hFile, &FileData ) != 0) - { - filenames.push_back( FileData.cFileName ); - } - return true; -} + if( strncmp(FileData.cFileName, ".", 1) != 0 ) + filenames.push_back( dPath+FileData.cFileName ); + while( FindNextFile(hFile, &FileData ) != 0) + { + if( strncmp(FileData.cFileName, ".", 1) != 0 ) + filenames.push_back( dPath+FileData.cFileName ); + } + return true; + } #else -#include + #include -int GetDir(string dPath, list &filenames) -{ - DIR *dir = opendir( dPath.c_str() ); - struct dirent *entry; - while((entry = readdir(dir)) != NULL) - { -// if( strncmp(entry->d_name, ".", 1) != 0 && strncmp(entry->d_name, "..", 2) != 0) - if( strncmp(entry->d_name, ".", 1) != 0 ) + int GetDir(std::string dPath, std::list &filenames) { - filenames.push_back( dPath + "/" + entry->d_name ); + DIR *dir = opendir( dPath.c_str() ); + struct dirent *entry; + while((entry = readdir(dir)) != NULL) + { + // if( strncmp(entry->d_name, ".", 1) != 0 && strncmp(entry->d_name, "..", 2) != 0) + if( strncmp(entry->d_name, ".", 1) != 0 ) + { + filenames.push_back( dPath + "/" + entry->d_name ); + } + } + closedir(dir); + return true; } - } - closedir(dir); - return true; -} #endif -//---------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +// gdcmHeaderHelper +//----------------------------------------------------------------------------- +// Constructor / Destructor /** * \ingroup gdcmHeaderHelper * \brief cstor @@ -70,7 +63,7 @@ int GetDir(string dPath, list &filenames) gdcmHeaderHelper::gdcmHeaderHelper() : gdcmHeader( ) { } -//---------------------------------------------------------------------------- + /** * \ingroup gdcmHeaderHelper * \brief cstor @@ -79,7 +72,12 @@ gdcmHeaderHelper::gdcmHeaderHelper(const char *InFilename, bool exception_on_error) : gdcmHeader( InFilename , exception_on_error) { } -//---------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- +// Print + +//----------------------------------------------------------------------------- +// Public /** * \ingroup gdcmHeaderHelper * \brief Return the size (in bytes) of a single pixel of data. @@ -87,7 +85,13 @@ gdcmHeaderHelper::gdcmHeaderHelper(const char *InFilename, * */ int gdcmHeaderHelper::GetPixelSize() { - string PixelType = GetPixelType(); + + // 0028 0100 US IMG Bits Allocated + // (in order no to be messed up by old RGB images) + if (gdcmHeader::GetPubElValByNumber(0x0028,0x0100) == "24") + return 3; + + std::string PixelType = GetPixelType(); if (PixelType == "8U" || PixelType == "8S") return 1; if (PixelType == "16U" || PixelType == "16S") @@ -97,7 +101,7 @@ int gdcmHeaderHelper::GetPixelSize() { dbg.Verbose(0, "gdcmHeader::GetPixelSize: Unknown pixel type"); return 0; } -//---------------------------------------------------------------------------- + /** * \ingroup gdcmHeaderHelper * \brief Build the Pixel Type of the image. @@ -109,32 +113,35 @@ int gdcmHeaderHelper::GetPixelSize() { * - 32U unsigned 32 bit, * - 32S signed 32 bit, * \warning 12 bit images appear as 16 bit. + * \ 24 bit images appear as 8 bit * @return */ -string gdcmHeaderHelper::GetPixelType() { - string BitsAlloc; - BitsAlloc = GetElValByName("Bits Allocated"); - if (BitsAlloc == "gdcm::Unfound") { +std::string gdcmHeaderHelper::GetPixelType() { + std::string BitsAlloc; + BitsAlloc = GetPubElValByNumber(0x0028, 0x0100); + if (BitsAlloc == GDCM_UNFOUND) { // Bits Allocated dbg.Verbose(0, "gdcmHeader::GetPixelType: unfound Bits Allocated"); - BitsAlloc = string("16"); + BitsAlloc = std::string("16"); } - if (BitsAlloc == "12") - BitsAlloc = string("16"); - - string Signed; - Signed = GetElValByName("Pixel Representation"); - if (Signed == "gdcm::Unfound") { + if (BitsAlloc == "12") // It will be unpacked + BitsAlloc = std::string("16"); + else if (BitsAlloc == "24") // (in order no to be messed up + BitsAlloc = std::string("8"); // by old RGB images) + + std::string Signed; + Signed = GetPubElValByNumber(0x0028, 0x0103); + if (Signed == GDCM_UNFOUND) { // "Pixel Representation" dbg.Verbose(0, "gdcmHeader::GetPixelType: unfound Pixel Representation"); - BitsAlloc = string("0"); + BitsAlloc = std::string("0"); } if (Signed == "0") - Signed = string("U"); + Signed = std::string("U"); else - Signed = string("S"); + Signed = std::string("S"); return( BitsAlloc + Signed); } -//---------------------------------------------------------------------------- + /** * \ingroup gdcmHeaderHelper * \brief gets the info from 0028,0030 : Pixel Spacing @@ -143,18 +150,22 @@ string gdcmHeaderHelper::GetPixelType() { */ float gdcmHeaderHelper::GetXSpacing() { float xspacing, yspacing; - string StrSpacing = GetPubElValByNumber(0x0028,0x0030); - - if (StrSpacing == "gdcm::Unfound") { - dbg.Verbose(0, "gdcmHeader::GetXSpacing: unfound Pixel Spacing (0028,0030)"); - return 1.; - } - if( sscanf( StrSpacing.c_str(), "%f\\%f", &xspacing, &yspacing) != 2) - return 0.; - //else - return xspacing; + std::string StrSpacing = GetPubElValByNumber(0x0028,0x0030); + + if (StrSpacing == GDCM_UNFOUND) { + dbg.Verbose(0, "gdcmHeader::GetXSpacing: unfound Pixel Spacing (0028,0030)"); + return 1.; + } + if( sscanf( StrSpacing.c_str(), "%f\\%f", &yspacing, &xspacing) != 2) + return 0.; + if (xspacing == 0.) { + dbg.Verbose(0, "gdcmHeader::GetYSpacing: gdcmData/CT-MONO2-8-abdo.dcm problem"); + // seems to be a bug in the header ... + sscanf( StrSpacing.c_str(), "%f\\0\\%f", &yspacing, &xspacing); + } + return xspacing; } -//---------------------------------------------------------------------------- + /** * \ingroup gdcmHeaderHelper * \brief gets the info from 0028,0030 : Pixel Spacing @@ -163,23 +174,22 @@ float gdcmHeaderHelper::GetXSpacing() { */ float gdcmHeaderHelper::GetYSpacing() { float xspacing, yspacing; - string StrSpacing = GetPubElValByNumber(0x0028,0x0030); + std::string StrSpacing = GetPubElValByNumber(0x0028,0x0030); - if (StrSpacing == "gdcm::Unfound") { + if (StrSpacing == GDCM_UNFOUND) { dbg.Verbose(0, "gdcmHeader::GetYSpacing: unfound Pixel Spacing (0028,0030)"); return 1.; } - if( sscanf( StrSpacing.c_str(), "%f\\%f", &xspacing, &yspacing) != 2) + if( sscanf( StrSpacing.c_str(), "%f\\%f", &yspacing, &xspacing) != 2) return 0.; - if (yspacing == 0.) { + if (xspacing == 0.) { dbg.Verbose(0, "gdcmHeader::GetYSpacing: gdcmData/CT-MONO2-8-abdo.dcm problem"); // seems to be a bug in the header ... - sscanf( StrSpacing.c_str(), "%f\\0\\%f", &xspacing, &yspacing); + sscanf( StrSpacing.c_str(), "%f\\0\\%f", &yspacing, &xspacing); } return yspacing; } -//---------------------------------------------------------------------------- /** *\ingroup gdcmHeaderHelper *\brief gets the info from 0018,0088 : Space Between Slices @@ -188,7 +198,6 @@ float gdcmHeaderHelper::GetYSpacing() { * @return Z dimension of a voxel-to be */ float gdcmHeaderHelper::GetZSpacing() { - // TODO : translate into English // Spacing Between Slices : distance entre le milieu de chaque coupe // Les coupes peuvent etre : // jointives (Spacing between Slices = Slice Thickness) @@ -199,12 +208,12 @@ float gdcmHeaderHelper::GetZSpacing() { // Si le Spacing Between Slices est absent, // on suppose que les coupes sont jointives - string StrSpacingBSlices = GetPubElValByNumber(0x0018,0x0088); + std::string StrSpacingBSlices = GetPubElValByNumber(0x0018,0x0088); - if (StrSpacingBSlices == "gdcm::Unfound") { + if (StrSpacingBSlices == GDCM_UNFOUND) { dbg.Verbose(0, "gdcmHeader::GetZSpacing: unfound StrSpacingBSlices"); - string StrSliceThickness = GetPubElValByNumber(0x0018,0x0050); - if (StrSliceThickness == "gdcm::Unfound") + std::string StrSliceThickness = GetPubElValByNumber(0x0018,0x0050); + if (StrSliceThickness == GDCM_UNFOUND) return 1.; else // if no 'Spacing Between Slices' is found, @@ -217,8 +226,112 @@ float gdcmHeaderHelper::GetZSpacing() { } } -//---------------------------------------------------------------------------- -// +float gdcmHeaderHelper::GetRescaleIntercept() +{ + float resInter = 0.; + std::string StrRescInter = GetPubElValByNumber(0x0028,0x1052); //0028 1052 DS IMG Rescale Intercept + if (StrRescInter != GDCM_UNFOUND) { + if( sscanf( StrRescInter.c_str(), "%f", &resInter) != 1) { + dbg.Verbose(0, "gdcmHeader::GetRescaleIntercept: Rescale Slope is empty"); + // bug in the element 0x0028,0x1052 + } + } + return resInter; +} + +float gdcmHeaderHelper::GetRescaleSlope() +{ + float resSlope = 1.; + std::string StrRescSlope = GetPubElValByNumber(0x0028,0x1053); //0028 1053 DS IMG Rescale Slope + if (StrRescSlope != GDCM_UNFOUND) { + if( sscanf( StrRescSlope.c_str(), "%f", &resSlope) != 1) { + dbg.Verbose(0, "gdcmHeader::GetRescaleSlope: Rescale Slope is empty"); + // bug in the element 0x0028,0x1053 + } + } + return resSlope; +} + +/** + * \ingroup gdcmHeaderHelper + * \brief This function is intended to user who doesn't whan + * \ to have to manage a LUT and expects to get an RBG Pixel image + * \ (or a monochrome one ...) + * \warning to be used with GetImagePixels() + * @return 1 if Gray level, 3 if Color (RGB, YBR or PALETTE COLOR) + */ +int gdcmHeaderHelper::GetNumberOfScalarComponents() { + + if (GetSamplesPerPixel() ==3) + return 3; + + // 0028 0100 US IMG Bits Allocated + // (in order no to be messed up by old RGB images) + if (gdcmHeader::GetPubElValByNumber(0x0028,0x0100) == "24") + return 3; + + std::string PhotometricInterpretation = + gdcmHeader::GetPubElValByNumber(0x0028,0x0004); + + if ( ( PhotometricInterpretation == "PALETTE COLOR ") ) { + if (HasLUT()) // PALETTE COLOR is NOT enough + return 3; + else + return 1; + } + + //beware of trailing space at end of string + if (PhotometricInterpretation.find(GDCM_UNFOUND) < + PhotometricInterpretation.length() || + PhotometricInterpretation.find("MONOCHROME1") < + PhotometricInterpretation.length() || + PhotometricInterpretation.find("MONOCHROME2") < + PhotometricInterpretation.length() ) + return 1; + else + // we assume that *all* kinds of YBR are dealt with + return 3; +} + +/** + * \ingroup gdcmHeaderHelper + * \brief This function is intended to user that DOESN'T want + * \to get RGB pixels image when it's stored as a PALETTE COLOR image + * \ - the (vtk) user is supposed to know how deal with LUTs - + * \warning to be used with GetImagePixelsRaw() + * @return 1 if Gray level, 3 if Color (RGB or YBR - NOT 'PALETTE COLOR' -) + */ +int gdcmHeaderHelper::GetNumberOfScalarComponentsRaw() { + + // 0028 0100 US IMG Bits Allocated + // (in order no to be messed up by old RGB images) + if (gdcmHeader::GetPubElValByNumber(0x0028,0x0100) == "24") + return 3; + + // we assume that *all* kinds of YBR are dealt with + return GetSamplesPerPixel(); +} + +std::string gdcmHeaderHelper::GetStudyUID() +{ + return GetPubElValByNumber(0x0020,0x000d); //0020 000d UI REL Study Instance UID +} + +std::string gdcmHeaderHelper::GetSeriesUID() +{ + return GetPubElValByNumber(0x0020,0x000e); //0020 000e UI REL Series Instance UID +} + +std::string gdcmHeaderHelper::GetClassUID() +{ + return GetPubElValByNumber(0x0008,0x0016); //0008 0016 UI ID SOP Class UID +} + +std::string gdcmHeaderHelper::GetInstanceUID() +{ + return GetPubElValByNumber(0x0008,0x0018); //0008 0018 UI ID SOP Instance UID +} + // Image Position Patient (0020,0032): // If not found (ACR_NEMA) we try Image Position (0020,0030) // If not found (ACR-NEMA), we consider Slice Location (0020,1041) @@ -228,7 +341,6 @@ float gdcmHeaderHelper::GetZSpacing() { // TODO : find a way to inform the caller nothing was found // TODO : How to tell the caller a wrong number of values was found? - /** * \ingroup gdcmHeaderHelper * \brief gets the info from 0020,0032 : Image Position Patient @@ -238,12 +350,12 @@ float gdcmHeaderHelper::GetZSpacing() { */ float gdcmHeaderHelper::GetXOrigin() { float xImPos, yImPos, zImPos; - string StrImPos = GetPubElValByNumber(0x0020,0x0032); + std::string StrImPos = GetPubElValByNumber(0x0020,0x0032); - if (StrImPos == "gdcm::Unfound") { + if (StrImPos == GDCM_UNFOUND) { dbg.Verbose(0, "gdcmHeader::GetXImagePosition: unfound Image Position Patient (0020,0032)"); StrImPos = GetPubElValByNumber(0x0020,0x0030); // For ACR-NEMA images - if (StrImPos == "gdcm::Unfound") { + if (StrImPos == GDCM_UNFOUND) { dbg.Verbose(0, "gdcmHeader::GetXImagePosition: unfound Image Position (RET) (0020,0030)"); // How to tell the caller nothing was found ? return 0.; @@ -253,7 +365,7 @@ float gdcmHeaderHelper::GetXOrigin() { return 0.; return xImPos; } -//---------------------------------------------------------------------------- + /** * \ingroup gdcmHeaderHelper * \brief gets the info from 0020,0032 : Image Position Patient @@ -263,12 +375,12 @@ float gdcmHeaderHelper::GetXOrigin() { */ float gdcmHeaderHelper::GetYOrigin() { float xImPos, yImPos, zImPos; - string StrImPos = GetPubElValByNumber(0x0020,0x0032); + std::string StrImPos = GetPubElValByNumber(0x0020,0x0032); - if (StrImPos == "gdcm::Unfound") { + if (StrImPos == GDCM_UNFOUND) { dbg.Verbose(0, "gdcmHeader::GetYImagePosition: unfound Image Position Patient (0020,0032)"); StrImPos = GetPubElValByNumber(0x0020,0x0030); // For ACR-NEMA images - if (StrImPos == "gdcm::Unfound") { + if (StrImPos == GDCM_UNFOUND) { dbg.Verbose(0, "gdcmHeader::GetYImagePosition: unfound Image Position (RET) (0020,0030)"); // How to tell the caller nothing was found ? return 0.; @@ -278,7 +390,7 @@ float gdcmHeaderHelper::GetYOrigin() { return 0.; return yImPos; } -//---------------------------------------------------------------------------- + /** * \ingroup gdcmHeaderHelper * \brief gets the info from 0020,0032 : Image Position Patient @@ -290,8 +402,8 @@ float gdcmHeaderHelper::GetYOrigin() { */ float gdcmHeaderHelper::GetZOrigin() { float xImPos, yImPos, zImPos; - string StrImPos = GetPubElValByNumber(0x0020,0x0032); - if (StrImPos != "gdcm::Unfound") { + std::string StrImPos = GetPubElValByNumber(0x0020,0x0032); + if (StrImPos != GDCM_UNFOUND) { if( sscanf( StrImPos.c_str(), "%f\\%f\\%f", &xImPos, &yImPos, &zImPos) != 3) { dbg.Verbose(0, "gdcmHeader::GetZImagePosition: wrong Image Position Patient (0020,0032)"); return 0.; // bug in the element 0x0020,0x0032 @@ -300,7 +412,7 @@ float gdcmHeaderHelper::GetZOrigin() { } } StrImPos = GetPubElValByNumber(0x0020,0x0030); // For ACR-NEMA images - if (StrImPos != "gdcm::Unfound") { + if (StrImPos != GDCM_UNFOUND) { if( sscanf( StrImPos.c_str(), "%f\\%f\\%f", &xImPos, &yImPos, &zImPos) != 3) { dbg.Verbose(0, "gdcmHeader::GetZImagePosition: wrong Image Position (RET) (0020,0030)"); return 0.; // bug in the element 0x0020,0x0032 @@ -308,8 +420,8 @@ float gdcmHeaderHelper::GetZOrigin() { return zImPos; } } - string StrSliceLocation = GetPubElValByNumber(0x0020,0x1041);// for *very* old ACR-NEMA images - if (StrSliceLocation != "gdcm::Unfound") { + std::string StrSliceLocation = GetPubElValByNumber(0x0020,0x1041);// for *very* old ACR-NEMA images + if (StrSliceLocation != GDCM_UNFOUND) { if( sscanf( StrSliceLocation.c_str(), "%f", &zImPos) !=1) { dbg.Verbose(0, "gdcmHeader::GetZImagePosition: wrong Slice Location (0020,1041)"); return 0.; // bug in the element 0x0020,0x1041 @@ -318,8 +430,8 @@ float gdcmHeaderHelper::GetZOrigin() { } } dbg.Verbose(0, "gdcmHeader::GetZImagePosition: unfound Slice Location (0020,1041)"); - string StrLocation = GetPubElValByNumber(0x0020,0x0050); - if (StrLocation != "gdcm::Unfound") { + std::string StrLocation = GetPubElValByNumber(0x0020,0x0050); + if (StrLocation != GDCM_UNFOUND) { if( sscanf( StrLocation.c_str(), "%f", &zImPos) !=1) { dbg.Verbose(0, "gdcmHeader::GetZImagePosition: wrong Location (0020,0050)"); return 0.; // bug in the element 0x0020,0x0050 @@ -330,7 +442,7 @@ float gdcmHeaderHelper::GetZOrigin() { dbg.Verbose(0, "gdcmHeader::GetYImagePosition: unfound Location (0020,0050)"); return 0.; // Hopeless } -//---------------------------------------------------------------------------- + /** * \ingroup gdcmHeaderHelper * \brief gets the info from 0020,0013 : Image Number @@ -343,49 +455,62 @@ int gdcmHeaderHelper::GetImageNumber() { //binary conversion rules. This may be preferable to sscanf() since atoi() is a much smaller, // simpler and faster function. sscanf() can do all possible conversions whereas atoi() can //only do single decimal integer conversions. - string StrImNumber = GetPubElValByNumber(0x0020,0x0013); //0020 0013 IS REL Image Number - if (StrImNumber != "gdcm::Unfound") { + std::string StrImNumber = GetPubElValByNumber(0x0020,0x0013); //0020 0013 IS REL Image Number + if (StrImNumber != GDCM_UNFOUND) { return atoi( StrImNumber.c_str() ); } return 0; //Hopeless } -//---------------------------------------------------------------------------- + /** * \ingroup gdcmHeaderHelper * \brief gets the info from 0008,0060 : Modality * @return ModalityType */ ModalityType gdcmHeaderHelper::GetModality(void) { - string StrModality = GetPubElValByNumber(0x0008,0x0060); //0008 0060 CS ID Modality - if (StrModality != "gdcm::Unfound") { - if ( StrModality.find("CR") < StrModality.length()) - { - return CR; - } - else if ( StrModality.find("CT") < StrModality.length() ) - { - return CT; - } - else if ( StrModality.find("MR") < StrModality.length()) - { - return MR; - } - else if ( StrModality.find("NM") < StrModality.length()) - { - return NM; - } - else if ( StrModality.find("OT") < StrModality.length()) - { - return OT; - } - else if ( StrModality.find("US") < StrModality.length()) - { - return US; - } - else if ( StrModality.find("XA") < StrModality.length()) - { - return XA; - } + std::string StrModality = GetPubElValByNumber(0x0008,0x0060); //0008 0060 CS ID Modality + if (StrModality != GDCM_UNFOUND) { + if ( StrModality.find("AU") < StrModality.length()) return AU; + else if ( StrModality.find("AS") < StrModality.length()) return AS; + else if ( StrModality.find("BI") < StrModality.length()) return BI; + else if ( StrModality.find("CF") < StrModality.length()) return CF; + else if ( StrModality.find("CP") < StrModality.length()) return CP; + else if ( StrModality.find("CR") < StrModality.length()) return CR; + else if ( StrModality.find("CT") < StrModality.length()) return CT; + else if ( StrModality.find("CS") < StrModality.length()) return CS; + else if ( StrModality.find("DD") < StrModality.length()) return DD; + else if ( StrModality.find("DF") < StrModality.length()) return DF; + else if ( StrModality.find("DG") < StrModality.length()) return DG; + else if ( StrModality.find("DM") < StrModality.length()) return DM; + else if ( StrModality.find("DS") < StrModality.length()) return DS; + else if ( StrModality.find("DX") < StrModality.length()) return DX; + else if ( StrModality.find("ECG") < StrModality.length()) return ECG; + else if ( StrModality.find("EPS") < StrModality.length()) return EPS; + else if ( StrModality.find("FA") < StrModality.length()) return FA; + else if ( StrModality.find("FS") < StrModality.length()) return FS; + else if ( StrModality.find("HC") < StrModality.length()) return HC; + else if ( StrModality.find("HD") < StrModality.length()) return HD; + else if ( StrModality.find("LP") < StrModality.length()) return LP; + else if ( StrModality.find("LS") < StrModality.length()) return LS; + else if ( StrModality.find("MA") < StrModality.length()) return MA; + else if ( StrModality.find("MR") < StrModality.length()) return MR; + else if ( StrModality.find("NM") < StrModality.length()) return NM; + else if ( StrModality.find("OT") < StrModality.length()) return OT; + else if ( StrModality.find("PT") < StrModality.length()) return PT; + else if ( StrModality.find("RF") < StrModality.length()) return RF; + else if ( StrModality.find("RG") < StrModality.length()) return RG; + else if ( StrModality.find("RTDOSE") < StrModality.length()) return RTDOSE; + else if ( StrModality.find("RTIMAGE") < StrModality.length()) return RTIMAGE; + else if ( StrModality.find("RTPLAN") < StrModality.length()) return RTPLAN; + else if ( StrModality.find("RTSTRUCT")< StrModality.length()) return RTSTRUCT; + else if ( StrModality.find("SM") < StrModality.length()) return SM; + else if ( StrModality.find("ST") < StrModality.length()) return ST; + else if ( StrModality.find("TG") < StrModality.length()) return TG; + else if ( StrModality.find("US") < StrModality.length()) return US; + else if ( StrModality.find("VF") < StrModality.length()) return VF; + else if ( StrModality.find("XA") < StrModality.length()) return XA; + else if ( StrModality.find("XC") < StrModality.length()) return XC; + else { //throw error return value ??? @@ -396,46 +521,6 @@ ModalityType gdcmHeaderHelper::GetModality(void) { return Unknow; } -//---------------------------------------------------------------------------- -string gdcmHeaderHelper::GetStudyUID() -{ - return GetPubElValByNumber(0x0020,0x000d); //!0020 000d UI REL Study Instance UID -} -//---------------------------------------------------------------------------- -string gdcmHeaderHelper::GetSeriesUID() -{ - return GetPubElValByNumber(0x0020,0x000e); //!0020 000e UI REL Series Instance UID -} -//---------------------------------------------------------------------------- -string gdcmHeaderHelper::GetClassUID() -{ - return GetPubElValByNumber(0x0008,0x0016); //!0008 0016 UI ID SOP Class UID -} -//---------------------------------------------------------------------------- -string gdcmHeaderHelper::GetInstanceUID() -{ - return GetPubElValByNumber(0x0008,0x0018); //!0008 0018 UI ID SOP Instance UID -} - - - - - - - - - -gdcmSerieHeaderHelper::~gdcmSerieHeaderHelper() -{ - //! \todo - for (list::iterator it = CoherentGdcmFileList.begin(); - it != CoherentGdcmFileList.end(); it++) - { - delete *it; - } - CoherentGdcmFileList.clear(); -} -//---------------------------------------------------------------------------- /** * \ingroup gdcmHeaderHelper * \brief gets the info from 0020,0037 : Image Orientation Patient @@ -446,8 +531,8 @@ void gdcmHeaderHelper::GetImageOrientationPatient( float* iop ) { //iop is supposed to be float[6] iop[0] = iop[1] = iop[2] = iop[3] = iop[4] = iop[5] = 0; - string StrImOriPat = GetPubElValByNumber(0x0020,0x0037); // 0020 0037 DS REL Image Orientation (Patient) - if (StrImOriPat != "gdcm::Unfound") { + std::string StrImOriPat = GetPubElValByNumber(0x0020,0x0037); // 0020 0037 DS REL Image Orientation (Patient) + if (StrImOriPat != 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, "gdcmHeader::GetImageOrientationPatient: wrong Image Orientation Patient (0020,0037)"); @@ -459,7 +544,7 @@ void gdcmHeaderHelper::GetImageOrientationPatient( float* iop ) { //For ACR-NEMA StrImOriPat = GetPubElValByNumber(0x0020,0x0035); //0020 0035 DS REL Image Orientation (RET) - if (StrImOriPat != "gdcm::Unfound") { + if (StrImOriPat != 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, "gdcmHeader::GetImageOrientationPatient: wrong Image Orientation Patient (0020,0035)"); @@ -470,46 +555,75 @@ void gdcmHeaderHelper::GetImageOrientationPatient( float* iop ) { } } -//---------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +// Protected + +//----------------------------------------------------------------------------- +// Private + +//----------------------------------------------------------------------------- + + + +//----------------------------------------------------------------------------- +// gdcmSerieHeaderHelper +//----------------------------------------------------------------------------- +// Constructor / Destructor +gdcmSerieHeaderHelper::~gdcmSerieHeaderHelper() +{ + //! \todo + for (std::list::iterator it = CoherentGdcmFileList.begin(); + it != CoherentGdcmFileList.end(); it++) + { + delete *it; + } + CoherentGdcmFileList.clear(); +} + +//----------------------------------------------------------------------------- +// Print + +//----------------------------------------------------------------------------- +// Public /** - * \ingroup gdcmHeaderHelper - * \brief add a gdcmFile to the list based on file name - */ -void gdcmSerieHeaderHelper::AddFileName(string filename) + * \ingroup gdcmHeaderHelper + * \brief add a gdcmFile to the list based on file name + */ +void gdcmSerieHeaderHelper::AddFileName(std::string filename) { gdcmHeaderHelper *GdcmFile = new gdcmHeaderHelper( filename.c_str() ); this->CoherentGdcmFileList.push_back( GdcmFile ); } -//---------------------------------------------------------------------------- + /** - * \ingroup gdcmHeaderHelper - * \brief add a gdcmFile to the list - */ + * \ingroup gdcmHeaderHelper + * \brief add a gdcmFile to the list + */ void gdcmSerieHeaderHelper::AddGdcmFile(gdcmHeaderHelper *file) { this->CoherentGdcmFileList.push_back( file ); } -//---------------------------------------------------------------------------- + /** - * \ingroup gdcmHeaderHelper - * \brief \todo - */ -void gdcmSerieHeaderHelper::SetDirectory(string dir) + * \ingroup gdcmHeaderHelper + * \brief \todo + */ +void gdcmSerieHeaderHelper::SetDirectory(std::string dir) { - list filenames_list; + std::list filenames_list; GetDir(dir, filenames_list); //OS specific - for(list::iterator it = filenames_list.begin(); it != + for(std::list::iterator it = filenames_list.begin(); it != filenames_list.end(); it++) { gdcmHeaderHelper *file = new gdcmHeaderHelper( it->c_str() ); this->CoherentGdcmFileList.push_back( file ); } } -//---------------------------------------------------------------------------- + //This could be implemented in a 'Strategy Pattern' approach //But as I don't know how to do it, I leave it this way -//BTW, this is also a Strategy, I don't know this is the best approcah :) +//BTW, this is also a Strategy, I don't know this is the best approach :) void gdcmSerieHeaderHelper::OrderGdcmFileList() { if( ImagePositionPatientOrdering() ) @@ -525,17 +639,27 @@ void gdcmSerieHeaderHelper::OrderGdcmFileList() FileNameOrdering(); } } -//---------------------------------------------------------------------------- + +std::list &gdcmSerieHeaderHelper::GetGdcmFileList() +{ + return CoherentGdcmFileList; +} + +//----------------------------------------------------------------------------- +// Protected + +//----------------------------------------------------------------------------- +// Private /** - * \ingroup gdcmHeaderHelper - * \brief - We may order, considering : - -# Image Number - -# Image Position Patient - -# More to come :) -*/ -//based on Jolinda's algorithm + * \ingroup gdcmHeaderHelper + * \brief + * We may order, considering : + * -# Image Number + * -# Image Position Patient + * -# More to come :) + */ bool gdcmSerieHeaderHelper::ImagePositionPatientOrdering() +//based on Jolinda's algorithm { //iop is calculated based on the file file float *cosines = new float[6]; @@ -545,10 +669,10 @@ bool gdcmSerieHeaderHelper::ImagePositionPatientOrdering() float min, max; bool first = true; int n=0; - vector distlist; + std::vector distlist; //!\todo rewrite this for loop. - for (list::iterator it = CoherentGdcmFileList.begin(); + for (std::list::iterator it = CoherentGdcmFileList.begin(); it != CoherentGdcmFileList.end(); it++) { if(first) { @@ -607,7 +731,7 @@ bool gdcmSerieHeaderHelper::ImagePositionPatientOrdering() //Then I order the slices according to the value "dist". Finally, once //I've read in all the slices, I calculate the z-spacing as the difference //between the "dist" values for the first two slices. - vector CoherentGdcmFileVector(n); + std::vector CoherentGdcmFileVector(n); //CoherentGdcmFileVector.reserve( n ); CoherentGdcmFileVector.resize( n ); //assert( CoherentGdcmFileVector.capacity() >= n ); @@ -617,7 +741,7 @@ bool gdcmSerieHeaderHelper::ImagePositionPatientOrdering() n = 0; //VC++ don't understand what scope is !! it -> it2 - for (list::iterator it2 = CoherentGdcmFileList.begin(); + for (std::list::iterator it2 = CoherentGdcmFileList.begin(); it2 != CoherentGdcmFileList.end(); it2++, n++) { //2*n sort algo !! @@ -630,7 +754,7 @@ bool gdcmSerieHeaderHelper::ImagePositionPatientOrdering() CoherentGdcmFileList.clear(); //this doesn't delete list's element, node only //VC++ don't understand what scope is !! it -> it3 - for (vector::iterator it3 = CoherentGdcmFileVector.begin(); + for (std::vector::iterator it3 = CoherentGdcmFileVector.begin(); it3 != CoherentGdcmFileVector.end(); it3++) { CoherentGdcmFileList.push_back( *it3 ); @@ -642,7 +766,7 @@ bool gdcmSerieHeaderHelper::ImagePositionPatientOrdering() return true; } -//---------------------------------------------------------------------------- + //Based on Image Number bool gdcmSerieHeaderHelper::ImageNumberOrdering() { @@ -650,7 +774,7 @@ bool gdcmSerieHeaderHelper::ImageNumberOrdering() int n = 0;//CoherentGdcmFileList.size(); //O(N) operation !! unsigned char *partition; - list::iterator it = CoherentGdcmFileList.begin(); + std::list::iterator it = CoherentGdcmFileList.begin(); min = max = (*it)->GetImageNumber(); for (; it != CoherentGdcmFileList.end(); it++, n++) @@ -665,10 +789,10 @@ bool gdcmSerieHeaderHelper::ImageNumberOrdering() partition = new unsigned char[n]; memset(partition, 0, n); - vector CoherentGdcmFileVector(n); + std::vector CoherentGdcmFileVector(n); //VC++ don't understand what scope is !! it -> it2 - for (list::iterator it2 = CoherentGdcmFileList.begin(); + for (std::list::iterator it2 = CoherentGdcmFileList.begin(); it2 != CoherentGdcmFileList.end(); it2++) { pos = (*it2)->GetImageNumber(); @@ -684,7 +808,7 @@ bool gdcmSerieHeaderHelper::ImageNumberOrdering() //VC++ don't understand what scope is !! it -> it3 CoherentGdcmFileList.clear(); //this doesn't delete list's element, node only - for (vector::iterator it3 = CoherentGdcmFileVector.begin(); + for (std::vector::iterator it3 = CoherentGdcmFileVector.begin(); it3 != CoherentGdcmFileVector.end(); it3++) { CoherentGdcmFileList.push_back( *it3 ); @@ -692,18 +816,14 @@ bool gdcmSerieHeaderHelper::ImageNumberOrdering() CoherentGdcmFileVector.clear(); delete[] partition; - return mult; + return (mult!=0); } -//---------------------------------------------------------------------------- + bool gdcmSerieHeaderHelper::FileNameOrdering() { //using the sort //sort(CoherentGdcmFileList.begin(), CoherentGdcmFileList.end()); return true; } -//---------------------------------------------------------------------------- -list &gdcmSerieHeaderHelper::GetGdcmFileList() -{ - return CoherentGdcmFileList; -} -//---------------------------------------------------------------------------- + +//-----------------------------------------------------------------------------