X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestReadWriteReadCompare.cxx;h=48a03f8b87c30fc56a6c8e4557b4f5c7ded60113;hb=315440762bb5f22f9f2e39a4b2993ce585e1e320;hp=24a2a763d0d946da0e797528f5984cd000ba3809;hpb=c852120fdb6d542d84f74440b68414fdb52178d7;p=gdcm.git

diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx
index 24a2a763..48a03f8b 100644
--- a/Testing/TestReadWriteReadCompare.cxx
+++ b/Testing/TestReadWriteReadCompare.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestReadWriteReadCompare.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 16:39:18 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2005/02/09 15:06:48 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmHeader.h"
 #include "gdcmFile.h"
+#include "gdcmFileHelper.h"
 
 //Generated file:
 #include "gdcmDataImages.h"
@@ -27,99 +27,100 @@ int CompareInternal(std::string const & filename, std::string const & output)
 
    //////////////// Step 1 (see above description):
 
-   gdcm::Header *header = new gdcm::Header( filename );
-   if( !header->IsReadable() )
+   gdcm::File *file = new gdcm::File( filename );
+   if( !file->IsReadable() )
    {
       std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
                 << filename << std::endl;
-      delete header;
+      delete file;
       return 1;
    }
    std::cout << "           step 1...";
 
    //////////////// Step 2:
-
-   gdcm::File*  file = new gdcm::File( header );
-   int dataSize    = file->GetImageDataSizeRaw();
-   uint8_t* imageData = file->GetImageDataRaw(); //EXTREMELY IMPORTANT
+   gdcm::FileHelper *filehelper = new gdcm::FileHelper( file );
+   int dataSize    = filehelper->GetImageDataSize();
+   uint8_t *imageData = filehelper->GetImageData(); //EXTREMELY IMPORTANT
           // Sure, it is : It's up to the user to decide if he wants to
           // 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);
    
-   file->SetImageData(imageData, dataSize);
-   
-   file->SetWriteModeToRGB();
-   file->WriteDcmExplVR( output );
+   filehelper->SetWriteModeToRGB();
+   filehelper->WriteDcmExplVR( output );
    std::cout << "2...";
  
    //////////////// Step 3:
-
-   gdcm::File* reread = new gdcm::File( output );
-   if( !reread->GetHeader()->IsReadable() )
+   gdcm::FileHelper *reread = new gdcm::FileHelper( output );
+   if( !reread->GetFile()->IsReadable() )
    {
      std::cerr << "Failed" << std::endl
                << "Test::TestReadWriteReadCompare: Could not reread image "
                << "written:" << filename << std::endl;
-     delete header;
      delete file;
+     delete filehelper;
      delete reread;
      return 1;
    }
    std::cout << "3...";
    // For the next step:
-   int    dataSizeWritten = reread->GetImageDataSizeRaw();
-   uint8_t* imageDataWritten = reread->GetImageDataRaw();
+   int    dataSizeWritten = reread->GetImageDataSize();
+   uint8_t *imageDataWritten = reread->GetImageData();
 
    //////////////// Step 4:
+   // Test the image size
+   if (file->GetXSize() != reread->GetFile()->GetXSize() ||
+       file->GetYSize() != reread->GetFile()->GetYSize() ||
+       file->GetZSize() != reread->GetFile()->GetZSize())
+   {
+      std::cout << "Failed" << std::endl
+         << "        X Size differs: "
+         << "X: " << file->GetXSize() << " # " 
+                  << reread->GetFile()->GetXSize() << " | "
+         << "Y: " << file->GetYSize() << " # " 
+                  << reread->GetFile()->GetYSize() << " | "
+         << "Z: " << file->GetZSize() << " # " 
+                  << reread->GetFile()->GetZSize() << std::endl;
+      delete file;
+      delete filehelper;
+      delete reread;
+      return 1;
+   }
 
+   // Test the data size
    if (dataSize != dataSizeWritten)
    {
       std::cout << "Failed" << std::endl
          << "        Pixel areas lengths differ: "
          << dataSize << " # " << dataSizeWritten << std::endl;
-      delete header;
       delete file;
+      delete filehelper;
       delete reread;
       return 1;
    }
 
-   if (int res = memcmp(imageData, imageDataWritten, dataSize) !=0)
+   // Test the data's content
+   if (memcmp(imageData, imageDataWritten, dataSize) !=0)
    {
-      (void)res;
       std::cout << "Failed" << std::endl
          << "        Pixel differ (as expanded in memory)." << std::endl;
-      delete header;
       delete file;
+      delete filehelper;
       delete reread;
       return 1;
    }
    std::cout << "4...OK." << std::endl ;
 
    //////////////// Clean up:
-   delete header;
    delete file;
+   delete filehelper;
    delete reread;
 
    return 0;
 }
 
-int TestReadWriteReadCompare(int argc, char* argv[]) 
+int TestReadWriteReadCompare(int argc, char *argv[]) 
 {
    int result = 0;
    if (argc == 3)
@@ -138,7 +139,7 @@ int TestReadWriteReadCompare(int argc, char* argv[])
       std::cout << "   For all images in gdcmData (and not blacklisted in "
                    "Test/CMakeLists.txt)" << std::endl;
       std::cout << "   apply the following multistep test: " << std::endl;
-      std::cout << "   step 1: parse the image (as gdcmHeader) and call"
+      std::cout << "   step 1: parse the image (as gdcmFile) and call"
                 << " IsReadable(). " << std::endl;
       std::cout << "   step 2: write the corresponding image in DICOM V3 "
                 << "with explicit" << std::endl