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

diff --git a/vtk/vtkgdcmViewer2.cxx b/vtk/vtkgdcmViewer2.cxx
index 81ee16a4..f991efde 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: 2011/03/29 07:36:02 $
+  Version:   $Revision: 1.19 $
                                                                                 
   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,22 @@
 //    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 <vtkMetaImageWriter.h>
+#include <vtkWindowToImageFilter.h>
+#include <vtkRenderWindow.h>
 #include <vtkCommand.h>
 #include <vtkRenderer.h>
 #include <vtkImageMapToColors.h>
@@ -61,13 +71,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,20 +95,58 @@ 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
 };
 
+// --------------------------------------------------------------------------------
 
 int main(int argc, char *argv[])
 {
    if( argc < 2 )
       return 0;
+
+   bool metaWrite = false;
   
    vtkGdcmReader *reader = vtkGdcmReader::New();
    reader->AllowLookupTableOff();
 
+
+   if (strcmp (argv[argc-1], "o") == 0)
+   {
+      argc--; // Is it allowed?!?
+      reader->SetKeepOverlays(true);
+   }
+
+// not a very clever way to pass several params
+// but it's just for checking
+   if (strcmp (argv[argc-1], "n") == 0)
+   {
+      argc--; // Is it allowed?!?
+      reader->SetFlipY(false);
+   }
+
+   if (strcmp (argv[argc-1], "m") == 0)
+   {
+      argc--; // Is it allowed?!?
+      metaWrite = true;
+   }
+
    if( argc == 2 )
       reader->SetFileName( argv[1] );
    else
@@ -109,9 +160,27 @@ int main(int argc, char *argv[])
    //print debug info:
    reader->GetOutput()->Print( cout );
 
-   vtkRenderWindowInteractor *iren = vtkRenderWindowInteractor::New();
 
+   //if you wish you can export dicom to a .mhd file
+   //if (metaWrite) {
+   std::cout << "try to write .mhd" << std::endl;
+      vtkMetaImageWriter* w = vtkMetaImageWriter::New();
+      w->SetInput( reader->GetOutput());
+      w->SetFileName( "/home/jpr/Desktop/toto.mhd" );
+      w->SetFileDimensionality(3);
+      w->SetCompression(false);
+      w->Update();
+      w->Write();
+      //w->Delete();
+      std::cout << "end write .mhd" << std::endl;
+    //}
+
+   vtkRenderWindowInteractor *iren = vtkRenderWindowInteractor::New();
+#if VTK_MAJOR_VERSION >= 5
+   vtkImageColorViewer *viewer = vtkImageColorViewer::New();
+#else
    vtkImageViewer2 *viewer = vtkImageViewer2::New();
+#endif
 
    if( reader->GetLookupTable() )
    {
@@ -147,7 +216,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();
 
@@ -158,6 +229,17 @@ int main(int argc, char *argv[])
    writer->SetFileTypeToBinary();
    //writer->Write();
 
+   //if you wish you can export dicom to a .mhd file
+   /*
+   if (metaWrite) {
+      vtkMetaImageWriter* w = vtkMetaImageWriter::New();
+      w->SetInput( reader->GetOutput());
+      w->SetFileName( "foo.mhd" );
+      w->SetCompression(false);
+      w->Write();
+      w->Delete();
+    }
+*/
    reader->Delete();
    iren->Delete();
    viewer->Delete();