X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmFile.cxx;h=8b29ba6808608ff8c54962eabefdffaa6890db66;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=b85f3b6c66e795cb4c56f23de7a44cde6204cb72;hpb=d1a38a4f0d357d1d8079eacf4de5e0aeb3eff973;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index b85f3b6c..8b29ba68 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.cxx,v $ Language: C++ - Date: $Date: 2005/07/20 13:31:01 $ - Version: $Revision: 1.253 $ + Date: $Date: 2005/09/21 17:16:15 $ + Version: $Revision: 1.271 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -26,27 +26,65 @@ // as the Z coordinate, // 0. for all the coordinates if nothing is found // -// Image Position (Patient) (0020,0032) What is it used for? +// Image Position (Patient) (0020,0032) VM=3 What is it used for? // --> // The attribute Patient Orientation (0020,0020) from the General Image Module // is of type 2C and has the condition Required if image does not require // Image Orientation (0020,0037) and Image Position (0020,0032). -// However, if the image does require the attributes Image Orientation (0020,0037) -// and Image Position (0020,0032) then attribute Patient Orientation (0020,0020) -// should not be present in the images. +// However, if the image does require the attributes +// - Image Orientation (Patient) (0020,0037), VM=6 +// - Image Position Patient (0020,0032), VM=3 +// then attribute Patient Orientation (0020,0020) should not be present +// in the images. // // Remember also : -// Patient Position (0018,5100) values : HFP = Head First-Prone -// HFS = Head First-Supine -// HFDR = Head First-Decubitus Right -// HFDL = Head First-Decubitus Left -// FFDR = Feet First-Decubitus Right -// FFDL = Feet First-Decubitus Left -// FFP = Feet First-Prone -// FFS = Feet First-Supine +// Patient Position (0018,5100) values : + +// HFS = Head First-Supine, where increasing (positive axis direction) : +// X -> to the direction pointed to by the patient's oustretched left arm +// Y -> to the anterior-to-posterior direction in the patient's body +// Z -> to the feet-to-head direction in the patient's body + +// HFP = Head First-Prone, where increasing (positive axis direction) : +// X -> to the direction pointed to by the patient's oustretched left arm +// Y -> to the anterior-to-posterior direction in the patient's body +// Z -> to the feet-to-head direction in the patient's body + +// FFS = Feet First-Supine, where increasing (positive axis direction) : +// X -> to the direction pointed to by the patient's oustretched left arm +// Y -> to the anterior-to-posterion direction in the patient's body +// Z -> to the feet-to-head direction in the patient's body + +// FFP = Feet First-Prone, where increasing (positive axis direction) : +// X -> to the direction pointed to by the patient's oustretched left arm +// Y -> to the posterior-to-anterior direction in the patient's body +// Z -> to the feet-to-head direction in the patient's body + +// HFDR = Head First-Decubitus Right +// HFDL = Head First-Decubitus Left +// FFDR = Feet First-Decubitus Right +// FFDL = Feet First-Decubitus Left + +// we can also find + +// SEMIERECT +// SUPINE + // CS 2 Patient Orientation (0020 0020) -// When the coordinates of the image -// are always present, this field is almost never used +// When the coordinates of the image +// are always present, this field is almost never used. +// Better we don't trust it too much ... +// Found Values are : +// L\P +// L\FP +// P\F +// L\F +// P\FR +// R\F +// +// (0020|0037) [Image Orientation (Patient)] [1\0\0\0\1\0 ] + + // --------------------------------------------------------------- // #include "gdcmFile.h" @@ -61,11 +99,12 @@ #include "gdcmJPEGFragmentsInfo.h" #include -#include //sscanf +#include //sscanf #include // for atoi namespace gdcm { + //----------------------------------------------------------------------------- // Constructor / Destructor @@ -715,11 +754,13 @@ float File::GetZOrigin() /** * \brief gets the info from 0020,0037 : Image Orientation Patient + * or from 0020 0035 : Image Orientation (RET) * (needed to organize DICOM files based on their x,y,z position) * @param iop adress of the (6)float array to receive values - * @return cosines of image orientation patient + * @return true when one of the tag is found + * false when nothing is found */ -void File::GetImageOrientationPatient( float iop[6] ) +bool File::GetImageOrientationPatient( float iop[6] ) { std::string strImOriPat; //iop is supposed to be float[6] @@ -731,7 +772,9 @@ void File::GetImageOrientationPatient( float iop[6] ) if ( sscanf( strImOriPat.c_str(), "%f \\ %f \\%f \\%f \\%f \\%f ", &iop[0], &iop[1], &iop[2], &iop[3], &iop[4], &iop[5]) != 6 ) { - gdcmWarningMacro( "Wrong Image Orientation Patient (0020,0037). Less than 6 values were found." ); + gdcmWarningMacro( "Wrong Image Orientation Patient (0020,0037)." + << " Less than 6 values were found." ); + return false; } } //For ACR-NEMA @@ -741,11 +784,16 @@ void File::GetImageOrientationPatient( float iop[6] ) if ( sscanf( strImOriPat.c_str(), "%f \\ %f \\%f \\%f \\%f \\%f ", &iop[0], &iop[1], &iop[2], &iop[3], &iop[4], &iop[5]) != 6 ) { - gdcmWarningMacro( "wrong Image Orientation Patient (0020,0035). Less than 6 values were found." ); + gdcmWarningMacro( "wrong Image Orientation Patient (0020,0035). " + << "Less than 6 values were found." ); + return false; } } + return true; } + + /** * \brief Retrieve the number of Bits Stored (actually used) * (as opposed to number of Bits Allocated) @@ -766,8 +814,8 @@ int File::GetBitsStored() /** * \brief Retrieve the number of Bits Allocated - * (8, 12 -compacted ACR-NEMA files-, 16, ...) - * @return The encountered number of Bits Allocated, 0 by default. + * (8, 12 -compacted ACR-NEMA files-, 16, 24 -old RGB ACR-NEMA files-,) + * @return The encountered Number of Bits Allocated, 0 by default. * 0 means the file is NOT USABLE. The caller has to check it ! */ int File::GetBitsAllocated() @@ -901,8 +949,8 @@ std::string File::GetPixelType() } else if ( bitsAlloc == "24" ) { - // (in order no to be messed up - bitsAlloc = "8"; // by old RGB images) + // (in order no to be messed up by old RGB images) + bitsAlloc = "8"; } std::string sign = GetEntryValue(0x0028, 0x0103);//"Pixel Representation" @@ -1270,7 +1318,7 @@ void File::AddAnonymizeElement (uint16_t group, uint16_t elem, el.Group = group; el.Elem = elem; el.Value = value; - AnonymizeList.push_back(el); + UserAnonymizeList.push_back(el); } /** @@ -1286,8 +1334,8 @@ void File::AnonymizeNoLoad() uint32_t lgth; uint32_t valLgth = 0; std::string *spaces; - for (ListElements::iterator it = AnonymizeList.begin(); - it != AnonymizeList.end(); + for (ListElements::iterator it = UserAnonymizeList.begin(); + it != UserAnonymizeList.end(); ++it) { d = GetDocEntry( (*it).Group, (*it).Elem); @@ -1295,11 +1343,11 @@ void File::AnonymizeNoLoad() if ( d == NULL) continue; - if ( dynamic_cast(d) ) - { - gdcmWarningMacro( "You cannot 'Anonymize a SeqEntry "); - continue; - } + if ( dynamic_cast(d) ) + { + gdcmWarningMacro( "You cannot 'Anonymize' a SeqEntry "); + continue; + } offset = d->GetOffset(); lgth = d->GetLength(); @@ -1325,7 +1373,7 @@ void File::AnonymizeNoLoad() bool File::AnonymizeFile() { // If Anonymisation list is empty, let's perform some basic anonymization - if ( AnonymizeList.begin() == AnonymizeList.end() ) + if ( UserAnonymizeList.begin() == UserAnonymizeList.end() ) { // If exist, replace by spaces SetValEntry (" ",0x0010, 0x2154); // Telephone @@ -1343,15 +1391,15 @@ bool File::AnonymizeFile() } else { - SetValEntry("anonymised", 0x0010, 0x0010); + SetValEntry("anonymized", 0x0010, 0x0010); } } } else { gdcm::DocEntry *d; - for (ListElements::iterator it = AnonymizeList.begin(); - it != AnonymizeList.end(); + for (ListElements::iterator it = UserAnonymizeList.begin(); + it != UserAnonymizeList.end(); ++it) { d = GetDocEntry( (*it).Group, (*it).Elem); @@ -1453,7 +1501,7 @@ bool File::Write(std::string fileName, FileType writetype) if ( e0000 ) { std::ostringstream sLen; - sLen << ComputeGroup0002Length(writetype); + sLen << ComputeGroup0002Length( ); e0000->SetValue(sLen.str()); } @@ -1643,7 +1691,7 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElem) itemTagGroup = ReadInt16(); itemTagElem = ReadInt16(); } - catch ( FormatError e ) + catch ( FormatError /*e*/ ) { //std::cerr << e << std::endl; return false; @@ -1732,11 +1780,12 @@ void File::ReadAndSkipEncapsulatedBasicOffsetTable() } // These are the deprecated method that one day should be removed (after the next release) + #ifndef GDCM_LEGACY_REMOVE /** - * \brief Constructor + * \brief Constructor (DEPRECATED : temporaryly kept not to break the API) * @param filename name of the file whose header we want to analyze - * @deprecated do not use anymore + * @deprecated do not use any longer */ File::File( std::string const &filename ) :Document( ) @@ -1744,15 +1793,16 @@ File::File( std::string const &filename ) RLEInfo = new RLEFramesInfo; JPEGInfo = new JPEGFragmentsInfo; - Load( filename ); // gdcm::Document is first Loaded, then the 'File part' + SetFileName( filename ); + Load( ); // gdcm::Document is first Loaded, then the 'File part' } /** - * \brief Loader. (DEPRECATED : not to break the API) + * \brief Loader. (DEPRECATED : temporaryly kept not to break the API) * @param fileName file to be open for parsing * @return false if file cannot be open or no swap info was found, * or no tag was found. - * @deprecated Use the Load() function instead + * @deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead */ bool File::Load( std::string const &fileName ) {