X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FTestCopyDicom.cxx;h=37005844279a0d24147f1e743704dfce9b822667;hb=be54aab0103af7dee1a3bb5b8b3ee93b59ca9073;hp=8d386103252e2a5c10f1a966909b1eaf18f0bdde;hpb=d00078b5e19310b379c8339fa8fe38362e8ca392;p=gdcm.git diff --git a/Example/TestCopyDicom.cxx b/Example/TestCopyDicom.cxx index 8d386103..37005844 100644 --- a/Example/TestCopyDicom.cxx +++ b/Example/TestCopyDicom.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestCopyDicom.cxx,v $ Language: C++ - Date: $Date: 2005/01/20 16:16:58 $ - Version: $Revision: 1.18 $ + Date: $Date: 2005/01/24 16:44:53 $ + Version: $Revision: 1.21 $ 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" #include "gdcmDocument.h" #include "gdcmValEntry.h" #include "gdcmBinEntry.h" @@ -83,7 +83,7 @@ int main(int argc, char* argv[]) gdcm::FileHelper *original = new gdcm::FileHelper( filename ); std::cout << "--- Original ----------------------" << std::endl; - //original->GetHeader()->Print(); + //original->GetFile()->Print(); gdcm::FileHelper *copy = new gdcm::FileHelper( output ); @@ -96,15 +96,15 @@ int main(int argc, char* argv[]) // Warning :Accessor gdcmElementSet::GetEntry() should not exist // It was commented out by Mathieu, that was a *good* idea - // (the user does NOT have to know the way we implemented the Header !) + // (the user does NOT have to know the way we implemented the File !) // Waiting for a 'clean' solution, I keep the method ...JPRx - gdcm::DocEntry* d=original->GetHeader()->GetFirstEntry(); + gdcm::DocEntry* d=original->GetFile()->GetFirstEntry(); while(d) { if ( gdcm::BinEntry* b = dynamic_cast(d) ) { - copy->GetHeader()->ReplaceOrCreate( + copy->GetFile()->Insert( b->GetBinArea(), b->GetLength(), b->GetGroup(), @@ -113,7 +113,7 @@ int main(int argc, char* argv[]) } else if ( gdcm::ValEntry* v = dynamic_cast(d) ) { - copy->GetHeader()->ReplaceOrCreate( + copy->GetFile()->Insert( v->GetValue(), v->GetGroup(), v->GetElement(), @@ -128,7 +128,7 @@ int main(int argc, char* argv[]) // << std::endl; } - d=original->GetHeader()->GetNextEntry(); + d=original->GetFile()->GetNextEntry(); } //copy->GetImageData(); @@ -136,7 +136,7 @@ int main(int argc, char* argv[]) std::cout << "--- Copy ----------------------" << std::endl; std::cout <GetHeader()->Print(); + copy->GetFile()->Print(); std::cout << "--- ---- ----------------------" << std::endl; copy->WriteDcmExplVR( output );