X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=891a03f862a77fc3b460574652a6912fcbc4f5ff;hb=4fbe563dc18455266f880586fa2aca2cfb1012bc;hp=88b7d144787810412af48e9abfc330af7eef79f1;hpb=6b51b22366f878e1050c75a6ebb755bd2ff365c7;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 88b7d144..891a03f8 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/10/25 14:52:34 $ - Version: $Revision: 1.295 $ + Date: $Date: 2005/11/09 11:21:47 $ + Version: $Revision: 1.304 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,21 +19,21 @@ // // -------------- Remember ! ---------------------------------- // -// Image Position Patient (0020,0032): +// Image Position (Patient) (0020,0032): // If not found (ACR_NEMA) we try Image Position (0020,0030) // If not found (ACR-NEMA), we consider Slice Location (0020,1041) // or Location (0020,0050) // as the Z coordinate, // 0. for all the coordinates if nothing is found // -// Image Position (Patient) (0020,0032) VM=3 What is it used for? +// Image Position (Patient) (0020,0032) VM=3 // --> // 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 (Patient) (0020,0037), VM=6 -// - Image Position Patient (0020,0032), VM=3 +// - Image Position (Patient) (0020,0032), VM=3 // then attribute Patient Orientation (0020,0020) should not be present // in the images. // @@ -65,7 +65,7 @@ // FFDR = Feet First-Decubitus Right // FFDL = Feet First-Decubitus Left -// we can also find +// we can also find (non standard!) // SEMIERECT // SUPINE @@ -469,9 +469,13 @@ float File::GetXSpacing() { nbValue = entry->GetValueCount(); // Can't use IsValueCountValid because of the complex heuristic. + if( nbValue !=2 ) + gdcmWarningMacro("ImagerPixelSpacing (0x0018,0x1164) " + << "has a wrong number of values :" << nbValue); + if( nbValue >= 3 ) xspacing = (float)entry->GetValue(2); - if( nbValue >= 2 ) + else if( nbValue >= 2 ) xspacing = (float)entry->GetValue(1); else xspacing = (float)entry->GetValue(0); @@ -489,6 +493,10 @@ float File::GetXSpacing() if( entry ) { nbValue = entry->GetValueCount(); + if( nbValue !=2 ) + gdcmWarningMacro("PixelSpacing (0x0018,0x0030) " + << "has a wrong number of values :" << nbValue); + if( nbValue >= 3 ) xspacing = (float)entry->GetValue(2); else if( nbValue >= 2 ) @@ -631,7 +639,10 @@ float File::GetXOrigin() if( entry->GetValueCount() == 3 ) { - gdcmErrorMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(0); } return 0.0f; @@ -659,7 +670,10 @@ float File::GetYOrigin() if( entry->GetValueCount() == 3 ) { - gdcmErrorMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(1); } return 0.0f; @@ -680,7 +694,10 @@ float File::GetZOrigin() { if( entry->GetValueCount() == 3 ) { - gdcmErrorMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(2); } gdcmWarningMacro( "Wrong Image Position Patient (0020,0032)"); @@ -692,7 +709,10 @@ float File::GetZOrigin() { if( entry->GetValueCount() == 3 ) { - gdcmErrorMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(2); } gdcmWarningMacro( "Wrong Image Position (RET) (0020,0030)"); @@ -705,7 +725,10 @@ float File::GetZOrigin() { if( entry->GetValueCount() == 1 ) { - gdcmErrorMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(0); // VM=1 ! } gdcmWarningMacro( "Wrong Slice Location (0020,1041)"); @@ -717,7 +740,10 @@ float File::GetZOrigin() { if( entry->GetValueCount() == 1 ) { - gdcmErrorMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(0); } gdcmWarningMacro( "Wrong Location (0020,0050)"); @@ -777,7 +803,7 @@ int File::GetBitsStored() DataEntry *entry = GetDataEntry(0x0028,0x0101); if( !entry ) { - gdcmWarningMacro("(0028,0101) is supposed to be mandatory"); + gdcmWarningMacro("BitsStored (0028,0101) is supposed to be mandatory"); return 0; } return (int)entry->GetValue(0); @@ -794,7 +820,7 @@ int File::GetBitsAllocated() DataEntry *entry = GetDataEntry(0x0028,0x0100); if( !entry ) { - gdcmWarningMacro("(0028,0100) is supposed to be mandatory"); + gdcmWarningMacro("BitsAllocated (0028,0100) is supposed to be mandatory"); return 0; } return (int)entry->GetValue(0); @@ -811,7 +837,7 @@ int File::GetHighBitPosition() DataEntry *entry = GetDataEntry(0x0028,0x0102); if( !entry ) { - gdcmWarningMacro("(0028,0102) is supposed to be mandatory"); + gdcmWarningMacro("HighBitPosition (0028,0102) is supposed to be mandatory"); return 0; } return (int)entry->GetValue(0); @@ -828,7 +854,7 @@ int File::GetSamplesPerPixel() DataEntry *entry = GetDataEntry(0x0028,0x0002); if( !entry ) { - gdcmWarningMacro("(0028,0002) is supposed to be mandatory"); + gdcmWarningMacro("SamplesPerPixel (0028,0002) is supposed to be mandatory"); return 1; // Well, it's supposed to be mandatory ... // but sometimes it's missing : *we* assume Gray pixels } @@ -845,7 +871,6 @@ int File::GetPlanarConfiguration() DataEntry *entry = GetDataEntry(0x0028,0x0006); if( !entry ) { - gdcmWarningMacro( "Not found : Planar Configuration (0028,0006)"); return 0; } return (int)entry->GetValue(0); @@ -903,7 +928,7 @@ std::string File::GetPixelType() std::string bitsAlloc = GetEntryString(0x0028, 0x0100); // Bits Allocated if ( bitsAlloc == GDCM_UNFOUND ) { - gdcmWarningMacro( "Missing Bits Allocated (0028,0100)"); + gdcmWarningMacro( "Bits Allocated (0028,0100) supposed to be mandatory"); bitsAlloc = "16"; // default and arbitrary value, not to polute the output } @@ -947,7 +972,8 @@ bool File::IsSignedPixelData() DataEntry *entry = GetDataEntry(0x0028, 0x0103);//"Pixel Representation" if( !entry ) { - gdcmWarningMacro( "Missing Pixel Representation (0028,0103)"); + gdcmWarningMacro( "Pixel Representation (0028,0103) supposed to be " + << "mandatory"); return false; } return entry->GetValue(0) != 0; @@ -968,7 +994,8 @@ bool File::IsMonochrome() } if ( PhotometricInterp == GDCM_UNFOUND ) { - gdcmWarningMacro( "Not found : Photometric Interpretation (0028,0004)"); + gdcmWarningMacro( "Photometric Interpretation (0028,0004) supposed to be " + << "mandatory"); } return false; } @@ -987,7 +1014,8 @@ bool File::IsMonochrome1() } if ( PhotometricInterp == GDCM_UNFOUND ) { - gdcmWarningMacro( "Not found : Photometric Interpretation (0028,0004)"); + gdcmWarningMacro( "Photometric Interpretation (0028,0004) : supposed to" + << " be mandatory! "); } return false; } @@ -1006,7 +1034,7 @@ bool File::IsPaletteColor() } if ( PhotometricInterp == GDCM_UNFOUND ) { - gdcmWarningMacro( "Not found : Palette color (0028,0004)"); + gdcmDebugMacro( "Not found : Palette color (0028,0004)"); } return false; } @@ -1025,7 +1053,7 @@ bool File::IsYBRFull() } if ( PhotometricInterp == GDCM_UNFOUND ) { - gdcmWarningMacro( "Not found : YBR Full (0028,0004)"); + gdcmDebugMacro( "Not found : YBR Full (0028,0004)"); } return false; } @@ -1136,7 +1164,7 @@ float File::GetRescaleSlope() DataEntry *entry = GetDataEntry(0x0028, 0x1053); if( !entry ) { - gdcmWarningMacro( "Missing Rescale Slope (0028,1053)"); + gdcmDebugMacro( "Missing Rescale Slope (0028,1053)"); return 1.0f; } return (float)entry->GetValue(0); @@ -1226,7 +1254,7 @@ size_t File::GetPixelOffset() } else { - gdcmDebugMacro( "Big trouble : Pixel Element (" + gdcmWarningMacro( "Big trouble : Pixel Element (" << std::hex << GrPixel<<","<< NumPixel<< ") NOT found" ); return 0; } @@ -1248,7 +1276,7 @@ size_t File::GetPixelAreaLength() } else { - gdcmDebugMacro( "Big trouble : Pixel Element (" + gdcmWarningMacro( "Big trouble : Pixel Element (" << std::hex << GrPixel<<","<< NumPixel<< ") NOT found" ); return 0; } @@ -1454,19 +1482,18 @@ bool File::Write(std::string fileName, FileType writetype) e0000->SetString(sLen.str()); } - // Derma?.dcm does not have it...let's remove it FIXME FIXME + // FIXME : Derma?.dcm does not have it...let's remove it ?!? JPRx if( writetype != JPEG ) - { - int i_lgPix = GetEntryLength(GrPixel, NumPixel); - if (i_lgPix != -2) - { - // 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); - } - } - + { + int i_lgPix = GetEntryLength(GrPixel, NumPixel); + if (i_lgPix != -2) + { + // 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); + } + } Document::WriteContent(fp, writetype); fp->close(); @@ -1697,7 +1724,7 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElem) { // in order not to pollute output we don't warn on 'delimitors' if (itemTagGroup != 0xfffe || testGroup != 0xfffe ) - gdcmErrorMacro( "Wrong Item Tag found:" + gdcmWarningMacro( "Wrong Item Tag found:" << " We should have found tag (" << DictEntry::TranslateToKey(testGroup,testElem) << ")" << std::endl << " but instead we encountered tag (" @@ -1777,9 +1804,9 @@ void File::ReadEncapsulatedBasicOffsetTable() uint32_t val = BasicOffsetTableItemValue[i]; BasicOffsetTableItemValue[i] = ( (val<<24) | ((val<<8) & 0x00ff0000) | - ((val>>8) & 0x0000ff00) | (val>>24) ); + ( (val>>8) & 0x0000ff00) | (val>>24) ); #endif - gdcmWarningMacro( "Read one length for: " << + gdcmDebugMacro( "Read one length for: " << std::hex << BasicOffsetTableItemValue[i] ); }