X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FexCTPET.cxx;h=bcb52c8e2ce894d41de577cc65c1ef4a88ab3cf0;hb=4f0dd702736cecd2fa0b27bedf2118231468f226;hp=38ad5bbcacceb3ce7f0b73d7799eca3b2a813d73;hpb=8621b46b5906cadfff92878d54ef677e509aa1a3;p=gdcm.git

diff --git a/Example/exCTPET.cxx b/Example/exCTPET.cxx
index 38ad5bbc..bcb52c8e 100644
--- a/Example/exCTPET.cxx
+++ b/Example/exCTPET.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exCTPET.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/02 22:02:50 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2007/05/23 14:18:05 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -49,28 +49,28 @@ int main(int argc, char *argv[])
   // No -> Return
   // Yes: We found a match
 
-  gdcm::File *fileRef = gdcm::File::New();
+  GDCM_NAME_SPACE::File *fileRef = GDCM_NAME_SPACE::File::New();
   fileRef->SetFileName( reference );
-  fileRef->SetLoadMode(gdcm::LD_NOSHADOW | gdcm::LD_NOSEQ);
+  fileRef->SetLoadMode(GDCM_NAME_SPACE::LD_NOSHADOW | GDCM_NAME_SPACE::LD_NOSEQ);
   fileRef->Load();
   // 0008 0060 CS 1 Modality
   std::string modalityRef = fileRef->GetEntryString(0x0008,0x0060);
-  if( modalityRef == gdcm::GDCM_UNFOUND ) return 1;
-  if ( !gdcm::Util::DicomStringEqual(modalityRef, "CT") ) return 1;
+  if( modalityRef == GDCM_NAME_SPACE::GDCM_UNFOUND ) return 1;
+  if ( !GDCM_NAME_SPACE::Util::DicomStringEqual(modalityRef, "CT") ) return 1;
   // 0020 000d UI 1 Study Instance UID
   // 0020 000e UI REL Series Instance UID
   std::string series_uid_ref = fileRef->GetEntryString(0x0020, 0x000e);
   // 0020 0052 UI 1 Frame of Reference UID
   std::string frame_uid_ref = fileRef->GetEntryString(0x0020, 0x0052);
   // 0020 0032 DS 3 Image Position (Patient)
-  gdcm::DataEntry *imagePosRef = fileRef->GetDataEntry(0x0020,0x0032);
+  GDCM_NAME_SPACE::DataEntry *imagePosRef = fileRef->GetDataEntry(0x0020,0x0032);
   assert( imagePosRef->GetValueCount() == 3 );
 
-  gdcm::DirList dirList( directory, true );
-  const gdcm::DirListType filenames = dirList.GetFilenames();
-  gdcm::DirListType::const_iterator it = filenames.begin();
-  gdcm::File *file = gdcm::File::New();
-  file->SetLoadMode(gdcm::LD_NOSHADOW | gdcm::LD_NOSEQ);
+  GDCM_NAME_SPACE::DirList dirList( directory, true );
+  const GDCM_NAME_SPACE::DirListType filenames = dirList.GetFilenames();
+  GDCM_NAME_SPACE::DirListType::const_iterator it = filenames.begin();
+  GDCM_NAME_SPACE::File *file = GDCM_NAME_SPACE::File::New();
+  file->SetLoadMode(GDCM_NAME_SPACE::LD_NOSHADOW | GDCM_NAME_SPACE::LD_NOSEQ);
   for( ; it != filenames.end(); ++it)
     {
     file->SetFileName( *it );
@@ -78,13 +78,13 @@ int main(int argc, char *argv[])
     std::string modality   = file->GetEntryString(0x0008,0x0060);
     // This is a dual modality: modality should be *different*
     if( modality == modalityRef ) continue;
-    if ( !gdcm::Util::DicomStringEqual(modality, "PT") ) continue;
+    if ( !GDCM_NAME_SPACE::Util::DicomStringEqual(modality, "PT") ) continue;
     std::string series_uid = file->GetEntryString(0x0020, 0x000e);
     // Not same series !
     if( series_uid == series_uid_ref ) continue;
     std::string frame_uid = file->GetEntryString(0x0020, 0x0052);
     if( frame_uid_ref != frame_uid ) continue;
-    gdcm::DataEntry *imagePos = file->GetDataEntry(0x0020,0x0032);
+    GDCM_NAME_SPACE::DataEntry *imagePos = file->GetDataEntry(0x0020,0x0032);
     assert( imagePos->GetValueCount() == 3 );
     if( imagePos->GetValue(0) == imagePosRef->GetValue(0)
      && imagePos->GetValue(1) == imagePosRef->GetValue(1)