X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.cxx;h=62b38d4934bb007d0a275870b7d12129251d6c16;hb=38d772b8588bc4e7106dbafcb24f6bff91b8c4c1;hp=4f4aefe0790c863504b630a75bca9c7cb478d9b5;hpb=f2dc5ed79f619aa34aa6e800a53b24283452b170;p=gdcm.git diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index 4f4aefe0..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/23 01:10:40 $ - Version: $Revision: 1.204 $ + 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 @@ -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; } //----------------------------------------------------------------------------- @@ -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 @@ -1317,58 +1309,58 @@ void Header::InitializeDefaultHeader() uint16_t elem; } DICOM_DEFAULT_VALUE; - const char *date = Util::GetCurrentDate().c_str(); - const char *time = Util::GetCurrentTime().c_str(); - const char *uid = Util::CreateUniqueUID().c_str(); + 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, 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, 0x0020, 0x000d, // StudyInstanceUID - uid, 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 time - - date, 0x0008, 0x0012, // Instance Creation Date - time, 0x0008, 0x0013, // Instance Creation Time - date, 0x0008, 0x0020, // Study Date - date, 0x0008, 0x0022, // Acquisition Date - date, 0x0008, 0x0023, // Content Date - time, 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 + { "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