X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.cxx;h=62b38d4934bb007d0a275870b7d12129251d6c16;hb=38d772b8588bc4e7106dbafcb24f6bff91b8c4c1;hp=13e90a3e44e66a1e66c174e3dd529190f89fbb98;hpb=05f4ffeadc3beb5ff48fd88e7342d9287c18a27b;p=gdcm.git diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index 13e90a3e..62b38d49 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmHeader.cxx,v $ Language: C++ - Date: $Date: 2004/11/09 21:55:55 $ - Version: $Revision: 1.199 $ + Date: $Date: 2004/12/03 16:57:49 $ + Version: $Revision: 1.211 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,7 +22,7 @@ #include "gdcmDebug.h" #include "gdcmTS.h" #include "gdcmValEntry.h" -#include +#include //sscanf #include @@ -48,7 +48,7 @@ Header::Header( std::string const & filename ): // Note: this IS the right place for the code // Image Location - std::string imgLocation = GetEntryByNumber(0x0028, 0x0200); + const std::string &imgLocation = GetEntryByNumber(0x0028, 0x0200); if ( imgLocation == GDCM_UNFOUND ) { // default value @@ -79,11 +79,12 @@ Header::Header( std::string const & filename ): } /** - * \brief Constructor + * \brief Constructor used when we want to generate dicom files from scratch */ Header::Header() :Document() { + InitializeDefaultHeader(); } /** @@ -93,7 +94,6 @@ Header::~Header () { } - /** * \brief Performs some consistency checking on various 'File related' * (as opposed to 'DicomDir related') entries @@ -102,8 +102,16 @@ Header::~Header () * @param filetype Type of the File to be written * (ACR-NEMA, ExplicitVR, ImplicitVR) */ -void Header::Write(std::ofstream* fp,FileType filetype) +bool Header::Write(std::string fileName,FileType filetype) { + 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()); + return false; + } + // Bits Allocated if ( GetEntryByNumber(0x0028,0x0100) == "12") { @@ -163,7 +171,12 @@ void Header::Write(std::ofstream* fp,FileType filetype) RemoveEntryNoDestroy(e); } } - Document::Write(fp,filetype); + Document::WriteContent(fp,filetype); + + fp->close(); + delete fp; + + return true; } //----------------------------------------------------------------------------- @@ -188,7 +201,7 @@ bool Header::IsReadable() return false; } - std::string res = GetEntryByNumber(0x0028, 0x0005); + const std::string &res = GetEntryByNumber(0x0028, 0x0005); if ( res != GDCM_UNFOUND && atoi(res.c_str()) > 4 ) { return false; // Image Dimensions @@ -220,8 +233,7 @@ bool Header::IsReadable() */ int Header::GetXSize() { - std::string strSize; - strSize = GetEntryByNumber(0x0028,0x0011); + const std::string &strSize = GetEntryByNumber(0x0028,0x0011); if ( strSize == GDCM_UNFOUND ) { return 0; @@ -238,7 +250,7 @@ int Header::GetXSize() */ int Header::GetYSize() { - std::string strSize = GetEntryByNumber(0x0028,0x0010); + const std::string &strSize = GetEntryByNumber(0x0028,0x0010); if ( strSize != GDCM_UNFOUND ) { return atoi( strSize.c_str() ); @@ -265,17 +277,17 @@ int Header::GetZSize() { // Both DicomV3 and ACR/Nema consider the "Number of Frames" // as the third dimension. - std::string strSize = GetEntryByNumber(0x0028,0x0008); + const std::string &strSize = GetEntryByNumber(0x0028,0x0008); if ( strSize != GDCM_UNFOUND ) { return atoi( strSize.c_str() ); } // We then consider the "Planes" entry as the third dimension - strSize = GetEntryByNumber(0x0028,0x0012); - if ( strSize != GDCM_UNFOUND ) + const std::string &strSize2 = GetEntryByNumber(0x0028,0x0012); + if ( strSize2 != GDCM_UNFOUND ) { - return atoi( strSize.c_str() ); + return atoi( strSize2.c_str() ); } return 1; @@ -289,7 +301,7 @@ int Header::GetZSize() float Header::GetXSpacing() { float xspacing, yspacing; - std::string strSpacing = GetEntryByNumber(0x0028,0x0030); + const std::string &strSpacing = GetEntryByNumber(0x0028,0x0030); if ( strSpacing == GDCM_UNFOUND ) { @@ -373,13 +385,14 @@ float Header::GetZSpacing() // we assume slices join together // (no overlapping, no interslice gap) // if they don't, we're fucked up - return atof( strSliceThickness.c_str() ); + return (float)atof( strSliceThickness.c_str() ); } } else { - return atof( strSpacingBSlices.c_str() ); + return (float)atof( strSpacingBSlices.c_str() ); } + return 1.; } /** @@ -463,8 +476,8 @@ int Header::GetNumberOfScalarComponents() // beware of trailing space at end of string // DICOM tags are never of odd length if ( strPhotometricInterpretation == GDCM_UNFOUND || - strPhotometricInterpretation == "MONOCHROME1 " || - strPhotometricInterpretation == "MONOCHROME2 " ) + Util::DicomStringEqual(strPhotometricInterpretation, "MONOCHROME1") || + Util::DicomStringEqual(strPhotometricInterpretation, "MONOCHROME2") ) { return 1; } @@ -822,7 +835,7 @@ int Header::GetBitsAllocated() */ int Header::GetSamplesPerPixel() { - std::string strSize = GetEntryByNumber(0x0028,0x0002); + const std::string& strSize = GetEntryByNumber(0x0028,0x0002); if ( strSize == GDCM_UNFOUND ) { dbg.Verbose(0, "Header::GetBitsStored: this is supposed to " @@ -840,9 +853,9 @@ int Header::GetSamplesPerPixel() */ bool Header::IsMonochrome() { - std::string PhotometricInterp = GetEntryByNumber( 0x0028, 0x0004 ); - if ( PhotometricInterp == "MONOCHROME1 " - || PhotometricInterp == "MONOCHROME2 " ) + const std::string& PhotometricInterp = GetEntryByNumber( 0x0028, 0x0004 ); + if ( Util::DicomStringEqual(PhotometricInterp, "MONOCHROME1") + || Util::DicomStringEqual(PhotometricInterp, "MONOCHROME2") ) { return true; } @@ -1151,7 +1164,7 @@ std::string Header::GetTransfertSyntaxName() return "Uncompressed ACR-NEMA"; } - while ( ! isdigit(transfertSyntax[transfertSyntax.length()-1]) ) + while ( ! isdigit((unsigned char)transfertSyntax[transfertSyntax.length()-1]) ) { transfertSyntax.erase(transfertSyntax.length()-1, 1); } @@ -1163,27 +1176,6 @@ std::string Header::GetTransfertSyntaxName() return tsName; } -/** - * \brief Sets the Pixel Area size in the Header - * --> not-for-rats function - * @param ImageDataSize new Pixel Area Size - * warning : nothing else is checked - */ -void Header::SetImageDataSize(size_t ImageDataSize) -{ - ///FIXME I don't understand this code why do we set two times 'car' ? - std::string car = Util::Format("%d", ImageDataSize); - - DocEntry *a = GetDocEntryByNumber(GrPixel, NumPixel); - a->SetLength(ImageDataSize); - - ImageDataSize += 8; - car = Util::Format("%d", ImageDataSize); - car = Util::DicomString( car.c_str() ); - - SetEntryByNumber(car, GrPixel, NumPixel); -} - //----------------------------------------------------------------------------- // Protected @@ -1302,6 +1294,92 @@ void Header::GetImageOrientationPatient( float iop[6] ) } } +/** + * \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. + * This is not perfect as we are writting a CT image... + */ +void Header::InitializeDefaultHeader() +{ + typedef struct + { + const char *value; + uint16_t group; + uint16_t elem; + } DICOM_DEFAULT_VALUE; + + std::string date = Util::GetCurrentDate(); + std::string time = Util::GetCurrentTime(); + std::string uid = Util::CreateUniqueUID(); + + 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 } + }; + + // default value + // Special case this is the image (not a string) + GrPixel = 0x7fe0; + NumPixel = 0x0010; + ReplaceOrCreateByNumber(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); + current = defaultvalue[++i]; + } +} + //----------------------------------------------------------------------------- // Private