X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FtestvtkGdcmReader.cxx;h=aaf04218596e3ffac2af1f8be56c30bece2c25b3;hb=f0e955e1637308ba325d50bc7d4199429fa8c28f;hp=47a9ae889952271732850024199cbbff36a607ac;hpb=90a2b8eeadb9d5afb2bc165b080f8a4622f5deb4;p=gdcm.git

diff --git a/vtk/testvtkGdcmReader.cxx b/vtk/testvtkGdcmReader.cxx
index 47a9ae88..aaf04218 100644
--- a/vtk/testvtkGdcmReader.cxx
+++ b/vtk/testvtkGdcmReader.cxx
@@ -1,55 +1,61 @@
-// $Header: /cvs/public/gdcm/vtk/Attic/testvtkGdcmReader.cxx,v 1.1 2003/05/05 14:13:59 frog Exp $
+// $Header: /cvs/public/gdcm/vtk/Attic/testvtkGdcmReader.cxx,v 1.8 2004/01/15 10:25:11 regrain Exp $
 
-#include "vtkRenderer.h"
-#include "vtkRenderWindow.h"
-#include "vtkRenderWindowInteractor.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkActor.h"
-#include "vtkImageMapper.h"
-#include "vtkImageViewer.h"
-#include "vtkMatrix4x4.h"
-#include "vtkLookupTable.h"
-#include "vtkMatrixToLinearTransform.h"
-#include "vtkTexture.h"
-#include "vtkPlaneSource.h"
-#include "vtkTextureMapToPlane.h"
-#include "vtkDataSetMapper.h"
-#include "vtkActor.h"
-#include "vtkImageCast.h"
-#include "vtkPNGWriter.h"
-#include "vtkTexture.h"
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkActor.h>
+#include <vtkImageMapper.h>
+#include <vtkImageData.h>
+#include <vtkImageViewer.h>
+#include <vtkMatrix4x4.h>
+#include <vtkLookupTable.h>
+#include <vtkMatrixToLinearTransform.h>
+#include <vtkTexture.h>
+#include <vtkPlaneSource.h>
+#include <vtkTextureMapToPlane.h>
+#include <vtkDataSetMapper.h>
+#include <vtkActor.h>
+#include <vtkImageCast.h>
+#include <vtkPNGWriter.h>
+#include <vtkTexture.h>
 
 #include "vtkGdcmReader.h"
 
   
 int main( int argc, char *argv[] )
 {
-   char a;
    int *taille;
    int x,y;
 
    // Lecture de l'image
    vtkGdcmReader *reader = vtkGdcmReader::New();
-   reader->DebugOn();
+//   reader->DebugOn();
    // Alloc Used High
    // 8 8 7 U : OK
-   // reader->SetFileName("../Data/CT-MONO2-8-abdo.dcm");
+   // reader->SetFileName("../gdcmData/CT-MONO2-8-abdo.dcm");
    // 16 12 11 U : OK but saturated
-   // reader->SetFileName("../Data/CT-MONO2-12-lomb-an2.acr2");
+   // reader->SetFileName("../gdcmData/CT-MONO2-12-lomb-an2.acr2");
    // 16 12 11 U OK
-   //OKreader->SetFileName("../Data/MR-MONO2-12-an2.acr2");
+   //OKreader->SetFileName("../gdcmData/MR-MONO2-12-an2.acr2");
    // 16 10 9 U OK
-   //reader->SetFileName("../Data/CR-MONO1-10-chest.dcm");
+   //reader->SetFileName("../gdcmData/CR-MONO1-10-chest.dcm");
    //reader->Update();
    // 16 16 15 S: OK saturation ?
-   // reader->SetFileName("../Data/CT-MONO2-16-ort.dcm");
+   // reader->SetFileName("../gdcmData/CT-MONO2-16-ort.dcm");
    // 16 16 15 S:
-   reader->SetFileName("../Data/CT-MONO2-16-ankle.dcm");
+
+	if (argc > 1)
+     reader->SetFileName( argv[1] );
+	else
+     reader->SetFileName("../gdcmData/CT-MONO2-16-ankle.dcm");
+
    reader->UpdateWholeExtent();
    vtkImageData *ima = reader->GetOutput();
    taille=ima->GetDimensions();
    x = taille[0];  y = taille[1];
-   cout << "Taille de l'image en X=" << x << " et en Y=" << y << endl;
+   cout << "Dimensions of the picture as read with gdcm: "
+        << x << " x " << y << endl;
 
    vtkLookupTable *VTKtable = vtkLookupTable::New();
    VTKtable->SetNumberOfColors(1000);
@@ -88,6 +94,16 @@ int main( int argc, char *argv[] )
    renwin->Render();
    iren->Start();
 
+   reader->Delete();
+   VTKtable->Delete();
+   VTKtexture->Delete();
+   VTKplane->Delete();
+   VTKplaneMapper->Delete();
+   VTKplaneActor->Delete();
+   ren->Delete();
+   renwin->Delete();
+   iren->Delete();
+
    return(0);
 }