X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkgdcmViewer2.cxx;h=72dd2379a82a08dcbe4610dc2fdd8dc0365691ff;hb=f2dd700472606cce1b889e6527ca7ed68a6bbde6;hp=81ee16a472f2bd051c0d0c30c3b1c9c9efcb583f;hpb=39170500bc69ec6c7b517f0942ee432bc0d4fe35;p=gdcm.git

diff --git a/vtk/vtkgdcmViewer2.cxx b/vtk/vtkgdcmViewer2.cxx
index 81ee16a4..72dd2379 100644
--- a/vtk/vtkgdcmViewer2.cxx
+++ b/vtk/vtkgdcmViewer2.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkgdcmViewer2.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/08/28 14:02:13 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2007/10/03 15:50:13 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,12 +27,21 @@
 //    given as command line arguments,
 //  * you can navigate through the stack by hitting any character key,
 //  * the produced vtk file is named "foo.vtk" (in the invocation directory).
+//  * if the last 'filename' == "o", overlays (group 60xx)  are loaded.
+//  * just a test!
 // 
 //----------------------------------------------------------------------------
 #include <vtkRenderWindowInteractor.h>
+#if VTK_MAJOR_VERSION >= 5
+#include "vtkImageColorViewer.h"
+#else
 #include <vtkImageViewer2.h>
+#endif
 #include <vtkStructuredPoints.h>
 #include <vtkStructuredPointsWriter.h>
+#include <vtkPNGWriter.h>
+#include <vtkWindowToImageFilter.h>
+#include <vtkRenderWindow.h>
 #include <vtkCommand.h>
 #include <vtkRenderer.h>
 #include <vtkImageMapToColors.h>
@@ -61,13 +70,16 @@ public:
    {
       this->ImageViewer = NULL;
    }
-   virtual void Execute(vtkObject *, unsigned long event, void* )
+   virtual void Execute(vtkObject *caller, unsigned long event, void* /*callData*/ )
    {
       if ( this->ImageViewer )
       {
-         if ( event == vtkCommand::CharEvent )
+         vtkRenderWindowInteractor * rwi = vtkRenderWindowInteractor::SafeDownCast( caller );
+         char keycode = 0;
+         if( rwi ) keycode = rwi->GetKeyCode();
+         if ( event == vtkCommand::CharEvent && keycode != 's' )
          {
-#if (VTK_MAJOR_VERSION >= 5)
+#if VTK_MAJOR_VERSION >= 5
             int max = ImageViewer->GetSliceMax();
             int slice = (ImageViewer->GetSlice() + 1 ) % ++max;
             ImageViewer->SetSlice( slice );
@@ -82,9 +94,23 @@ public:
 #endif
             ImageViewer->Render();
          }
+         else if ( keycode == 's' )
+         {
+           vtkPNGWriter * writer = vtkPNGWriter::New();
+           vtkWindowToImageFilter * w2i = vtkWindowToImageFilter::New();
+           w2i->SetInput( rwi->GetRenderWindow() );
+           writer->SetInput( w2i->GetOutput() );
+           writer->SetFileName( "snapshot.png" );
+           writer->Write();
+           //std::cerr << "Screenshort saved to snapshot.png" << std::endl;
+         }
       }
    }
+#if VTK_MAJOR_VERSION >= 5
+   vtkImageColorViewer *ImageViewer;
+#else
    vtkImageViewer2 *ImageViewer;
+#endif
 };
 
 
@@ -96,6 +122,13 @@ int main(int argc, char *argv[])
    vtkGdcmReader *reader = vtkGdcmReader::New();
    reader->AllowLookupTableOff();
 
+
+   if (strcmp (argv[argc-1], "o") == 0)
+   {
+      argc--; // Is it allowed?!?
+      reader->SetKeepOverlays(true);
+   }
+
    if( argc == 2 )
       reader->SetFileName( argv[1] );
    else
@@ -110,8 +143,11 @@ int main(int argc, char *argv[])
    reader->GetOutput()->Print( cout );
 
    vtkRenderWindowInteractor *iren = vtkRenderWindowInteractor::New();
-
+#if VTK_MAJOR_VERSION >= 5
+   vtkImageColorViewer *viewer = vtkImageColorViewer::New();
+#else
    vtkImageViewer2 *viewer = vtkImageViewer2::New();
+#endif
 
    if( reader->GetLookupTable() )
    {
@@ -147,7 +183,9 @@ int main(int argc, char *argv[])
    iren->AddObserver(vtkCommand::CharEvent,obs);
    obs->Delete();
 
-   //viewer->Render();
+#if VTK_MAJOR_VERSION >= 5
+   viewer->Render(); // Don't ask why...
+#endif
    iren->Initialize();
    iren->Start();