X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=1e90cccb49650543aa4b9a35789e4d5adb3e3cd7;hb=ba8ca5c7ae54ae183c5d88dba3a8f2e3098ce017;hp=13570e2196845545714e5805701b3f2917c0ef85;hpb=db42dcafe4dafd893c12b6d209870d66ec474a1b;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 13570e21..1e90cccb 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 14:49:41 $ - Version: $Revision: 1.254 $ + Date: $Date: 2005/08/29 13:05:01 $ + Version: $Revision: 1.265 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -26,14 +26,16 @@ // 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 @@ -44,9 +46,22 @@ // FFDL = Feet First-Decubitus Left // FFP = Feet First-Prone // FFS = Feet First-Supine +// 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 +// are always present, this field is almost never used. +// Better we don't tust 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" @@ -66,6 +81,7 @@ namespace gdcm { + //----------------------------------------------------------------------------- // Constructor / Destructor @@ -719,7 +735,7 @@ float File::GetZOrigin() * @param iop adress of the (6)float array to receive values * @return cosines of image orientation patient */ -void File::GetImageOrientationPatient( float iop[6] ) +bool File::GetImageOrientationPatient( float iop[6] ) { std::string strImOriPat; //iop is supposed to be float[6] @@ -732,6 +748,7 @@ void File::GetImageOrientationPatient( float iop[6] ) &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." ); + return false; } } //For ACR-NEMA @@ -742,8 +759,10 @@ void File::GetImageOrientationPatient( float iop[6] ) &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." ); + return false; } } + return true; } /** @@ -766,8 +785,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 +920,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 +1289,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 +1305,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 +1314,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 +1344,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 +1362,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); @@ -1745,7 +1764,8 @@ 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' } /**