X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkgdcmViewer.cxx;h=d70d49447f1f26a10cf5b0387e509568f72b21b2;hb=02163588f1fa2bb0af4b45455b6f9d08ec64f7b3;hp=c5bb70d7473c92751391e84b485eff55f1d8c744;hpb=e97ed5092629a64cb017250b5f76eae290f22a4a;p=gdcm.git

diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx
index c5bb70d7..d70d4944 100644
--- a/vtk/vtkgdcmViewer.cxx
+++ b/vtk/vtkgdcmViewer.cxx
@@ -12,20 +12,18 @@
 //  * the produced vtk file is named "foo.vtk" (in the invocation directory).
 // 
 //----------------------------------------------------------------------------
+#include <iostream>
+
 #include <vtkRenderWindowInteractor.h>
-#include <vtkImageViewer.h>
+#include <vtkImageViewer2.h>
 #include <vtkStructuredPoints.h>
 #include <vtkStructuredPointsWriter.h>
-#include <vtkPNGWriter.h>
 #include <vtkCommand.h>
 #include <vtkRenderer.h>
 #include <vtkImageMapToColors.h>
 #include <vtkLookupTable.h>
 
 #include "vtkGdcmReader.h"
-#include "gdcmDebug.h"
-
-#include <iostream>
 
 #ifndef vtkFloatingPointType
 #define vtkFloatingPointType float
@@ -62,7 +60,7 @@ public:
          }
       }
    }
-   vtkImageViewer *ImageViewer;
+   vtkImageViewer2 *ImageViewer;
 };
 
 
@@ -71,7 +69,6 @@ int main(int argc, char *argv[])
    if( argc < 2 )
       return 0;
   
-   gdcm::Debug::SetDebugOff();
    vtkGdcmReader *reader = vtkGdcmReader::New();
    reader->AllowLookupTableOff();
 
@@ -88,7 +85,7 @@ int main(int argc, char *argv[])
 
    vtkRenderWindowInteractor *iren = vtkRenderWindowInteractor::New();
 
-   vtkImageViewer *viewer = vtkImageViewer::New();
+   vtkImageViewer2 *viewer = vtkImageViewer2::New();
 
    if( reader->GetLookupTable() )
    {
@@ -124,14 +121,12 @@ int main(int argc, char *argv[])
    iren->Start();
 
    //if you wish you can export dicom to a vtk file  
-   //vtkStructuredPointsWriter *writer = vtkStructuredPointsWriter::New();
-   vtkPNGWriter *writer = vtkPNGWriter::New();
+   vtkStructuredPointsWriter *writer = vtkStructuredPointsWriter::New();
    writer->SetInput( reader->GetOutput());
-   writer->SetFileName( "foo.png" );
-   //writer->SetFileTypeToBinary();
+   writer->SetFileName( "foo.vtk" );
+   writer->SetFileTypeToBinary();
    writer->Write();
 
-
    reader->Delete();
    iren->Delete();
    viewer->Delete();