X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FexReadWriteFile.cxx;h=7599959c0b7a2d03a79dd05cb881ffd5b2941446;hb=329b5524e57929ecf64495be9fe757b69ba64613;hp=8bfd830890175549d5a61d22461371f89b479e6c;hpb=0a655fde787d29a2d739e675edf89d5de9840b9c;p=gdcm.git

diff --git a/Example/exReadWriteFile.cxx b/Example/exReadWriteFile.cxx
index 8bfd8308..7599959c 100644
--- a/Example/exReadWriteFile.cxx
+++ b/Example/exReadWriteFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exReadWriteFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/10 20:41:19 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/10/25 14:52:28 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,10 +19,10 @@
 #include "gdcmFile.h"
 #include "gdcmFileHelper.h"
 #include "gdcmDocument.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmDataEntry.h"
 #include "gdcmSeqEntry.h"
 
+#include <stdlib.h> // for exit
  
 int main(int argc, char *argv[])
 {
@@ -57,9 +57,11 @@ std::cout << " --- WARNING --- WARNING --- WARNING --- WARNING ---" <<std::endl;
    std::string output   = argv[2];
 
    // First, let's create a gdcm::File
-   // that will contain all the Dicom Field but the Pixels Element
+   // that will contain all the Dicom fields but the Pixels Element
 
-   gdcm::File *f1= new gdcm::File( filename );
+   gdcm::File *f1= gdcm::File::New( );
+   f1->SetFileName( filename );
+   f1->Load();
 
 
    // Ask content to be printed
@@ -77,9 +79,9 @@ std::cout << " --- WARNING --- WARNING --- WARNING --- WARNING ---" <<std::endl;
              << "--- Display only human readable values -----------------------"
              << std::endl;
 
-   gdcm::ValEntry *valEntry;
+   gdcm::DataEntry *dataEntry;
    std::string value;
-   std::string vr;   // value representation
+   gdcm::VRKey vr;   // value representation
    std::string vm;   // value multiplicity
    std::string name; // held in the Dicom Dictionary
 
@@ -90,34 +92,31 @@ std::cout << " --- WARNING --- WARNING --- WARNING --- WARNING ---" <<std::endl;
       // We skip SeqEntries, since user cannot do much with them
       if ( !(dynamic_cast<gdcm::SeqEntry*>(d))
       // We skip Shadow Groups, since nobody knows what they mean
-           && !( d->GetGroup()%2 )
-     // we skip BinEntries, since their content is not human-readable
-           && !dynamic_cast<gdcm::BinEntry*>(d) )
+           && !( d->GetGroup()%2 ) )
      {      
          // If user just 'wants to see'
          //d->Print();
          //std::cout << std::endl;
 
          // If user wants to get info about the entry
-         // (he is sure, here that DocEntry is a ValEntry)
-         valEntry = dynamic_cast<gdcm::ValEntry*>(d);
+         // (he is sure, here that DocEntry is a DataEntry)
+         dataEntry = dynamic_cast<gdcm::DataEntry *>(d);
          // Let's be carefull -maybe he commented out some previous line-
-         if (!valEntry)
+         if (!dataEntry)
             continue;
 
-         value  = valEntry->GetValue();
-         vr     = valEntry->GetVR();
+         value  = dataEntry->GetString();
+         vr     = dataEntry->GetVR();
          // user wants really to know everything about entry!
-         vm     = valEntry->GetVM();
-         name   = valEntry->GetName();
+         vm     = dataEntry->GetVM();
+         name   = dataEntry->GetName();
 
          std::cout //<< std::hex << group << "," << elem 
-          << valEntry->GetKey()
-               << "     VR :[" << vr    << "] VM : [" << vm 
+             << dataEntry->GetKey()
+             << "     VR :[" << vr    << "] VM : [" << vm 
              << "] name : [" << name  << "]"
              << " value : [" << value << "]" 
- 
-              << std::endl;
+             << std::endl;
       }
       d = f1->GetNextEntry();
    }
@@ -194,29 +193,32 @@ std::cout << " --- WARNING --- WARNING --- WARNING --- WARNING ---" <<std::endl;
              << std::endl;
    // ------ User is aware, and wants to get fields with no accesor --------
 
