X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkgdcmViewer2.cxx;h=81ee16a472f2bd051c0d0c30c3b1c9c9efcb583f;hb=18275186f68a263c4b80ce4757776f3c63f4495b;hp=ccac0d7c16ef68a8c8f2568845337cad84724d28;hpb=bef43dcc681a6b9d91d384099b803b04c22b4a03;p=gdcm.git

diff --git a/vtk/vtkgdcmViewer2.cxx b/vtk/vtkgdcmViewer2.cxx
index ccac0d7c..81ee16a4 100644
--- a/vtk/vtkgdcmViewer2.cxx
+++ b/vtk/vtkgdcmViewer2.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkgdcmViewer2.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/03/17 14:46:18 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2007/08/28 14:02:13 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -40,7 +40,6 @@
 
 #include "vtkGdcmReader.h"
 #include "gdcmDocument.h"  // for NO_SHADOWSEQ
-
 #ifndef vtkFloatingPointType
 #define vtkFloatingPointType float
 #endif
@@ -68,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();
          }
       }
@@ -95,7 +103,7 @@ int main(int argc, char *argv[])
          reader->AddFileName( argv[i] );
 
 // TODO : allow user to choose Load Mode
-   reader->SetLoadMode(gdcm::LD_NOSHADOWSEQ);  
+   reader->SetLoadMode(GDCM_NAME_SPACE::LD_NOSHADOWSEQ);  
    reader->Update();
 
    //print debug info:
@@ -123,17 +131,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();