X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FVTKTestWrite.cxx;h=9f2aa9beed3809b97ac16324c899a4e486bb9cbe;hb=b0547f7c8211140657f26a3679da66c67dc0bdbd;hp=0ec988e6884e9f8180cf179c68306cc12a3e9db0;hpb=da0155a9bc9a9b6f7e9194ed5c7e7f4ff9799e7c;p=gdcm.git

diff --git a/Testing/VTKTestWrite.cxx b/Testing/VTKTestWrite.cxx
index 0ec988e6..9f2aa9be 100644
--- a/Testing/VTKTestWrite.cxx
+++ b/Testing/VTKTestWrite.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestWrite.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/25 15:45:49 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2007/09/18 07:58:38 $
+  Version:   $Revision: 1.12 $
 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmFileHelper.h"
 #include "vtkGdcmReader.h"
 #include "vtkGdcmWriter.h"
 #include "vtkImageViewer.h"
@@ -27,19 +26,22 @@
 #include "vtkImageShiftScale.h"
 
 #include <iostream>
+#include <sstream>
 
 //Generated file:
 #include "gdcmDataImages.h"
 
+#include "gdcmDebug.h"
+
 #ifndef vtkFloatingPointType
 #define vtkFloatingPointType float
 #endif
 
 int VTKWriteTest(vtkTesting *t,vtkImageViewer *viewer,
-                 std::string const & filename, 
-                 std::string const & referenceFileName)
+                 std::string const &filename, 
+                 std::string const &referenceFileName)
 {
-   int retVal = 0;  //by default this is an error
+   int retVal;
 
    t->CleanArguments();
    t->AddArgument("-D");
@@ -53,13 +55,17 @@ int VTKWriteTest(vtkTesting *t,vtkImageViewer *viewer,
    vtkGdcmReader *origin = vtkGdcmReader::New();
    origin->SetFileName( filename.c_str() );
    origin->Update();
-
+  
+   std::cout << "1 ...";
+   
    // Write the image
    vtkGdcmWriter *writer = vtkGdcmWriter::New();
    writer->SetFileName( "TestWrite.dcm" );
    writer->SetInput(origin->GetOutput());
+   std::cout << "2' ...",
    writer->Write();
 
+   std::cout << "2'' ...";
    origin->Delete();
    writer->Delete();
 
@@ -68,6 +74,7 @@ int VTKWriteTest(vtkTesting *t,vtkImageViewer *viewer,
    reader->SetFileName( "TestWrite.dcm" );
    reader->Update();
 
+   std::cout << "3 ...";
    double range[2];
    reader->GetOutput()->GetScalarRange(range);
    int dim[3];
@@ -84,7 +91,7 @@ int VTKWriteTest(vtkTesting *t,vtkImageViewer *viewer,
       viewer->SetSize(dim[0], dim[1]);
       if(dim[2] != 1)
       {
-         //For multifame dicom, take a snapshot of the center slice (+/- 1)
+         //For multiframe dicom, take a snapshot of the center slice (+/- 1)
          viewer->SetZSlice( dim[2] / 2 );
       }
       else
@@ -97,6 +104,7 @@ int VTKWriteTest(vtkTesting *t,vtkImageViewer *viewer,
       viewer->SetInput(NULL);
    }
 
+   std::cout << std::endl;
    //----------------------------------------------------------------------
    // Transform the image to be RGB unsigned char, due to the requests in
    // vtkTesting processing
@@ -163,7 +171,7 @@ int VTKWriteTest(vtkTesting *t,vtkImageViewer *viewer,
    //----------------------------------------------------------------------
 
    // make test
-   ostrstream str;
+   std::ostringstream str;
    retVal = t->RegressionTest(image,0.0,str);
    image->UnRegister(NULL);
 
@@ -171,7 +179,6 @@ int VTKWriteTest(vtkTesting *t,vtkImageViewer *viewer,
    {
       std::cerr << str.str();
    }
-   str.rdbuf()->freeze(1);
 
    if( retVal == vtkTesting::PASSED )
    {
@@ -196,8 +203,10 @@ int VTKTestWrite(int argc, char *argv[])
       }
    }
 
+//   gdcm::Debug::DebugOn();
+
    int ret = 0;
-   vtkTesting* t = vtkTesting::New();
+   vtkTesting *t = vtkTesting::New();
    vtkImageViewer *viewer;
    if( show )
       viewer = vtkImageViewer::New();