Refine testing

[gdcm.git] / vtk / vtkgdcmViewer2.cxx

diff --git a/vtk/vtkgdcmViewer2.cxx b/vtk/vtkgdcmViewer2.cxx
index d97dfc850e598f5f6e469c62aa4bd4a885e43595..f7fdddc8ee423f17f4bfd340a203871b15d737b2 100644 (file)
--- a/vtk/vtkgdcmViewer2.cxx
+++ b/vtk/vtkgdcmViewer2.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkgdcmViewer2.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/06/19 13:09:45 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2007/09/04 16:21:50 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,6 +27,8 @@
 //    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>
@@ -40,7 +42,6 @@
 
 #include "vtkGdcmReader.h"
 #include "gdcmDocument.h"  // for NO_SHADOWSEQ
-
 #ifndef vtkFloatingPointType
 #define vtkFloatingPointType float
 #endif
@@ -97,6 +98,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
@@ -132,17 +140,15 @@ int main(int argc, char *argv[])
    // 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]);
-
+   if( reader->GetOutput()->GetNumberOfScalarComponents() == 1 )
+     {
+     vtkFloatingPointType *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);
-  
-   //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();