-   std::cout << "Manufacturer :["     << f1->GetEntryValue(0x0008,0x0070)
+   std::cout << "Manufacturer :["     << f1->GetEntryString(0x0008,0x0070)
              << "]" << std::endl; 
-   std::cout << "Institution :["      << f1->GetEntryValue(0x0008,0x0080)
+   std::cout << "Institution :["      << f1->GetEntryString(0x0008,0x0080)
              << "]" << std::endl;
-   std::cout << "Patient's name :["   << f1->GetEntryValue(0x0010,0x0010)
+   std::cout << "Patient's name :["   << f1->GetEntryString(0x0010,0x0010)
              << "]" << std::endl;
-   std::cout << "Physician's name :[" << f1->GetEntryValue(0x0008,0x0090)
+   std::cout << "Physician's name :[" << f1->GetEntryString(0x0008,0x0090)
              << "]" << std::endl; 
-   std::cout << "Study Date :["       << f1->GetEntryValue(0x0008,0x0020)
+   std::cout << "Study Date :["       << f1->GetEntryString(0x0008,0x0020)
              << "]" << std::endl; 
-   std::cout << "Study inst UID :["   << f1->GetEntryValue(0x0020,0x000d)
+   std::cout << "Study inst UID :["   << f1->GetEntryString(0x0020,0x000d)
              << "]" << std::endl;
-   std::cout << "Serie inst UID :["   << f1->GetEntryValue(0x0020,0x000e)
+   std::cout << "Serie inst UID :["   << f1->GetEntryString(0x0020,0x000e)
              << "]" << std::endl;
-   std::cout << "Frame ref UID :["   << f1->GetEntryValue(0x0020,0x0052)
+   std::cout << "Frame ref UID :["   << f1->GetEntryString(0x0020,0x0052)
              << "]" << std::endl;
+ 
+   // User wants to get info about the 'real world' vs image
+
 
    // ------ User wants to load the pixels---------------------------------
    
    // Hope now he knows enought about the image ;-)
 
    // First, create a gdcm::FileHelper
-   gdcm::FileHelper *fh1 = new gdcm::FileHelper(f1);
+   gdcm::FileHelper *fh1 = gdcm::FileHelper::New(f1);
 
    // Load the pixels, transforms LUT (if any) into RGB Pixels 
    uint8_t *imageData = fh1->GetImageData();
@@ -251,7 +253,9 @@ std::cout << " --- WARNING --- WARNING --- WARNING --- WARNING ---" <<std::endl;
  
    // ------ User wants write a new image without shadow groups -------------
 
-   gdcm::FileHelper *copy = new gdcm::FileHelper( output );
+   gdcm::FileHelper *copy = gdcm::FileHelper::New( );
+   copy->SetFileName( output );
+   copy->Load();
  
    d = f1->GetFirstEntry();
    while(d)
@@ -262,17 +266,11 @@ std::cout << " --- WARNING --- WARNING --- WARNING --- WARNING ---" <<std::endl;
            && !( d->GetGroup()%2 ) )
       { 
 
-         if ( gdcm::BinEntry *b = dynamic_cast<gdcm::BinEntry*>(d) )
+         if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
          {              
-            copy->GetFile()->InsertBinEntry( b->GetBinArea(),b->GetLength(),
-                                             b->GetGroup(),b->GetElement(),
-                                             b->GetVR() );
-         }
-         else if ( gdcm::ValEntry *v = dynamic_cast<gdcm::ValEntry*>(d) )
-         {   
-             copy->GetFile()->InsertValEntry( v->GetValue(),
-                                              v->GetGroup(),v->GetElement(),
-                                              v->GetVR() ); 
+            copy->GetFile()->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
+                                                 de->GetGroup(),de->GetElement(),
+                                                 de->GetVR() );
          }
          else
          {
@@ -325,9 +323,9 @@ std::cout << " --- WARNING --- WARNING --- WARNING --- WARNING ---" <<std::endl;
    std::cout << std::endl
              << "------------------------------------------------------------"
              << std::endl;
-   delete f1;
-   delete fh1;
-   delete copy;
+   f1->Delete();
+   fh1->Delete();
+   copy->Delete();
 
    exit (0);
 }