Program: gdcm
Module: $RCSfile: gdcmHeader.cxx,v $
Language: C++
- Date: $Date: 2004/12/07 02:36:21 $
- Version: $Revision: 1.212 $
+ Date: $Date: 2005/01/08 15:03:59 $
+ Version: $Revision: 1.227 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* \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
// 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
{
NumPixel = 0x0010;
}
+
+ // Now, we know GrPixel and NumPixel.
+ // Let's create a VirtualDictEntry to allow a further VR modification
+ // and force VR to match with BitsAllocated.
+
+ DocEntry *entry = GetDocEntry(GrPixel, NumPixel);
+ if ( entry != 0 )
+ {
+
+ std::string PixelVR;
+ // 8 bits allocated is a 'O Bytes' , as well as 24 (old ACR-NEMA RGB)
+ // more than 8 (i.e 12, 16) is a 'O Words'
+ if ( GetBitsAllocated() == 8 || GetBitsAllocated() == 24 )
+ PixelVR = "OB";
+ else
+ PixelVR = "OW";
+
+ DictEntry* newEntry = NewVirtualDictEntry(
+ GrPixel, NumPixel,
+ PixelVR, "PXL", "Pixel Data");
+
+ entry->SetDictEntry( newEntry );
+ }
}
/**
* \brief Performs some consistency checking on various 'File related'
* (as opposed to 'DicomDir related') entries
* then writes in a file all the (Dicom Elements) included the Pixels
- * @param fp file pointer on an already open file
+ * @param fileName file name to write to
* @param filetype Type of the File to be written
* (ACR-NEMA, ExplicitVR, ImplicitVR)
*/
-bool Header::Write(std::string fileName,FileType filetype)
+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)
+ 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
// 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);
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'
}
*/
int Header::GetXSize()
{
- const std::string &strSize = GetEntryByNumber(0x0028,0x0011);
+ const std::string &strSize = GetEntry(0x0028,0x0011);
if ( strSize == GDCM_UNFOUND )
{
return 0;
*/
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() );
}
// The Rows (0028,0010) entry was optional for ACR/NEMA. It might
- // hence be a signal (1d image). So we default to 1:
+ // hence be a signal (1D image). So we default to 1:
return 1;
}
{
// 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() );
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.;
}
// if single value is found, xspacing is defaulted to yspacing
if ( nbValues == 1 )
{
- return yspacing;
+ xspacing = yspacing;
}
+
+ if ( xspacing == 0.0 )
+ xspacing = 1.0;
+
+ return xspacing;
+
}
+
+ // to avoid troubles with David Clunie's-like images
+ if ( xspacing == 0. && yspacing == 0.)
+ return 1.;
+
if ( xspacing == 0.)
{
- dbg.Verbose(0, "Header::GetYSpacing: gdcmData/CT-MONO2-8-abdo.dcm problem");
+ gdcmVerboseMacro("gdcmData/CT-MONO2-8-abdo.dcm problem");
// seems to be a bug in the header ...
- sscanf( strSpacing.c_str(), "%f\\0\\%f", &yspacing, &xspacing);
+ nbValues = sscanf( strSpacing.c_str(), "%f\\0\\%f", &yspacing, &xspacing);
+ gdcmAssertMacro( nbValues == 2 );
}
return xspacing;
*/
float Header::GetYSpacing()
{
- float yspacing = 0;
- std::string strSpacing = GetEntryByNumber(0x0028,0x0030);
+ float yspacing = 1.;
+ 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.;
}
// if sscanf cannot read any float value, it won't affect yspacing
sscanf( strSpacing.c_str(), "%f", &yspacing);
+ if ( yspacing == 0.0 )
+ yspacing = 1.0;
+
return yspacing;
}
/**
* \brief gets the info from 0018,0088 : Space Between Slices
- * else from 0018,0050 : Slice Thickness
- * else 1.0
+ * else from 0018,0050 : Slice Thickness
+ * else 1.0
* @return Z dimension of a voxel-to be
*/
float Header::GetZSpacing()
// Si le Spacing Between Slices est absent,
// 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 StrSpacingBSlices");
+ const std::string &strSliceThickness = GetEntry(0x0018,0x0050);
if ( strSliceThickness == GDCM_UNFOUND )
{
return 1.;
{
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 is empty." );
}
}
{
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 is empty.");
}
}
// 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 ") )
{
{
// 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;
}
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.;
}
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.;
}
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
}
}
- 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
}
}
- 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
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
return zImPos;
}
}
- dbg.Verbose(0, "Header::GetYImagePosition: unfound Location (0020,0050)");
+ gdcmVerboseMacro( "Unfound Location (0020,0050)");
return 0.; // Hopeless
}
// 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() );
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;
*/
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("This is supposed to be mandatory");
return 0; // It's supposed to be mandatory
// the caller will have to check
}
*/
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( "This is supposed to be mandatory");
return 0;
}
return atoi( strSize.c_str() );
*/
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( "This is supposed to be mandatory");
return false;
}
int sign = atoi( strSize.c_str() );
*/
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( "This is supposed to be mandatory");
return 0; // It's supposed to be mandatory
// the caller will have to check
}
*/
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( "This is supposed to be mandatory");
return 1; // Well, it's supposed to be mandatory ...
// but sometimes it's missing : *we* assume Gray pixels
}
*/
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") )
{
}
if ( PhotometricInterp == GDCM_UNFOUND )
{
- dbg.Verbose(0, "Header::IsMonochrome: absent Photometric "
- "Interpretation");
+ gdcmVerboseMacro( "Absent Photometric Interpretation");
}
return false;
}
*/
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( "Absent Palette color");
}
return false;
}
*/
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( "Absent YBR Full");
}
return false;
}
*/
int Header::GetPlanarConfiguration()
{
- std::string strSize = GetEntryByNumber(0x0028,0x0006);
+ std::string strSize = GetEntry(0x0028,0x0006);
if ( strSize == GDCM_UNFOUND )
{
+ gdcmVerboseMacro( "Absent Planar Configuration");
return 0;
}
return atoi( strSize.c_str() );
{
// 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();
{
return 8;
}
- dbg.Verbose(0, "Header::GetPixelSize: Unknown pixel type");
+ gdcmVerboseMacro( "Unknown pixel type");
return 0;
}
*/
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( "Unfound Bits Allocated");
bitsAlloc = "16";
}
{
return "FD";
}
- if ( bitsAlloc == "12" )
+ else if ( bitsAlloc == "12" )
{
// It will be unpacked
bitsAlloc = "16";
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( "Unfound Pixel Representation");
bitsAlloc = "0";
}
- if ( sign == "0" )
+ else if ( sign == "0" )
{
sign = "U";
}
*/
size_t Header::GetPixelOffset()
{
- DocEntry* pxlElement = GetDocEntryByNumber(GrPixel,NumPixel);
+ DocEntry* pxlElement = GetDocEntry(GrPixel,NumPixel);
if ( pxlElement )
{
return pxlElement->GetOffset();
*/
size_t Header::GetPixelAreaLength()
{
- DocEntry* pxlElement = GetDocEntryByNumber(GrPixel,NumPixel);
+ DocEntry* pxlElement = GetDocEntry(GrPixel,NumPixel);
if ( pxlElement )
{
return pxlElement->GetLength();
{
// 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;
}
//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;
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";
}
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);
}
}
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." );
}
}
}
/**
* \brief Initialize a default DICOM header that should contain all the
- * field require by other reader. DICOM standart does not
- * explicitely defines thoses fields, heuristic has been choosen.
+ * field require by other reader. DICOM standard does not
+ * explicitely defines those fields, heuristic has been choosen.
* This is not perfect as we are writting a CT image...
*/
void Header::InitializeDefaultHeader()
std::string date = Util::GetCurrentDate();
std::string time = Util::GetCurrentTime();
- std::string uid = Util::CreateUniqueUID();
+ std::string uid = Util::CreateUniqueUID();
+ std::string uidMedia = uid;
+ std::string uidClass = uid + ".1";
+ std::string uidInst = uid + ".10";
+ std::string uidStudy = uid + ".100";
+ std::string uidSerie = uid + ".1000";
static DICOM_DEFAULT_VALUE defaultvalue[] = {
- { "76", 0x0002, 0x0000}, // MetaElementGroup Length // FIXME: how to recompute ?
- { "1.2.840.10008.5.1.4.1.1.2", 0x0002, 0x0002}, // MediaStorageSOPInstanceUID (CT Image Storage)
- { uid.c_str(), 0x0002, 0x0012}, // META Implementation Class UID
- { "ISO_IR 100",0x0008, 0x0005}, // Specific Character Set
- { "DERIVED\\SECONDARY\\OTHER\\GDCM", 0x0008, 0x0008}, // Image Type
- { "1.2.840.10008.5.1.4.1.1.2", 0x0008, 0x0016}, // SOP Class UID
- { "", 0x0008, 0x0050}, // Accession Number
- { "GDCM", 0x0008, 0x0070}, // Manufacturer
- { "GDCM", 0x0008, 0x0080}, // Institution Name
- { "http://www-creatis.insa-lyon.fr/Public/Gdcm/", 0x0008, 0x0081}, // Institution Address
- { "", 0x0008, 0x0090}, // Refering Physician Name
- { "", 0x0008, 0x1030}, // Study Description
- { "", 0x0008, 0x1050}, // Performing Physician's Name
- { "", 0x0008, 0x1060}, // Name of Physician(s) Reading Study
- { "", 0x0010, 0x0040}, // Patient's Sex
- { uid.c_str(), 0x0020, 0x000d}, // StudyInstanceUID
- { uid.c_str(), 0x0020, 0x000e}, // SeriesInstanceUID
- { "", 0x0020, 0x0011}, // AcquisitionNumber
- { "1\\0\\0\\0\\1\\0", 0x0020, 0x0037}, // Image Orientation Patient
- { "1", 0x0028, 0x0002}, // Samples per pixel 1 or 3
- { "MONOCHROME2",0x0028, 0x0004}, // photochromatic interpretation
-
-// Date and timeG
-
- { date.c_str(), 0x0008, 0x0012 } , // Instance Creation Date
- { time.c_str(), 0x0008, 0x0013 } , // Instance Creation Time
- { date.c_str(), 0x0008, 0x0020 } , // Study Date
- { date.c_str(), 0x0008, 0x0022 } , // Acquisition Date
- { date.c_str(), 0x0008, 0x0023 } , // Content Date
- { time.c_str(), 0x0008, 0x0030 } , // Study Time
- { "CT", 0x0008, 0x0060 } , // Modality
- { "GDCM", 0x0010, 0x0010 } , // Patient's Name
- { "GDCMID", 0x0010, 0x0020 } , // Patient ID
- { "1", 0x0020, 0x0010 } , // StudyID
- { "1", 0x0020, 0x0011 } , // SeriesNumber
- { "1.0", 0x0018, 0x0050 } , // slice Thickness
- { "1.0", 0x0018, 0x0088 } , // space between slices
- { "1.0\\1.0", 0x0028, 0x0030 } , // pixelSpacing
- { "64", 0x0028, 0x0010 } , // nbRows
- { "64", 0x0028, 0x0011 } , // nbCols
- { "16", 0x0028, 0x0100 } , // BitsAllocated 8 or 16
- { "12", 0x0028, 0x0101 } , // BitsStored 8 or 12
- { "11", 0x0028, 0x0102 } , // HighBit 7 or 11
- { "0", 0x0028, 0x0103 } , // Pixel Representation 0(unsigned) or 1(signed)
- { "1000.0", 0x0028, 0x1051 } , // Window Width
- { "500.0", 0x0028, 0x1050 } , // Window Center
- { 0, 0, 0 }
+ { "146 ", 0x0002, 0x0000}, // Meta Element Group Length // FIXME: how to recompute ?
+ { "1.2.840.10008.5.1.4.1.1.2", 0x0002, 0x0002}, // Media Storage SOP Class UID (CT Image Storage)
+ { uidClass.c_str(), 0x0002, 0x0003}, // Media Storage SOP Instance UID
+ { uidClass.c_str(), 0x0002, 0x0012}, // META Implementation Class UID
+ { "GDCM", 0x0002, 0x0016}, // Source Application Entity Title
+
+ { date.c_str(), 0x0008, 0x0012}, // Instance Creation Date
+ { time.c_str(), 0x0008, 0x0013}, // Instance Creation Time
+ { "1.2.840.10008.5.1.4.1.1.2", 0x0008, 0x0016}, // SOP Class UID
+ { uidInst.c_str(), 0x0008, 0x0018}, // SOP Instance UID
+ { "CT", 0x0008, 0x0060}, // Modality
+ { "GDCM", 0x0008, 0x0070}, // Manufacturer
+ { "GDCM", 0x0008, 0x0080}, // Institution Name
+ { "http://www-creatis.insa-lyon.fr/Public/Gdcm", 0x0008, 0x0081}, // Institution Address
+
+ { "GDCM", 0x0010, 0x0010}, // Patient's Name
+ { "GDCMID", 0x0010, 0x0020}, // Patient ID
+
+ { uidStudy.c_str(), 0x0020, 0x000d}, // Study Instance UID
+ { uidSerie.c_str(), 0x0020, 0x000e}, // Series Instance UID
+ { "1", 0x0020, 0x0010}, // StudyID
+ { "1", 0x0020, 0x0011}, // SeriesNumber
+
+ { "1", 0x0028, 0x0002}, // Samples per pixel 1 or 3
+ { "MONOCHROME1", 0x0028, 0x0004}, // photochromatic interpretation
+ { "0", 0x0028, 0x0010}, // nbRows
+ { "0", 0x0028, 0x0011}, // nbCols
+ { "8", 0x0028, 0x0100}, // BitsAllocated 8 or 12 or 16
+ { "8", 0x0028, 0x0101}, // BitsStored <= BitsAllocated
+ { "7", 0x0028, 0x0102}, // HighBit <= BitsAllocated - 1
+ { "0", 0x0028, 0x0103}, // Pixel Representation 0(unsigned) or 1(signed)
+ { 0, 0, 0 }
};
// default value
// 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 )
{
- std::string value = Util::DicomString( current.value ); //pad the string properly
- ReplaceOrCreateByNumber(value, current.group, current.elem);
+ ReplaceOrCreate(current.value, current.group, current.elem);
current = defaultvalue[++i];
}
}
+
//-----------------------------------------------------------------------------
// Private