X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FWriteDicom.cxx;h=50ee73574ecbf2298e18e4a2d31166e73f75a3b9;hb=be54aab0103af7dee1a3bb5b8b3ee93b59ca9073;hp=81a790484beb16b1b950e4b9361b6c6132f6371f;hpb=a462ce9f1af0894cd930ab04f2e65cd80dfa7084;p=gdcm.git diff --git a/Example/WriteDicom.cxx b/Example/WriteDicom.cxx index 81a79048..50ee7357 100644 --- a/Example/WriteDicom.cxx +++ b/Example/WriteDicom.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: WriteDicom.cxx,v $ Language: C++ - Date: $Date: 2005/01/08 15:03:57 $ - Version: $Revision: 1.10 $ + Date: $Date: 2005/01/24 16:44:53 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmHeader.h" #include "gdcmFile.h" +#include "gdcmFileHelper.h" // Writting of a DICOM file based on a correct dicom header // and data pixel of another image @@ -32,22 +32,22 @@ int main(int argc, char* argv[]) } const char *first = argv[1]; - gdcm::File *f1 = new gdcm::File( first ); + gdcm::FileHelper *f1 = new gdcm::FileHelper( first ); const char *second = argv[2]; - gdcm::File *f2 = new gdcm::File( second ); + gdcm::FileHelper *f2 = new gdcm::FileHelper( second ); // We assume that DICOM fields of second file actually exists : - std::string nbFrames = f2->GetHeader()->GetEntry(0x0028, 0x0008); + std::string nbFrames = f2->GetFile()->GetEntryValue(0x0028, 0x0008); if(nbFrames != "gdcm::Unfound") { - f1->GetHeader()->ReplaceOrCreate( nbFrames, 0x0028, 0x0008); + f1->GetFile()->Insert( nbFrames, 0x0028, 0x0008); } - f1->GetHeader()->ReplaceOrCreate( - f2->GetHeader()->GetEntry(0x0028, 0x0010), 0x0028, 0x0010); // nbLig - f1->GetHeader()->ReplaceOrCreate( - f2->GetHeader()->GetEntry(0x0028, 0x0011), 0x0028, 0x0011); // nbCol + f1->GetFile()->Insert( + f2->GetFile()->GetEntryValue(0x0028, 0x0010), 0x0028, 0x0010); // nbLig + f1->GetFile()->Insert( + f2->GetFile()->GetEntryValue(0x0028, 0x0011), 0x0028, 0x0011); // nbCol // Some other tags should be updated: @@ -63,10 +63,10 @@ int main(int argc, char* argv[]) // TODO : Shouldn't we merge those two functions ? f1->SetImageData( imageData, dataSize); - f1->GetHeader()->Print(); + f1->GetFile()->Print(); - std::string s0 = f2->GetHeader()->GetEntry(0x7fe0, 0x0000); - std::string s10 = f2->GetHeader()->GetEntry(0x7fe0, 0x0010); + std::string s0 = f2->GetFile()->GetEntryValue(0x7fe0, 0x0000); + std::string s10 = f2->GetFile()->GetEntryValue(0x7fe0, 0x0010); std::cout << "lgr 7fe0, 0000 " << s0 << std::endl; std::cout << "lgr 7fe0, 0010 " << s10 << std::endl;