X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=f449c69636ffd888d40bc3fcd669b14a4e32150f;hb=47ec0a23da1e28ca33d2476ff63ab6bd7893bce4;hp=4d6a65fe6d628d588da57cfae29fc1d2d75a7e89;hpb=d00078b5e19310b379c8339fa8fe38362e8ca392;p=gdcm.git diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 4d6a65fe..f449c696 100644 --- a/Example/PrintFile.cxx +++ b/Example/PrintFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PrintFile.cxx,v $ Language: C++ - Date: $Date: 2005/01/20 16:16:58 $ - Version: $Revision: 1.23 $ + Date: $Date: 2005/02/02 10:06:31 $ + Version: $Revision: 1.29 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -15,15 +15,15 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#include "gdcmHeader.h" +#include "gdcmFile.h" #include "gdcmDebug.h" #include "gdcmFileHelper.h" #include -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { - gdcm::Header *e1; + gdcm::File *e1; gdcm::FileHelper *f1; std::string fileName; if (argc != 2) @@ -42,19 +42,20 @@ int main(int argc, char* argv[]) fileName += "/test.acr"; } + if (argc > 3) - gdcm::Debug::SetDebugOn(); + gdcm::Debug::DebugOn(); - e1= new gdcm::Header( fileName.c_str() ); + e1 = new gdcm::File( fileName.c_str() ); f1 = new gdcm::FileHelper(e1); if (argc > 2) { int level = atoi(argv[2]); - e1->SetPrintLevel(level); + f1->SetPrintLevel(level); } - e1->Print(); + f1->Print(); std::cout << "\n\n" << std::endl; @@ -78,7 +79,7 @@ int main(int argc, char* argv[]) << "] PlanarConfiguration= [" << planarConfig << "] "<< std::endl << " PhotometricInterpretation= [" - << e1->GetEntry(0x0028,0x0004) + << e1->GetEntryValue(0x0028,0x0004) << "] "<< std::endl; int numberOfScalarComponents=e1->GetNumberOfScalarComponents(); @@ -87,7 +88,7 @@ int main(int argc, char* argv[]) << std::endl; - if ( e1->GetEntry(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) + if ( e1->GetEntryValue(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) { std::cout << "Transfer Syntax not loaded. " << std::endl << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"