Load *all* the fields

[gdcm.git] / vtk / vtkgdcmViewer.cxx

diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx
index c5bb70d7473c92751391e84b485eff55f1d8c744..39b7c6c85588db451b7cdf17d925b2b9091c2728 100644 (file)
--- a/vtk/vtkgdcmViewer.cxx
+++ b/vtk/vtkgdcmViewer.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: vtkgdcmViewer.cxx,v $
+  Language:  C++
+  Date:      $Date: 2007/08/28 09:41:39 $
+  Version:   $Revision: 1.30 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 // This example illustrates how the vtkGdcmReader vtk class can be
 // used in order to:
 //  * produce a simple (vtk based) Dicom image STACK VIEWER.
@@ -16,17 +33,13 @@
 #include <vtkImageViewer.h>
 #include <vtkStructuredPoints.h>
 #include <vtkStructuredPointsWriter.h>
-#include <vtkPNGWriter.h>
 #include <vtkCommand.h>
 #include <vtkRenderer.h>
 #include <vtkImageMapToColors.h>
 #include <vtkLookupTable.h>
 
 #include "vtkGdcmReader.h"
-#include "gdcmDebug.h"
-
-#include <iostream>
-
+#include "gdcmDocument.h"  // for NO_SHADOWSEQ
 #ifndef vtkFloatingPointType
 #define vtkFloatingPointType float
 #endif
@@ -54,10 +67,19 @@ public:
       {
          if ( event == vtkCommand::CharEvent )
          {
+#if (VTK_MAJOR_VERSION >= 5)
+            int max = ImageViewer->GetSliceMax();
+            int slice = (ImageViewer->GetSlice() + 1 ) % ++max;
+            ImageViewer->SetSlice( slice );
+#else
             int max = ImageViewer->GetWholeZMax();
             int slice = (ImageViewer->GetZSlice() + 1 ) % ++max;
             ImageViewer->SetZSlice( slice );
+#endif
+#if !( (VTK_MAJOR_VERSION >= 5) || ( VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION >= 5 ) )
+         // This used to be a bug in version VTK 4.4 and earlier
             ImageViewer->GetRenderer()->ResetCameraClippingRange();
+#endif
             ImageViewer->Render();
          }
       }
@@ -71,7 +93,6 @@ int main(int argc, char *argv[])
    if( argc < 2 )
       return 0;
   
-   gdcm::Debug::SetDebugOff();
    vtkGdcmReader *reader = vtkGdcmReader::New();
    reader->AllowLookupTableOff();
 
@@ -81,6 +102,8 @@ int main(int argc, char *argv[])
       for(int i=1; i< argc; i++)
          reader->AddFileName( argv[i] );
 
+// TODO : allow user to choose Load Mode
+   reader->SetLoadMode(GDCM_NAME_SPACE::LD_NOSHADOWSEQ);  
    reader->Update();
 
    //print debug info:
@@ -102,7 +125,13 @@ int main(int argc, char *argv[])
    }
    else
    {
-      double *range = reader->GetOutput()->GetScalarRange();
+   
+   // For a single medical image, it would be more efficient to use
+   // 0028|1050 [DS] [Window Center]
+   // 0028|1051 [DS] [Window Width]
+   // but vtkgdcmReader doesn't know about them :-(
+
+      vtkFloatingPointType *range = reader->GetOutput()->GetScalarRange();
       viewer->SetColorLevel (0.5 * (range[1] + range[0]));
       viewer->SetColorWindow (range[1] - range[0]);
 
@@ -120,17 +149,16 @@ int main(int argc, char *argv[])
    iren->AddObserver(vtkCommand::CharEvent,obs);
    obs->Delete();
 
+   //viewer->Render();
    iren->Initialize();
    iren->Start();
 
    //if you wish you can export dicom to a vtk file  
-   //vtkStructuredPointsWriter *writer = vtkStructuredPointsWriter::New();
-   vtkPNGWriter *writer = vtkPNGWriter::New();
+   vtkStructuredPointsWriter *writer = vtkStructuredPointsWriter::New();
    writer->SetInput( reader->GetOutput());
-   writer->SetFileName( "foo.png" );
-   //writer->SetFileTypeToBinary();
-   writer->Write();
-
+   writer->SetFileName( "foo.vtk" );
+   writer->SetFileTypeToBinary();
+   //writer->Write();
 
    reader->Delete();
    iren->Delete();