X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestReadWriteReadCompare.cxx;h=2fe46dee09ae2c02199e417fac110c0f83f1e645;hb=41a5f9c2c6fd0592a97955244bdca64c25800481;hp=8a821950e4fbbf870fe1283a0f9fb75c39a5f4c9;hpb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;p=gdcm.git

diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx
index 8a821950..2fe46dee 100644
--- a/Testing/TestReadWriteReadCompare.cxx
+++ b/Testing/TestReadWriteReadCompare.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestReadWriteReadCompare.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/02 10:05:26 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2005/10/19 13:15:37 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,20 +17,24 @@
 =========================================================================*/
 #include "gdcmFile.h"
 #include "gdcmFileHelper.h"
+#include "gdcmDebug.h"
 
 //Generated file:
 #include "gdcmDataImages.h"
-
-int CompareInternal(std::string const & filename, std::string const & output)
+ 
+int CompareInternal(std::string const &filename, std::string const &output)
 {
    std::cout << "   Testing: " << filename << std::endl;
 
    //////////////// Step 1 (see above description):
 
-   gdcm::File *file = new gdcm::File( filename );
+   gdcm::File *file = new gdcm::File( );
+   file->SetFileName( filename );
+   file->Load ();
    if( !file->IsReadable() )
    {
-      std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
+      std::cout << "Failed" << std::endl
+                << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
                 << filename << std::endl;
       delete file;
       return 1;
@@ -38,7 +42,6 @@ int CompareInternal(std::string const & filename, std::string const & output)
    std::cout << "           step 1...";
 
    //////////////// Step 2:
-
    gdcm::FileHelper *filehelper = new gdcm::FileHelper( file );
    int dataSize    = filehelper->GetImageDataSize();
    uint8_t *imageData = filehelper->GetImageData(); //EXTREMELY IMPORTANT
@@ -46,41 +49,31 @@ int CompareInternal(std::string const & filename, std::string const & output)
           // GetImageData or if he wants to GetImageDataRaw
           // (even if we do it by setting a flag, he will have to decide) 
 
-   /// \todo Following line commented out because gdcmFile::SetImageData() is
-   /// brain dead: it sets ImageDataSize to its argument and PixelRead to a.
-   /// Later on, when writing gdcmFile::WriteBase() 
-   /// and because PixelRead == 1 we call
-   ///    PixelElement->SetLength( ImageDataSizeRaw );
-   /// where we use ImageDataSizeRAW instead of ImageDataSize !
-   /// But when the original image made the transformation LUT -> RGB, 
-   /// ImageDataSizeRaw is the third of ImageDataSize, and there is no
-   /// reason (since we called gdcmFile::SetImageData) to use the Raw image
-   /// size... This "bug" in gdcmFile made that we had to black list
-   /// images 8BitsUncompressedColor.dcm, OT-PAL-8-face.dcm and 
-   /// US-PAL-8-10x-echo.dcm...
-   /// In conclusion fix gdcmFile, and then uncomment the following line.
-   
-   // --> I did. ctest doesn't break. But ... is it enought to say it's OK ?
-   
-   filehelper->SetImageData(imageData, dataSize);
+   //filehelper->SetImageData(imageData, dataSize);
    
    filehelper->SetWriteModeToRGB();
    filehelper->WriteDcmExplVR( output );
    std::cout << "2...";
  
    //////////////// Step 3:
+   gdcm::File *fileout = new gdcm::File();
+   fileout->SetFileName( output );
+   fileout->Load();
+  // gdcm::FileHelper *reread = new gdcm::FileHelper( output ); // deprecated
 
-   gdcm::FileHelper *reread = new gdcm::FileHelper( output );
-   if( !reread->GetFile()->IsReadable() )
+   if( !fileout->IsReadable() )
    {
-     std::cerr << "Failed" << std::endl
-               << "Test::TestReadWriteReadCompare: Could not reread image "
-               << "written:" << filename << std::endl;
-     delete file;
-     delete filehelper;
-     delete reread;
-     return 1;
+      std::cout << "Failed" << std::endl
+                << "Test::TestReadWriteReadCompare: Could not parse the newly "
+                << "written image:" << filename << std::endl;
+      delete file;
+      delete filehelper;
+      delete fileout;
+      return 1;
    }
+
+   gdcm::FileHelper *reread = new gdcm::FileHelper( fileout );
+
    std::cout << "3...";
    // For the next step:
    int    dataSizeWritten = reread->GetImageDataSize();
@@ -102,6 +95,7 @@ int CompareInternal(std::string const & filename, std::string const & output)
                   << reread->GetFile()->GetZSize() << std::endl;
       delete file;
       delete filehelper;
+      delete fileout;
       delete reread;
       return 1;
    }
@@ -114,6 +108,7 @@ int CompareInternal(std::string const & filename, std::string const & output)
          << dataSize << " # " << dataSizeWritten << std::endl;
       delete file;
       delete filehelper;
+      delete fileout;
       delete reread;
       return 1;
    }
@@ -125,6 +120,7 @@ int CompareInternal(std::string const & filename, std::string const & output)
          << "        Pixel differ (as expanded in memory)." << std::endl;
       delete file;
       delete filehelper;
+      delete fileout;
       delete reread;
       return 1;
    }
@@ -133,6 +129,7 @@ int CompareInternal(std::string const & filename, std::string const & output)
    //////////////// Clean up:
    delete file;
    delete filehelper;
+   delete fileout;
    delete reread;
 
    return 0;
@@ -141,15 +138,19 @@ int CompareInternal(std::string const & filename, std::string const & output)
 int TestReadWriteReadCompare(int argc, char *argv[]) 
 {
    int result = 0;
-   if (argc == 3)
+
+   if (argc == 4)
+      gdcm::Debug::DebugOn();
+
+   if (argc >= 3)
    {
-      const std::string input = argv[1];
+      const std::string input  = argv[1];
       const std::string output = argv[2];
       result += CompareInternal(input, output);
    }
-   else if( argc > 3 || argc == 2 )
+   else if( argc > 4 || argc == 2 )
    {
-      std::cerr << "Please read the manual" << std::endl;
+      std::cout << "Please read the manual" << std::endl;
    }
    else
    {