make output more readable

[gdcm.git] / Testing / TestCopyDicom.cxx

diff --git a/Testing/TestCopyDicom.cxx b/Testing/TestCopyDicom.cxx
index 8c3ad7491b056a390eadeabee24ef9b5eec5e11e..66a4fbfd62ba500add92a2ff63ed5028626e3c24 100644 (file)
--- a/Testing/TestCopyDicom.cxx
+++ b/Testing/TestCopyDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestCopyDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/26 16:43:10 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2005/10/21 08:35:49 $
+  Version:   $Revision: 1.43 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,47 +17,17 @@
 =========================================================================*/
 #include "gdcmFile.h"
 #include "gdcmFileHelper.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmDataEntry.h"
 
 //Generated file:
 #include "gdcmDataImages.h"
 
-#ifndef _WIN32
-#include <unistd.h> //for access, unlink
-#else
-#include <io.h> //for _access on Win32
-#endif
-
 // return true if the file exists
-bool FileExists(const char* filename)
-{
-#ifdef _MSC_VER
-# define access _access
-#endif
-#ifndef R_OK
-# define R_OK 04
-#endif
-  if ( access(filename, R_OK) != 0 )
-    {
-    return false;
-    }
-  else
-    {
-    return true;
-    }
-}
-
-bool RemoveFile(const char* source)
-{
-#ifdef _MSC_VER
-#define _unlink unlink
-#endif
-  return unlink(source) != 0 ? false : true;
-}
+bool FileExists(const char *filename);
+bool RemoveFile(const char *source);
 
-int CopyDicom(std::string const & filename, 
-              std::string const & output )
+int CopyDicom(std::string const &filename, 
+              std::string const &output )
 {
       std::cout << "   Testing: " << filename << std::endl;
       if( FileExists( output.c_str() ) )
@@ -71,27 +41,24 @@ int CopyDicom(std::string const & filename,
 
       //////////////// Step 1:
       std::cout << "      1...";
-      gdcm::File *originalH = new gdcm::File( filename );
+      
+      gdcm::File *originalH = new gdcm::File( );
       gdcm::File *copyH     = new gdcm::File( );
 
+      originalH->SetFileName( filename );
+      originalH->Load( );
       //First of all copy the file, field by field
 
       //////////////// Step 2:
       std::cout << "2...";
-      gdcm::DocEntry* d=originalH->GetFirstEntry();
+      gdcm::DocEntry *d=originalH->GetFirstEntry();
       while(d)
       {
-         if ( gdcm::BinEntry* b = dynamic_cast<gdcm::BinEntry*>(d) )
-         {
-            copyH->InsertBinEntry( b->GetBinArea(),b->GetLength(),
-                                   b->GetGroup(),b->GetElement(),
-                                   b->GetVR() );
-         }
-         else if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
-         {   
-             copyH->InsertValEntry( v->GetValue(),
-                                    v->GetGroup(),v->GetElement(),
-                                    v->GetVR() ); 
+         if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
+         {              
+            copyH->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
+                                       de->GetGroup(),de->GetElement(),
+                                       de->GetVR() );
          }
          else
          {
@@ -105,10 +72,13 @@ int CopyDicom(std::string const & filename,
       gdcm::FileHelper *copy     = new gdcm::FileHelper( copyH );
 
       size_t dataSize = original->GetImageDataSize();
-      uint8_t* imageData = original->GetImageData();
+      uint8_t *imageData = original->GetImageData();
 
       // Useless to set the image data, because it's already made when
-      // copying the corresponding BinEntry that contains the pixel data
+      // copying the corresponding DataEntry that contains the pixel data
+      
+      // --> FIXME : Why do we let the following line?
+      //             to avoid compile time warnings?
       copy->SetImageData(imageData, dataSize);
 
       //////////////// Step 3:
@@ -149,7 +119,7 @@ int CopyDicom(std::string const & filename,
       //////////////// Step 5:
       std::cout << "5...";
       size_t    dataSizeWritten = copy->GetImageDataSize();
-      uint8_t* imageDataWritten = copy->GetImageData();
+      uint8_t *imageDataWritten = copy->GetImageData();
 
       if (dataSize != dataSizeWritten)
       {
@@ -188,7 +158,7 @@ int CopyDicom(std::string const & filename,
 // Here we load a gdcmFile and then try to create from scratch a copy of it,
 // copying field by field the dicom image
 
-int TestCopyDicom(int argc, char* argv[])
+int TestCopyDicom(int argc, char *argv[])
 {
    if ( argc == 3 )
    {