Program: gdcm
Module: $RCSfile: FindTags.cxx,v $
Language: C++
- Date: $Date: 2005/02/02 10:06:31 $
- Version: $Revision: 1.13 $
+ Date: $Date: 2005/10/25 14:52:26 $
+ Version: $Revision: 1.16 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
std::string fileName;
- gdcm::FileHelper *f1;
-
- if(argc > 1 )
- f1 = new gdcm::FileHelper(argv[1]);
- else {
+ gdcm::FileHelper *h;
+ gdcm::File *f = gdcm::File::New();
+
+
+ if(argc > 1 )
+ f->SetFileName(argv[1]);
+ else
+ {
fileName = GDCM_DATA_ROOT;
fileName += "/test.acr";
- f1 = new gdcm::FileHelper(fileName);
+ f->SetFileName(fileName);
}
-
+
+ f->Load();
+ // Should test if it worked !
+
+ h = gdcm::FileHelper::New(f);
+
std::string ManufacturerName="SIEMENS ";
std::string RecCode="ACR-NEMA 2.0";
std::string ImagePositionPatient, Location, ImageLocation;
float x, y, z, l;
- int dataSize = f1->GetImageDataSize();
+ int dataSize = h->GetImageDataSize();
std::cout << "---> pourFindTaggs : dataSize " << dataSize << std::endl;
- f1->SetValEntry(RecCode ,0x0008,0x0010);
- f1->SetValEntry(ManufacturerName ,0x0008,0x0070);
+ h->SetEntryString(RecCode ,0x0008,0x0010);
+ h->SetEntryString(ManufacturerName ,0x0008,0x0070);
// ImagePositionPatient
- ImagePositionPatient = f1->GetFile()->GetEntryValue(0x0020,0x0032);
+ ImagePositionPatient = h->GetFile()->GetEntryString(0x0020,0x0032);
// Image Position (RET)
- f1->SetValEntry(ImagePositionPatient, 0x0020,0x0030);
+ h->SetEntryString(ImagePositionPatient, 0x0020,0x0030);
sscanf(ImagePositionPatient.c_str(), "%f%c%f%c%f", &x,&c,&y,&c,&z);
// Location
std::string zizi = gdcm::Util::Format("%f",l);
Location = gdcm::Util::DicomString(zizi.c_str());
- f1->SetValEntry(Location, 0x0020,0x0050);
+ h->SetEntryString(Location, 0x0020,0x0050);
// sinon, la longueur du champ est erronée (?!?)
// Probable sac de noeud entre strlen(xxx.c_str()) et xxx.length()
// SetEntryLength is private now.
//TO DO : see if the pb goes on...
-//f1->GetFile()->SetEntryLength(strlen(Location.c_str())-1, 0x0020,0x0050);
+//h->GetFile()->SetEntryLength(strlen(Location.c_str())-1, 0x0020,0x0050);
// Image Location
zizi = gdcm::Util::Format("%d",0x7FE0);
ImageLocation = gdcm::Util::DicomString(zizi.c_str());
-//f1->SetValEntry(Location, 0x0028,0x0200);
-//f1->GetFile()->SetEntryLength(strlen(ImageLocation.c_str())-1, 0x0020,0x0050); // prudence !
+//h->SetEntryString(Location, 0x0028,0x0200);
+//h->GetFile()->SetEntryLength(strlen(ImageLocation.c_str())-1, 0x0020,0x0050); // prudence !
-// void *imageData= f1->GetImageData();
+// void *imageData= h->GetImageData();
// ecriture d'un fichier ACR à partir d'un dcmFile correct.
std::cout << "----------------before PrintEntry---------------------" << std::endl;
- f1->GetFile()->Print();
+ h->GetFile()->Print();
std::cout << "----------------before WriteDcm---------------------" << std::endl;
fileNameToWrite = fileName + ".acr";
std::cout << "WriteACR" << std::endl;
- f1->WriteAcr(fileNameToWrite);
+ h->WriteAcr(fileNameToWrite);
std::cout << "----------------apres Write---------------------" << std::endl;
+ h->Delete();
+ f->Delete();
+
return 0;
}