X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkgdcmViewer.cxx;h=1ce2af88e77cd14efa17407d94ceae2970d29761;hb=e18676073c17ff376992fa2262a2fb12eedb4411;hp=5038e3a20358f4ee92e62b72031f20b55ebb1475;hpb=49236d643fd420ddc5787a6cab3bbc0a45729fd0;p=gdcm.git

diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx
index 5038e3a2..1ce2af88 100644
--- a/vtk/vtkgdcmViewer.cxx
+++ b/vtk/vtkgdcmViewer.cxx
@@ -1,16 +1,60 @@
+#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[])
+//----------------------------------------------------------------------------
+// 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 *wdg, unsigned long event, void* calldata)
+    {
+      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();
+
+  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:
@@ -19,13 +63,32 @@ 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]));
 
+  // 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();