* Test/TestAllEntryVerify.cxx minor fix and added comments.

[gdcm.git] / vtk / vtkgdcmViewer.cxx

diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx
index 1ce2af88e77cd14efa17407d94ceae2970d29761..709d93da50129a8e50839f51b913ee7dc1acd47c 100644 (file)
--- a/vtk/vtkgdcmViewer.cxx
+++ b/vtk/vtkgdcmViewer.cxx
@@ -11,6 +11,10 @@
 
 #include "vtkGdcmReader.h"
 
+#ifndef vtkFloatingPointType
+#define vtkFloatingPointType float
+#endif
+
 //----------------------------------------------------------------------------
 // Callback for the interaction
 class vtkgdcmObserver : public vtkCommand
@@ -23,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 )
         {
@@ -32,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();
           }
         }
@@ -47,6 +51,7 @@ int main(int argc, char *argv[])
     return 0;
   
   vtkGdcmReader *reader = vtkGdcmReader::New();
+  reader->AllowLookupTableOff();
 
   if( argc == 2 )
     reader->SetFileName( argv[1] );
@@ -58,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:
@@ -79,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();