X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestReadWriteReadCompare.cxx;h=7f62c0b7019c9cfccc6a98998d0596b77baa74de;hb=c556c62e38ad8f5b0423a91d919c13ac85a23f32;hp=ed14c08a0d9c53575e80e8033ab2b1b4744bb348;hpb=220ad8c527f2b2edf1ba19af8897aca8f4a49cf7;p=gdcm.git

diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx
index ed14c08a..7f62c0b7 100644
--- a/Testing/TestReadWriteReadCompare.cxx
+++ b/Testing/TestReadWriteReadCompare.cxx
@@ -1,130 +1,183 @@
-#include "gdcmHeader.h"
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: TestReadWriteReadCompare.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/10/25 14:52:31 $
+  Version:   $Revision: 1.27 $
+                                                                                
+  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 "gdcmFile.h"
+#include "gdcmFileHelper.h"
+#include "gdcmDebug.h"
 
 //Generated file:
 #include "gdcmDataImages.h"
-
-int TestReadWriteReadCompare(int argc, char* argv[]) 
+ 
+int CompareInternal(std::string const &filename, std::string const &output)
 {
-   if (argc)
+   std::cout << "   Testing: " << filename << std::endl;
+
+   //////////////// Step 1 (see above description):
+
+   gdcm::File *file = gdcm::File::New( );
+   file->SetFileName( filename );
+   file->Load ();
+   if( !file->IsReadable() )
    {
-      std::cerr << "Test::TestReadWriteReadCompare: Usage: " << argv[0]
-                << " (no arguments needed)." << std::endl;
+      std::cout << "Failed" << std::endl
+                << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
+                << filename << std::endl;
+      file->Delete();
+      return 1;
    }
+   std::cout << "           step 1...";
+
+   //////////////// Step 2:
+   gdcm::FileHelper *filehelper = gdcm::FileHelper::New( 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) 
+
+   //filehelper->SetImageData(imageData, dataSize);
    
-   std::cout<< "Test::TestReadWriteReadCompare: description " << std::endl;
-   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"
-             << " IsReadable(). " << std::endl;
-   std::cout << "   step 2: write the corresponding image in DICOM V3 "
-             << "with explicit" << std::endl
-             << "           Value Representation in temporary file "
-             << "TestReadWriteReadCompare.dcm." << std::endl;
-   std::cout << "   step 3: read the image written on step2 and call "
-             << " IsReadable(). " << std::endl;
-   std::cout << "   step 4: compare (in memory with memcmp) that the two "
-             << "images " << std::endl
-             << "           match (as expanded by gdcm)." << std::endl;
-
-   int i = 0;
-   while( gdcmDataImages[i] != 0 )
+   filehelper->SetWriteModeToRGB();
+   filehelper->WriteDcmExplVR( output );
+   std::cout << "2...";
+ 
+   //////////////// Step 3:
+   gdcm::File *fileout = gdcm::File::New();
+   fileout->SetFileName( output );
+   fileout->Load();
+  // gdcm::FileHelper *reread = new gdcm::FileHelper( output ); // deprecated
+
+   if( !fileout->IsReadable() )
    {
-      std::string filename = GDCM_DATA_ROOT;
-      filename += "/";
-      filename += gdcmDataImages[i++];
-   
-      std::cout << "   Testing: " << filename << std::endl;
+      std::cout << "Failed" << std::endl
+                << "Test::TestReadWriteReadCompare: Could not parse the newly "
+                << "written image:" << filename << std::endl;
+      file->Delete();
+      filehelper->Delete();
+      fileout->Delete();
+      return 1;
+   }
 
-      //////////////// Step 1 (see above description):
+   gdcm::FileHelper *reread = gdcm::FileHelper::New( fileout );
 
-      gdcmHeader *header = new gdcmHeader( filename, false );
-      if( !header->IsReadable() )
-      {
-         std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
-                   << filename << std::endl;
-         delete header;
-         return 1;
-      }
-      std::cout << "           step 1 ...";
-
-      //////////////// Step 2:
-
-      gdcmFile*  file = new gdcmFile( header );
-      int dataSize    = file->GetImageDataSize();
-      void* imageData = file->GetImageData(); //EXTREMELY IMPORTANT
-
-      /// \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.
-      /// file->SetImageData(imageData, dataSize);
-      file->WriteDcmExplVR( "TestReadWriteReadCompare.dcm" );
-      std::cout << "2...";
-    
-      //////////////// Step 3:
-
-      gdcmFile* reread = new gdcmFile( "TestReadWriteReadCompare.dcm", false );
-      if( !reread->GetHeader()->IsReadable() )
-      {
-        std::cerr << "Test::TestReadWriteReadCompare: Could not reread image "
-                  << "written:" << filename << std::endl;
-        delete header;
-        delete file;
-        delete reread;
-        return 1;
-      }
-      std::cout << "3...";
-      // For the next step:
-      int    dataSizeWritten = reread->GetImageDataSize();
-      void* imageDataWritten = reread->GetImageData();
+   std::cout << "3...";
+   // For the next step:
+   int    dataSizeWritten = reread->GetImageDataSize();
+   uint8_t *imageDataWritten = reread->GetImageData();
 
-      //////////////// Step 4:
- 
-      if (dataSize != dataSizeWritten)
-      {
-         std::cout << std::endl
-            << "        Pixel areas lengths differ: "
-            << dataSize << " # " << dataSizeWritten << std::endl;
-         delete (char*)imageData;
-         delete (char*)imageDataWritten;
-         delete header;
-         delete file;
-         delete reread;
-         return 1;
-      }
+   //////////////// 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;
+      file->Delete();
+      filehelper->Delete();
+      fileout->Delete();
+      reread->Delete();
+      return 1;
+   }
 
