X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkgdcmViewer.cxx;h=709d93da50129a8e50839f51b913ee7dc1acd47c;hb=f163238b46fdd5a54c1b6b70549ab9466c101d14;hp=ce5afd62a67c1d0bfcf2ba5033c2e9b3df13df04;hpb=e59e2d83d86f77f608f6620fca3cf77e5e21d201;p=gdcm.git

diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx
index ce5afd62..709d93da 100644
--- a/vtk/vtkgdcmViewer.cxx
+++ b/vtk/vtkgdcmViewer.cxx
@@ -1,3 +1,5 @@
+#include <iostream>
+
 #include <vtkRenderWindowInteractor.h>
 #include <vtkImageViewer2.h>
 #include <vtkStructuredPoints.h>
@@ -9,6 +11,10 @@
 
 #include "vtkGdcmReader.h"
 
+#ifndef vtkFloatingPointType
+#define vtkFloatingPointType float
+#endif
+
 //----------------------------------------------------------------------------
 // Callback for the interaction
 class vtkgdcmObserver : public vtkCommand
@@ -21,7 +27,7 @@ class vtkgdcmObserver : public vtkCommand
     {
       this->ImageViewer = NULL;
     }
-  virtual void Execute(vtkObject *wdg, unsigned long event, void* calldata)
+  virtual void Execute(vtkObject *, unsigned long event, void* )
     {
       if ( this->ImageViewer )
         {
@@ -30,7 +36,7 @@ class vtkgdcmObserver : public vtkCommand
             int max = ImageViewer->GetWholeZMax();
             int slice = (ImageViewer->GetZSlice() + 1 ) % ++max;
             ImageViewer->SetZSlice( slice );
-	    ImageViewer->GetRenderer()->ResetCameraClippingRange();
+            ImageViewer->GetRenderer()->ResetCameraClippingRange();
             ImageViewer->Render();
           }
         }
@@ -45,6 +51,7 @@ int main(int argc, char *argv[])
     return 0;
   
   vtkGdcmReader *reader = vtkGdcmReader::New();
+  reader->AllowLookupTableOff();
 
   if( argc == 2 )
     reader->SetFileName( argv[1] );
@@ -56,11 +63,12 @@ int main(int argc, char *argv[])
   reader->Update();
   
   //print debug info:
-  reader->GetOutput()->Print( std::cout );
+  reader->GetOutput()->Print( cout );
         
   vtkRenderWindowInteractor *iren = vtkRenderWindowInteractor::New();
 
   vtkImageViewer2 *viewer = vtkImageViewer2::New();
+  
   if( reader->GetLookupTable() )
   {
     //convert to color:
@@ -77,9 +85,9 @@ int main(int argc, char *argv[])
   }
   viewer->SetupInteractor (iren);
   
-//  float *range = reader->GetOutput()->GetScalarRange();
-//  viewer->SetColorWindow (range[1] - range[0]);
-//  viewer->SetColorLevel (0.5 * (range[1] + range[0]));
+  //vtkFloatingPointType *range = reader->GetOutput()->GetScalarRange();
+  //viewer->SetColorWindow (range[1] - range[0]);
+  //viewer->SetColorLevel (0.5 * (range[1] + range[0]));
 
   // Here is where we setup the observer, 
   vtkgdcmObserver *obs = vtkgdcmObserver::New();