*ENH: vtkGdcmReader now supports LUT ! (vtkgdcmViewer for now is not able to use...

diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index c81cbda500ff65b2de6b8d5db0ece57ac61ef02e..64750a0da01e20a3dd22a96bf08c670fc8e47c68 100644 (file)
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.24 2003/11/04 14:02:03 jpr Exp $
+// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.25 2003/11/05 18:15:41 malaterre Exp $
 // //////////////////////////////////////////////////////////////
 // WARNING TODO CLENAME 
 // Actual limitations of this code:
@@ -46,6 +46,7 @@
 #include <vtkObjectFactory.h>
 #include <vtkImageData.h>
 #include <vtkPointData.h>
+#include <vtkLookupTable.h>
 #include "vtkGdcmReader.h"
 #include "gdcm.h"
 #include "gdcmHeaderHelper.h"
@@ -53,6 +54,7 @@
 vtkGdcmReader::vtkGdcmReader()
 {
   // Constructor
+  this->LookupTable = vtkLookupTable::New();
 }
 
 //----------------------------------------------------------------------------
@@ -60,6 +62,7 @@ vtkGdcmReader::~vtkGdcmReader()
 { 
   this->RemoveAllFileName();
   this->InternalFileNameList.clear();
+  this->LookupTable->Delete();
 }
 
 //----------------------------------------------------------------------------
@@ -309,11 +312,14 @@ int vtkGdcmReader::CheckFileCoherence()
        this->ImageType = type;
        this->PixelSize = GdcmHeader.GetPixelSize();
        
-       // JPR to Mathieu:
-       // Be carefull : when u'll pane to use 'GetImageDataRaw',
-       // use 'GetNumberOfScalarComponentsRaw' ! 
-     
-       this->NumComponents = GdcmHeader.GetNumberOfScalarComponents(); //rgb or mono
+       if( GdcmHeader.HasLUT() )
+         {
+         this->NumComponents = GdcmHeader.GetNumberOfScalarComponentsRaw();
+         }
+       else
+         {
+         this->NumComponents = GdcmHeader.GetNumberOfScalarComponents(); //rgb or mono
+         }
        
        //Set image spacing
        this->DataSpacing[0] = GdcmHeader.GetXSpacing();
@@ -455,7 +461,7 @@ size_t vtkGdcmReader::LoadImageInMemory(
 {
   vtkDebugMacro("Copying to memory image" << FileName.c_str());
   gdcmFile GdcmFile(FileName.c_str());
-  size_t size = GdcmFile.GetImageDataSize();
+  size_t size;
 
   // If the data structure of vtk for image/volume representation
   // were straigthforwards the following would suffice:
@@ -467,7 +473,33 @@ size_t vtkGdcmReader::LoadImageInMemory(
   int NumLines   = GdcmFile.GetYSize();
   int NumPlanes  = GdcmFile.GetZSize();
   int LineSize   = NumComponents * NumColumns * GdcmFile.GetPixelSize();
-  unsigned char * Source      = (unsigned char*)GdcmFile.GetImageData();
+
+  unsigned char * Source;
+  if( GdcmFile.HasLUT() )
+    {
+    size               = GdcmFile.GetImageDataSizeRaw();
+    Source             = (unsigned char*) GdcmFile.GetImageDataRaw();
+    unsigned char *Lut = (unsigned char*) GdcmFile.GetLUTRGBA();
+
+    this->LookupTable->SetNumberOfTableValues(256);
+    for (int tmp=0; tmp<256; tmp++)
+      {
+      this->LookupTable->SetTableValue(tmp,
+        (float)Lut[4*tmp+0]/255.0,
+        (float)Lut[4*tmp+1]/255.0,
+        (float)Lut[4*tmp+2]/255.0,
+        1);
+      }
+    this->LookupTable->SetRange(0,255);
+    vtkDataSetAttributes *a=this->GetOutput()->GetPointData();
+    a->GetScalars()->SetLookupTable(this->LookupTable);
+    free(Lut);
+    }
+  else
+    {
+    size        = GdcmFile.GetImageDataSize();
+    Source      = (unsigned char*)GdcmFile.GetImageData();
+    }
   unsigned char * pSource     = Source; //pointer for later deletion
   unsigned char * Destination = Dest + size - LineSize;
 

diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h
index 6c1507b6edaf26328fc4b51b6871d389b7a2b49e..e3cd73c5e1b1d18e0613b6853a8d0b577188860a 100644 (file)
--- a/vtk/vtkGdcmReader.h
+++ b/vtk/vtkGdcmReader.h
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.h,v 1.10 2003/10/03 14:48:31 malaterre Exp $
+// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.h,v 1.11 2003/11/05 18:15:41 malaterre Exp $
 
 #ifndef __vtkGdcmReader_h
 #define __vtkGdcmReader_h
@@ -6,6 +6,7 @@
 #include <list>
 #include <string>
 #include "vtkImageReader.h"
+class vtkLookupTable;
 
 class VTK_EXPORT vtkGdcmReader : public vtkImageReader
 {
@@ -17,6 +18,7 @@ public:
   void RemoveAllFileName(void);
   void AddFileName(const char* name);
   void SetFileName(const char *name);
+  vtkGetObjectMacro(LookupTable,vtkLookupTable);
 
 protected:
   vtkGdcmReader();
@@ -29,6 +31,7 @@ protected:
 private:
   void RemoveAllInternalFileName(void);
   void AddInternalFileName(const char* name);
+  vtkLookupTable *LookupTable;
 
   //BTX
   // Number of columns of the image/volume to be loaded