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

diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx
index ee882617..709d93da 100644
--- a/vtk/vtkgdcmViewer.cxx
+++ b/vtk/vtkgdcmViewer.cxx
@@ -1,30 +1,99 @@
+#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"
 
-int main(int argc, char *argv[])
+#ifndef vtkFloatingPointType
+#define vtkFloatingPointType float
+#endif
+
+//----------------------------------------------------------------------------
+// Callback for the interaction
+class vtkgdcmObserver : public vtkCommand
 {
+  public:
+  virtual char const *GetClassName() const { return "vtkgdcmObserver";}
+  static vtkgdcmObserver *New() 
+    { return new vtkgdcmObserver; }
+  vtkgdcmObserver()
+    {
+      this->ImageViewer = NULL;
+    }
+  virtual void Execute(vtkObject *, unsigned long event, void* )
+    {
+      if ( this->ImageViewer )
+        {
+          if ( event == vtkCommand::CharEvent )
+          {
+            int max = ImageViewer->GetWholeZMax();
+            int slice = (ImageViewer->GetZSlice() + 1 ) % ++max;
+            ImageViewer->SetZSlice( slice );
+            ImageViewer->GetRenderer()->ResetCameraClippingRange();
+            ImageViewer->Render();
+          }
+        }
+    }
+    vtkImageViewer2 *ImageViewer;
+};
 
+
+int main(int argc, char *argv[])
+{
+  if( argc < 2 )
+    return 0;
+  
   vtkGdcmReader *reader = vtkGdcmReader::New();
-  reader->SetFileName( argv[1] );
-  //reader->DebugOn();
+  reader->AllowLookupTableOff();
+
+  if( argc == 2 )
+    reader->SetFileName( argv[1] );
+  else
+    for(int i=1; i< argc; i++)
+      reader->AddFileName( argv[i] );
+
+  reader->DebugOn();
   reader->Update();
   
   //print debug info:
-  reader->GetOutput()->Print( std::cout );
+  reader->GetOutput()->Print( cout );
         
   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();
+  obs->ImageViewer = viewer;
+  iren->AddObserver(vtkCommand::CharEvent,obs);
+  obs->Delete();
 
   iren->Initialize();
   iren->Start();