X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkgdcmViewer.cxx;h=b9caec87947b68c0ffdcc00c532a9ed525e23b12;hb=2943fda916fe14973cda2deddad3fc7dd6fc7d19;hp=97f305cec343c08b892460214ca0898efa9fd1a1;hpb=20098f1879eb5fb475a5cf7e9dd02b70d6893738;p=gdcm.git

diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx
index 97f305ce..b9caec87 100644
--- a/vtk/vtkgdcmViewer.cxx
+++ b/vtk/vtkgdcmViewer.cxx
@@ -1,12 +1,20 @@
+#include <iostream>
+
 #include <vtkRenderWindowInteractor.h>
 #include <vtkImageViewer2.h>
 #include <vtkStructuredPoints.h>
 #include <vtkStructuredPointsWriter.h>
 #include <vtkCommand.h>
 #include <vtkRenderer.h>
+#include <vtkImageMapToColors.h>
+#include <vtkLookupTable.h>
 
 #include "vtkGdcmReader.h"
 
+#ifndef vtkFloatingPointType
+#define vtkFloatingPointType float
+#endif
+
 //----------------------------------------------------------------------------
 // Callback for the interaction
 class vtkgdcmObserver : public vtkCommand
@@ -28,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();
           }
         }
@@ -59,12 +67,27 @@ int main(int argc, char *argv[])
   vtkRenderWindowInteractor *iren = vtkRenderWindowInteractor::New();
 
   vtkImageViewer2 *viewer = vtkImageViewer2::New();
-  viewer->SetInput ( reader->GetOutput() );
+  
+  if( reader->GetLookupTable() )
+  {
+    //convert to color:
+    vtkImageMapToColors *map = vtkImageMapToColors::New ();
+    map->SetInput (reader->GetOutput());
+    map->SetLookupTable (reader->GetLookupTable());
+    map->SetOutputFormatToRGB();
+    viewer->SetInput ( map->GetOutput() );
+    map->Delete();
+  }
+  else
+  
+  {
+    viewer->SetInput ( reader->GetOutput() );
+  }
   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();