X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FFindTags.cxx;h=59b0048138621e8ee2914bc9873ffd6364d18bf7;hb=c192f5eb557ecea1d654ac753998a16c36551e81;hp=1b3ece26e93fd0aeacac808396d930fa8f22b992;hpb=05f4ffeadc3beb5ff48fd88e7342d9287c18a27b;p=gdcm.git

diff --git a/Example/FindTags.cxx b/Example/FindTags.cxx
index 1b3ece26..59b00481 100644
--- a/Example/FindTags.cxx
+++ b/Example/FindTags.cxx
@@ -1,41 +1,60 @@
-#include <iostream>
-#include "gdcm.h"
-#include "math.h"
-#include <stdio.h>
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: FindTags.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/21 11:40:52 $
+  Version:   $Revision: 1.10 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+#include "gdcmFileHelper.h"
+#include "gdcmFile.h"
+#include "gdcmUtil.h"
 
-int main(int argc, char* argv[]) {  
+#include <iostream>
+#include <stdio.h> // for sscanf
 
+int main(int argc, char* argv[])
+{
    std::string toto, titi;
 
-   gdcm::File  * f1;
+   gdcm::FileHelper *f1;
 
    if(argc > 1 )
-      f1 = new gdcm::File(argv[1]);
+      f1 = new gdcm::FileHelper(argv[1]);
    else  {
       toto = GDCM_DATA_ROOT;
       toto += "/test.acr";
-      f1 = new gdcm::File(toto);
+      f1 = new gdcm::FileHelper(toto);
    }
 
    std::string ManufacturerName="SIEMENS ";
    std::string RecCode="ACR-NEMA 2.0";
    std::string ImagePositionPatient, Location, ImageLocation;
-   char zozo[100], zizi[50];
+   std::string zozo;
    char c;
 
    float x, y, z, l;
 
    int dataSize = f1->GetImageDataSize();
-   printf ("---> pourFindTaggs : dataSize %d\n",dataSize);
+   std::cout << "---> pourFindTaggs : dataSize " << dataSize << std::endl;
 
-   f1->SetEntryByNumber(RecCode ,0x0008,0x0010);
-   f1->SetEntryByNumber(ManufacturerName ,0x0008,0x0070);
+   f1->SetEntry(RecCode ,0x0008,0x0010);
+   f1->SetEntry(ManufacturerName ,0x0008,0x0070);
 
 // ImagePositionPatient
-   ImagePositionPatient = f1->GetHeader()->GetEntryByNumber(0x0020,0x0032);
+   ImagePositionPatient = f1->GetFile()->GetEntry(0x0020,0x0032);
 
 // Image Position (RET)
-   f1->SetEntryByNumber(ImagePositionPatient, 0x0020,0x0030);
+   f1->SetEntry(ImagePositionPatient, 0x0020,0x0030);
 
    sscanf(ImagePositionPatient.c_str(), "%f%c%f%c%f", &x,&c,&y,&c,&z);
 
@@ -49,44 +68,44 @@ int main(int argc, char* argv[]) {
 // existerait-il qq chose qui marche à tout coup?
 
 // Location
-   sprintf(zizi,"%f\n",l);
-   Location = zizi;
-   f1->SetEntryByNumber(Location, 0x0020,0x0050);
+   std::string zizi = gdcm::Util::Format("%f",l);
+   Location = gdcm::Util::DicomString(zizi.c_str());
+   f1->SetEntry(Location, 0x0020,0x0050);
 
 // sinon, la longueur du champ est erronée (?!?) 
 // Probable sac de noeud entre strlen(xxx.c_str()) et xxx.length()
 // a eclaircir !
 
-// SetEntryLengthByNumber is private now.
+// SetEntryLength is private now.
 //TO DO : see is the pb goes on...
 
-//f1->GetHeader()->SetEntryLengthByNumber(strlen(Location.c_str())-1, 0x0020,0x0050);
+//f1->GetFile()->SetEntryLength(strlen(Location.c_str())-1, 0x0020,0x0050);
 
 // Image Location 
 
-   sprintf(zizi,"%d\n",0x7FE0);
-   ImageLocation = zizi;
-//f1->SetEntryByNumber(Location, 0x0028,0x0200);
-//f1->GetHeader()->SetEntryLengthByNumber(strlen(ImageLocation.c_str())-1, 0x0020,0x0050); // prudence !
+   zizi = gdcm::Util::Format("%d",0x7FE0);
+   ImageLocation = gdcm::Util::DicomString(zizi.c_str());
+//f1->SetEntry(Location, 0x0028,0x0200);
+//f1->GetFile()->SetEntryLength(strlen(ImageLocation.c_str())-1, 0x0020,0x0050); // prudence !
 
 // void* imageData= f1->GetImageData();
 
-// ecriture d'un fichier ACR à partir d'un dcmHeader correct.
+// ecriture d'un fichier ACR à partir d'un dcmFile correct.
 
-   printf ("----------------avant PrintEntry---------------------\n");
-   f1->GetHeader()->Print();
-   printf ("----------------avant WriteDcm---------------------\n");
+   std::cout << "----------------avant PrintEntry---------------------" << std::endl;
+   f1->GetFile()->Print();
+   std::cout << "----------------avant WriteDcm---------------------" << std::endl;
 
 
-// ecriture d'un fichier ACR à partir d'un dcmHeader correct.
+// ecriture d'un fichier ACR à partir d'un dcmFile correct.
 
-   sprintf(zozo, "%s.acr", toto.c_str());
-   printf ("WriteACR\n");
+   zozo = toto + ".acr";
+   std::cout << "WriteACR" << std::endl;
    f1->WriteAcr(zozo);
 
-   printf ("----------------apres Write---------------------\n");
+   std::cout << "----------------apres Write---------------------" << std::endl;
 
-  return 0;
+   return 0;
 }