X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkgdcmViewer.cxx;h=d70d49447f1f26a10cf5b0387e509568f72b21b2;hb=831b4cec23815614ee2ceddff957e852d7a36fe9;hp=3f64b40b02ff95ccde180c0206b822613959b4c9;hpb=88f0914a8dd9327056361ae14d62ead303f2a9ed;p=gdcm.git

diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx
index 3f64b40b..d70d4944 100644
--- a/vtk/vtkgdcmViewer.cxx
+++ b/vtk/vtkgdcmViewer.cxx
@@ -33,96 +33,104 @@
 // Callback for the interaction
 class vtkgdcmObserver : public vtkCommand
 {
-  public:
-  virtual char const *GetClassName() const { return "vtkgdcmObserver";}
-  static vtkgdcmObserver *New() 
-    { return new vtkgdcmObserver; }
-  vtkgdcmObserver()
-    {
+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* )
-    {
+   }
+   virtual void Execute(vtkObject *, unsigned long event, void* )
+   {
       if ( this->ImageViewer )
-        {
-          if ( event == vtkCommand::CharEvent )
-          {
+      {
+         if ( event == vtkCommand::CharEvent )
+         {
             int max = ImageViewer->GetWholeZMax();
             int slice = (ImageViewer->GetZSlice() + 1 ) % ++max;
             ImageViewer->SetZSlice( slice );
             ImageViewer->GetRenderer()->ResetCameraClippingRange();
             ImageViewer->Render();
-          }
-        }
-    }
-    vtkImageViewer2 *ImageViewer;
+         }
+      }
+   }
+   vtkImageViewer2 *ImageViewer;
 };
 
 
 int main(int argc, char *argv[])
 {
-  if( argc < 2 )
-    return 0;
+   if( argc < 2 )
+      return 0;
   
-  vtkGdcmReader *reader = vtkGdcmReader::New();
-  reader->AllowLookupTableOff();
+   vtkGdcmReader *reader = vtkGdcmReader::New();
+   reader->AllowLookupTableOff();
 
-  if( argc == 2 )
-    reader->SetFileName( argv[1] );
-  else
-    for(int i=1; i< argc; i++)
-      reader->AddFileName( argv[i] );
+   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( cout );
-        
-  vtkRenderWindowInteractor *iren = vtkRenderWindowInteractor::New();
+   reader->Update();
 
-  vtkImageViewer2 *viewer = vtkImageViewer2::New();
-  
-  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);
-  
-  //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();
-
-  //if you wish you can export dicom to a vtk file  
-  vtkStructuredPointsWriter *writer = vtkStructuredPointsWriter::New();
-  writer->SetInput( reader->GetOutput());
-  writer->SetFileName( "foo.vtk" );
-  writer->SetFileTypeToBinary();
-  writer->Write();
-
-  reader->Delete();
-  iren->Delete();
-  viewer->Delete();
-  writer->Delete();
+   //print debug info:
+   reader->GetOutput()->Print( cout );
+
+   vtkRenderWindowInteractor *iren = vtkRenderWindowInteractor::New();
+
+   vtkImageViewer2 *viewer = vtkImageViewer2::New();
+
+   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
+   {
+      double *range = reader->GetOutput()->GetScalarRange();
+      viewer->SetColorLevel (0.5 * (range[1] + range[0]));
+      viewer->SetColorWindow (range[1] - range[0]);
+
+      viewer->SetInput ( reader->GetOutput() );
+   }
+   viewer->SetupInteractor (iren);
   
-  return 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();
+
+   //if you wish you can export dicom to a vtk file  
+   vtkStructuredPointsWriter *writer = vtkStructuredPointsWriter::New();
+   writer->SetInput( reader->GetOutput());
+   writer->SetFileName( "foo.vtk" );
+   writer->SetFileTypeToBinary();
+   writer->Write();
+
+   reader->Delete();
+   iren->Delete();
+   viewer->Delete();
+   writer->Delete();
+
+   return 0;
 }