X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=4ccb1e7ae0b52a14856c7b130a601333be791600;hb=fd4836713e19aa7a1a6ae5ffae7933fd53ffd5ef;hp=9970114f3c29674e9c3c2a2f1366ebb670b9dff8;hpb=722e55dcbb3f875a53d0e625568eecfb6e97d4b7;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 9970114f..4ccb1e7a 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/12/09 12:22:49 $ - Version: $Revision: 1.311 $ + Date: $Date: 2006/04/11 16:03:26 $ + Version: $Revision: 1.318 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -118,13 +118,14 @@ File::File(): GrPixel = 0x7fe0; // to avoid further troubles NumPixel = 0x0010; BasicOffsetTableItemValue = 0; + FourthDimensionLocation = TagKey(0,0); } /** * \brief Canonical destructor. */ -File::~File () +File::~File() { if ( RLEInfo ) delete RLEInfo; @@ -215,6 +216,11 @@ bool File::DoTheLoadingJob( ) // The changed DictEntry will have // - a correct PixelVR OB or OW) // - the name to "Pixel Data" + + //==>Take it easy! + //==> Just change the VR ! + +/* DataEntry *oldEntry = dynamic_cast(entry); if (oldEntry) { @@ -228,24 +234,38 @@ bool File::DoTheLoadingJob( ) // Change only made if usefull if ( PixelVR != oldEntry->GetVR() ) - { - DictEntry* newDict = DictEntry::New(GrPixel,NumPixel, - PixelVR,"1","Pixel Data"); - - DataEntry *newEntry = DataEntry::New(newDict); - newDict->Delete(); - newEntry->Copy(entry); - newEntry->SetBinArea(oldEntry->GetBinArea(),oldEntry->IsSelfArea()); - oldEntry->SetSelfArea(false); - - RemoveEntry(oldEntry); - AddEntry(newEntry); - newEntry->Delete(); + { + //DictEntry* newDict = DictEntry::New(GrPixel,NumPixel, + // PixelVR,"1","Pixel Data"); + //DataEntry *newEntry = DataEntry::New(newDict); + //newDict->Delete(); + //newEntry->Copy(entry); + //newEntry->SetBinArea(oldEntry->GetBinArea(),oldEntry->IsSelfArea()); + //oldEntry->SetSelfArea(false); + + //RemoveEntry(oldEntry); + //AddEntry(newEntry); + //newEntry->Delete(); + } } +*/ + VRKey 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"; + // Change only made if usefull + if ( PixelVR != entry->GetVR() ) + { + entry->SetVR(PixelVR); + } } return true; } + /** * \brief This predicate, based on hopefully reasonable heuristics, * decides whether or not the current File was properly parsed @@ -450,6 +470,34 @@ int File::GetZSize() return 1; } +/** + * \brief Retrieve the -unnormalized- number of 'times' of '4D image'. + * User has to tell gdcm the location of this '4th Dimension component' + * using SetFourthDimensionLocation() method before. + * \warning The defaulted value is 1. + * @return The encountered size when found, 1 by default + * (The file doesn't contain a '4D image'.). + */ +int File::GetTSize() +{ + if (FourthDimensionLocation == TagKey(0,0) )// 4D location is not set : not a 4D object + return 1; + + DataEntry *entry = GetDataEntry(FourthDimensionLocation.GetGroup(), + FourthDimensionLocation.GetElement() ); + if( !entry ) + { + gdcmWarningMacro( " FourthDimensionLocation not found at : " << + std::hex << FourthDimensionLocation.GetGroup() + << "|" << FourthDimensionLocation.GetElement()); + return 1; + } + else + { + return (int)entry->GetValue(0); + } +} + /** * \brief gets the info from 0018,1164 : ImagerPixelSpacing * then 0028,0030 : Pixel Spacing @@ -511,7 +559,6 @@ float File::GetXSpacing() { gdcmWarningMacro( "Unfound Pixel Spacing (0028,0030)" ); } - return xspacing; } @@ -568,7 +615,6 @@ float File::GetYSpacing() * XOrigin, YOrigin, ZOrigin (of the top left image corner) * of 2 consecutive images, and the Orientation * Computing ZSpacing on a single image is not really meaningfull ! - * @return Z dimension of a voxel-to be */ float File::GetZSpacing() @@ -781,6 +827,8 @@ bool File::GetImageOrientationPatient( float iop[6] ) { std::string strImOriPat; //iop is supposed to be float[6] + iop[0] = iop[4] = 1.; + iop[1] = iop[2] = iop[3] = iop[5] = 0.; // 0020 0037 DS REL Image Orientation (Patient) if ( (strImOriPat = GetEntryString(0x0020,0x0037)) != GDCM_UNFOUND ) @@ -788,14 +836,11 @@ bool 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 ) { - iop[0] = iop[4] = 1.; - iop[1] = iop[2] = iop[3] = iop[5] = 0.; gdcmWarningMacro( "Wrong Image Orientation Patient (0020,0037)." << " Less than 6 values were found." ); return false; } - else - return true; + return true; } //For ACR-NEMA // 0020 0035 DS REL Image Orientation (RET) @@ -804,14 +849,11 @@ bool 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 ) { - iop[0] = iop[4] = 1.; - iop[1] = iop[2] = iop[3] = iop[5] = 0.; gdcmWarningMacro( "wrong Image Orientation Patient (0020,0035). " << "Less than 6 values were found." ); return false; } - else - return true; + return true; } return false; } @@ -1163,7 +1205,7 @@ int File::GetLUTNbits() /** *\brief gets the info from 0028,1052 : Rescale Intercept - * @return Rescale Intercept + * @return Rescale Intercept. defaulted to 0.0 is not found or empty */ float File::GetRescaleIntercept() { @@ -1180,7 +1222,7 @@ float File::GetRescaleIntercept() /** *\brief gets the info from 0028,1053 : Rescale Slope - * @return Rescale Slope + * @return Rescale Slope. defaulted to 1.0 is not found or empty */ float File::GetRescaleSlope() { @@ -1197,7 +1239,7 @@ float File::GetRescaleSlope() /** * \brief This function is intended to user who doesn't want * to have to manage a LUT and expects to get an RBG Pixel image - * (or a monochrome one ...) + * (or a monochrome one, if no LUT found ...) * \warning to be used with GetImagePixels() * @return 1 if Gray level, 3 if Color (RGB, YBR, *or PALETTE COLOR*) */ @@ -1506,7 +1548,7 @@ bool File::Write(std::string fileName, FileType writetype) e0000->SetString(sLen.str()); } - // FIXME : Derma?.dcm does not have it...let's remove it ?!? JPRx + /// \todo FIXME : Derma?.dcm does not have it...let's remove it ?!? JPRx if( writetype != JPEG ) { int i_lgPix = GetEntryLength(GrPixel, NumPixel); @@ -1515,7 +1557,7 @@ bool File::Write(std::string fileName, FileType writetype) // no (GrPixel, NumPixel) element std::string s_lgPix = Util::Format("%d", i_lgPix+12); s_lgPix = Util::DicomString( s_lgPix.c_str() ); - InsertEntryString(s_lgPix,GrPixel, 0x0000); + InsertEntryString(s_lgPix,GrPixel, 0x0000, "UL"); } } Document::WriteContent(fp, writetype); @@ -1590,7 +1632,7 @@ void File::ComputeRLEInfo() // Offset Table information on fragments of this current Frame. // Note that the fragment pixels themselves are not loaded // (but just skipped). - long frameOffset = Fp->tellg(); + long frameOffset = Fp->tellg(); // once per fragment uint32_t nbRleSegments = ReadInt32(); if ( nbRleSegments > 16 ) @@ -1637,7 +1679,7 @@ void File::ComputeRLEInfo() // Make sure that we encounter a 'Sequence Delimiter Item' // at the end of the item : - if ( !ReadTag(0xfffe, 0xe0dd) ) + if ( !ReadTag(0xfffe, 0xe0dd) ) // once per RLE File { gdcmWarningMacro( "No sequence delimiter item at end of RLE item sequence"); } @@ -1690,7 +1732,7 @@ void File::ComputeJPEGFragmentInfo() i++; } - long fragmentOffset = Fp->tellg(); + long fragmentOffset = Fp->tellg(); // Once per fragment // Store the collected info JPEGFragment *newFragment = new JPEGFragment; newFragment->SetOffset(fragmentOffset); @@ -1723,8 +1765,8 @@ void File::ComputeJPEGFragmentInfo() */ bool File::ReadTag(uint16_t testGroup, uint16_t testElem) { - long positionOnEntry = Fp->tellg(); - long currentPosition = Fp->tellg(); // On debugging purposes + long positionOnEntry = Fp->tellg(); // Only when reading fragments + //long currentPosition = positionOnEntry; // On debugging purposes // Read the Item Tag group and element, and make // sure they are what we expected: @@ -1745,7 +1787,7 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElem) return false; } if ( itemTagGroup != testGroup || itemTagElem != testElem ) - { + { // in order not to pollute output we don't warn on 'delimitors' if (itemTagGroup != 0xfffe || testGroup != 0xfffe ) gdcmWarningMacro( "Wrong Item Tag found:" @@ -1754,7 +1796,7 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElem) << " but instead we encountered tag (" << DictEntry::TranslateToKey(itemTagGroup,itemTagElem) << ")" << " at address: " << " 0x(" << std::hex - << (unsigned int)currentPosition << std::dec << ")" + << (unsigned int)positionOnEntry << std::dec << ")" ) ; Fp->seekg(positionOnEntry, std::ios::beg); @@ -1791,10 +1833,12 @@ uint32_t File::ReadTagLength(uint16_t testGroup, uint16_t testElem) } //// Then read the associated Item Length - long currentPosition = Fp->tellg(); + + // long currentPosition = Fp->tellg(); // save time // JPRx uint32_t itemLength = ReadInt32(); gdcmDebugMacro( "Basic Item Length is: " << itemLength - << " at address: " << std::hex << (unsigned int)currentPosition); +// << " at address: " << std::hex << (unsigned int)currentPosition + ); return itemLength; } @@ -1840,15 +1884,14 @@ void File::ReadEncapsulatedBasicOffsetTable() // These are the deprecated method that one day should be removed (after the next release) -//#ifndef GDCM_LEGACY_REMOVE +#ifndef GDCM_LEGACY_REMOVE /* * \ 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() [ + SetLoadMode() ] + SetFileName() functions instead + * @deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead */ - /* bool File::Load( std::string const &fileName ) { GDCM_LEGACY_REPLACED_BODY(File::Load(std::string), "1.2", @@ -1859,8 +1902,7 @@ bool File::Load( std::string const &fileName ) return DoTheLoadingJob( ); } -*/ -//#endif +#endif //----------------------------------------------------------------------------- // Print