Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2005/10/21 16:00:55 $
- Version: $Revision: 1.288 $
+ Date: $Date: 2005/11/03 14:23:13 $
+ Version: $Revision: 1.300 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//
// -------------- 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.
//
// FFDR = Feet First-Decubitus Right
// FFDL = Feet First-Decubitus Left
-// we can also find
+// we can also find (non standard!)
// SEMIERECT
// SUPINE
DictEntry* newDict = DictEntry::New(GrPixel,NumPixel,
PixelVR,"1","Pixel Data");
- DataEntry *newEntry = new DataEntry(newDict);
+ DataEntry *newEntry = DataEntry::New(newDict);
newDict->Delete();
newEntry->Copy(entry);
newEntry->SetBinArea(oldEntry->GetBinArea(),oldEntry->IsSelfArea());
RemoveEntry(oldEntry);
AddEntry(newEntry);
+ newEntry->Delete();
}
}
}
nbValue = entry->GetValueCount();
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);
if( entry->GetValueCount() == 3 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(0);
}
return 0.0f;
if( entry->GetValueCount() == 3 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(1);
}
return 0.0f;
{
if( entry->GetValueCount() == 3 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(2);
}
gdcmWarningMacro( "Wrong Image Position Patient (0020,0032)");
{
if( entry->GetValueCount() == 3 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(2);
}
gdcmWarningMacro( "Wrong Image Position (RET) (0020,0030)");
{
if( entry->GetValueCount() == 1 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(0); // VM=1 !
}
gdcmWarningMacro( "Wrong Slice Location (0020,1041)");
{
if( entry->GetValueCount() == 1 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(0);
}
gdcmWarningMacro( "Wrong Location (0020,0050)");
DataEntry *entry = GetDataEntry(0x0028,0x0006);
if( !entry )
{
- gdcmWarningMacro( "Not found : Planar Configuration (0028,0006)");
return 0;
}
return (int)entry->GetValue(0);
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();
/**
* \brief Assuming the internal file pointer \ref Document::Fp
- * is placed at the beginning of a tag check whether this
+ * is placed at the beginning of a tag, check whether this
* tag is (TestGroup, TestElem).
* \warning On success the internal file pointer \ref Document::Fp
* is modified to point after the tag.
return false;
}
if ( itemTagGroup != testGroup || itemTagElem != testElem )
- {
- gdcmErrorMacro( "Wrong Item Tag found:"
- << " We should have found tag ("
- << DictEntry::TranslateToKey(testGroup,testElem) << ")" << std::endl
- << " but instead we encountered tag ("
- << DictEntry::TranslateToKey(itemTagGroup,itemTagElem) << ")"
- << " at address: " << " 0x(" << std::hex
- << (unsigned int)currentPosition << std::dec << ")"
- ) ;
+ {
+ // in order not to pollute output we don't warn on 'delimitors'
+ if (itemTagGroup != 0xfffe || testGroup != 0xfffe )
+ gdcmErrorMacro( "Wrong Item Tag found:"
+ << " We should have found tag ("
+ << DictEntry::TranslateToKey(testGroup,testElem) << ")" << std::endl
+ << " but instead we encountered tag ("
+ << DictEntry::TranslateToKey(itemTagGroup,itemTagElem) << ")"
+ << " at address: " << " 0x(" << std::hex
+ << (unsigned int)currentPosition << std::dec << ")"
+ ) ;
Fp->seekg(positionOnEntry, std::ios::beg);
return false;
if ( !ReadTag(testGroup, testElem) )
{
- gdcmErrorMacro( "ReadTag did not succeed for ("
+ // Avoid polutting output
+ if ( testGroup != 0xfffe )
+ gdcmErrorMacro( "ReadTag did not succeed for ("
<< DictEntry::TranslateToKey(testGroup,testElem)
<< ")..." );
return 0;
// These are the deprecated method that one day should be removed (after the next release)
#ifndef GDCM_LEGACY_REMOVE
-/* *
- * \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 any longer
- */
-File::File( std::string const &filename )
- :Document( )
-{
- RLEInfo = new RLEFramesInfo;
- JPEGInfo = new JPEGFragmentsInfo;
-
- SetFileName( filename );
- Load( ); // gdcm::Document is first Loaded, then the 'File part'
-}
-
-/* *
- * \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,
+/*
+ * \ 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 )
{
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff