X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkgdcmViewer.cxx;h=b9caec87947b68c0ffdcc00c532a9ed525e23b12;hb=c04f72b2466db911700aaea2d14426de678e9b94;hp=f48766a1cd8b6ed77390080b30f5db7c09db5e7d;hpb=43482d0567f0b3e1ac0d292f636221a569266383;p=gdcm.git

diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx
index f48766a1..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
@@ -27,9 +35,8 @@ class vtkgdcmObserver : public vtkCommand
           {
             int max = ImageViewer->GetWholeZMax();
             int slice = (ImageViewer->GetZSlice() + 1 ) % ++max;
-	    std::cout << "Slice:" << slice << "," << max << std::endl;
             ImageViewer->SetZSlice( slice );
-	    ImageViewer->GetRenderer()->ResetCameraClippingRange();
+            ImageViewer->GetRenderer()->ResetCameraClippingRange();
             ImageViewer->Render();
           }
         }
@@ -40,9 +47,17 @@ class vtkgdcmObserver : public vtkCommand
 
 int main(int argc, char *argv[])
 {
-
+  if( argc < 2 )
+    return 0;
+  
   vtkGdcmReader *reader = vtkGdcmReader::New();
-  reader->SetFileName( argv[1] );
+
+  if( argc == 2 )
+    reader->SetFileName( argv[1] );
+  else
+    for(int i=1; i< argc; i++)
+      reader->AddFileName( argv[i] );
+
   reader->DebugOn();
   reader->Update();
   
@@ -52,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();