-      if (int res = memcmp(imageData, imageDataWritten, dataSize) !=0)
+   // Test the data size
+   if (dataSize != dataSizeWritten)
+   {
+      std::cout << "Failed" << std::endl
+         << "        Pixel areas lengths differ: "
+         << dataSize << " # " << dataSizeWritten << std::endl;
+      file->Delete();
+      filehelper->Delete();
+      fileout->Delete();
+      reread->Delete();
+      return 1;
+   }
+
+   // Test the data's content
+   if (memcmp(imageData, imageDataWritten, dataSize) !=0)
+   {
+      std::cout << "Failed" << std::endl
+         << "        Pixel differ (as expanded in memory)." << std::endl;
+      file->Delete();
+      filehelper->Delete();
+      fileout->Delete();
+      reread->Delete();
+      return 1;
+   }
+   std::cout << "4...OK." << std::endl ;
+
+   //////////////// Clean up:
+   file->Delete();
+   filehelper->Delete();
+   fileout->Delete();
+   reread->Delete();
+
+   return 0;
+}
+
+int TestReadWriteReadCompare(int argc, char *argv[]) 
+{
+   int result = 0;
+
+   if (argc == 4)
+      gdcm::Debug::DebugOn();
+
+   if (argc >= 3)
+   {
+      const std::string input  = argv[1];
+      const std::string output = argv[2];
+      result += CompareInternal(input, output);
+   }
+   else if( argc > 4 || argc == 2 )
+   {
+      std::cout << "Please read the manual" << std::endl;
+   }
+   else
+   {
+      std::cout<< "Test::TestReadWriteReadCompare: description " << std::endl;
+      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 gdcmFile) and call"
+                << " IsReadable(). " << std::endl;
+      std::cout << "   step 2: write the corresponding image in DICOM V3 "
+                << "with explicit" << std::endl
+                << "           Value Representation in temporary file "
+                << "TestReadWriteReadCompare.dcm." << std::endl;
+      std::cout << "   step 3: read the image written on step2 and call "
+                << " IsReadable(). " << std::endl;
+      std::cout << "   step 4: compare (in memory with memcmp) that the two "
+                << "images " << std::endl
+                << "           match (as expanded by gdcm)." << std::endl;
+   
+      int i = 0;
+      while( gdcmDataImages[i] != 0 )
       {
-         (void)res;
-         std::cout << std::endl
-            << "        Pixel differ (as expanded in memory)." << std::endl;
-         delete (char*)imageData;
-         delete (char*)imageDataWritten;
-         delete header;
-         delete file;
-         delete reread;
-         return 1;
+         std::string filename = GDCM_DATA_ROOT;
+         filename += "/";
+         filename += gdcmDataImages[i++];
+         result += CompareInternal(filename, "TestReadWriteReadCompare.dcm"); 
       }
-      std::cout << "4...OK." << std::endl ;
-
-      //////////////// Clean up:
-      delete (char*)imageData;
-      delete (char*)imageDataWritten;
-      delete header;
-      delete file;
-      delete reread;
    }
-
-  return 0;
+   return result;
 }