Program: gdcm
Module: $RCSfile: exOverlaysACR.cxx,v $
Language: C++
- Date: $Date: 2005/08/30 14:40:28 $
- Version: $Revision: 1.6 $
+ Date: $Date: 2005/10/25 14:52:28 $
+ Version: $Revision: 1.9 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//std::cout << argv[1] << std::endl;
- f = new gdcm::File( );
+ f = gdcm::File::New( );
- f->SetLoadMode(GDCM_LD_NOSEQ | GDCM_LD_NOSHADOW);
+ f->SetLoadMode(gdcm::LD_NOSEQ | gdcm::LD_NOSHADOW);
f->SetFileName( fileName );
bool res = f->Load();
std::cout << "Sorry, " << fileName <<" not a gdcm-readable "
<< "DICOM / ACR File"
<<std::endl;
- delete f;
+ f->Delete();
return 0;
}
std::cout << " ... is readable " << std::endl;
if ( bitsAllocated <= 8 )
{
std::cout << " 8 bits pixel image cannot contain Overlays " << std::endl;
- delete f;
+ f->Delete();
return 0;
}
- std::string s1 = f->GetEntryValue(0x6000, 0x0102);
+ std::string s1 = f->GetEntryString(0x6000, 0x0102);
if (s1 == gdcm::GDCM_UNFOUND)
{
std::cout << " Image doesn't contain any Overlay " << std::endl;
- delete f;
+ f->Delete();
return 0;
}
std::cout << " File is read! " << std::endl;
if (fp == 0)
{
std::cout << "Unable to open File" << std::endl;
- delete f;
+ f->Delete();
return 0;
}
else
<< "readable. expected length :" << nx*ny
<< " " << "read length : " << lgt
<< std::endl;
- delete f;
+ f->Delete();
delete pixels;
return 0;
}
gdcm::FileHelper *fh = 0;
-while ( (strOvlBitPosition = f->GetEntryValue(currentOvlGroup, 0x0102))
- != gdcm::GDCM_UNFOUND )
-{
+ while ( (strOvlBitPosition = f->GetEntryString(currentOvlGroup, 0x0102))
+ != gdcm::GDCM_UNFOUND )
+ {
- strOverlayLocation = f->GetEntryValue(currentOvlGroup, 0x0200);
+ strOverlayLocation = f->GetEntryString(currentOvlGroup, 0x0200);
if ( strOverlayLocation != gdcm::GDCM_UNFOUND )
{
overlayLocation = atoi(strOverlayLocation.c_str());
if( gdcm::Debug::GetDebugFlag() )
std::cout << "About to built empty file" << std::endl;
- fileToBuild = new gdcm::File();
+ fileToBuild = gdcm::File::New();
if( gdcm::Debug::GetDebugFlag() )
std::cout << "Finish to built empty file" << std::endl;
str.str("");
str << nx;
- fileToBuild->InsertValEntry(str.str(),0x0028,0x0011); // Columns
+ fileToBuild->InsertEntryString(str.str(),0x0028,0x0011); // Columns
str.str("");
str << ny;
- fileToBuild->InsertValEntry(str.str(),0x0028,0x0010); // Rows
+ fileToBuild->InsertEntryString(str.str(),0x0028,0x0010); // Rows
- fileToBuild->InsertValEntry("8",0x0028,0x0100); // Bits Allocated
- fileToBuild->InsertValEntry("8",0x0028,0x0101); // Bits Stored
- fileToBuild->InsertValEntry("7",0x0028,0x0102); // High Bit
- fileToBuild->InsertValEntry("0",0x0028,0x0103); // Pixel Representation
- fileToBuild->InsertValEntry("1",0x0028,0x0002); // Samples per Pixel
+ fileToBuild->InsertEntryString("8",0x0028,0x0100); // Bits Allocated
+ fileToBuild->InsertEntryString("8",0x0028,0x0101); // Bits Stored
+ fileToBuild->InsertEntryString("7",0x0028,0x0102); // High Bit
+ fileToBuild->InsertEntryString("0",0x0028,0x0103); // Pixel Representation
+ fileToBuild->InsertEntryString("1",0x0028,0x0002); // Samples per Pixel
- fileToBuild->InsertValEntry("MONOCHROME2 ",0x0028,0x0004);
+ fileToBuild->InsertEntryString("MONOCHROME2 ",0x0028,0x0004);
// Other mandatory fields will be set automatically,
// just before Write(), by FileHelper::CheckMandatoryElements()
if( gdcm::Debug::GetDebugFlag() )
std::cout << "-------------About to built FileHelper" << std::endl;
- fh = new gdcm::FileHelper(fileToBuild);
+ fh = gdcm::FileHelper::New(fileToBuild);
if( gdcm::Debug::GetDebugFlag() )
std::cout << "-------------Finish to built FileHelper" << std::endl;
{
std::cout << "Failed\n"
<< "File in unwrittable\n";
- delete fh;
+ fh->Delete();
if (fileToBuild)
- delete fileToBuild;
+ fileToBuild->Delete();
delete pixels;
delete tabPixels;
return 0;
i++;
}
- delete f;
if (f)
- delete fh;
+ fh->Delete();
if (fileToBuild)
- delete fileToBuild;
+ fileToBuild->Delete();
+ f->Delete();
delete pixels;
delete tabPixels;
+
return 0;
}