The bad hack I made to bypass illegal images where undefined length UN data

[gdcm.git] / vtk / vtkgdcmViewer.cxx

diff --git a/vtk/vtkgdcmViewer.cxx b/vtk/vtkgdcmViewer.cxx
index 6526c1753482d7afafc3bccfd37eda4ab7476788..0c0029b7906242e9d03e20352aff78d374ee7985 100644 (file)
--- a/vtk/vtkgdcmViewer.cxx
+++ b/vtk/vtkgdcmViewer.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkgdcmViewer.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/02 20:10:50 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2007/09/18 07:54:30 $
+  Version:   $Revision: 1.31 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,7 +39,7 @@
 #include <vtkLookupTable.h>
 
 #include "vtkGdcmReader.h"
-
+#include "gdcmDocument.h"  // for NO_SHADOWSEQ
 #ifndef vtkFloatingPointType
 #define vtkFloatingPointType float
 #endif
@@ -70,7 +70,6 @@ public:
             int max = ImageViewer->GetWholeZMax();
             int slice = (ImageViewer->GetZSlice() + 1 ) % ++max;
             ImageViewer->SetZSlice( slice );
-            ImageViewer->GetRenderer()->ResetCameraClippingRange();
             ImageViewer->Render();
          }
       }
@@ -93,6 +92,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:
@@ -114,7 +115,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]);