all volumes in ushort

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx
index 16186ba7f324ac8da5b01980146db89bb5955a94..980ac8dbf7c3bd5d4dc6e88ae0699f3aeb132302 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasMultipleVolumeRendererManager.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/07/08 14:22:14 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/07/10 13:18:24 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -17,6 +17,7 @@
 #include "wxMaracasMultipleVolumeRendererManager.h"
 
 #include <vtkMetaImageReader.h>
+#include <vtkImageCast.h>
 /**
 **     Start of the manager class
 **/
@@ -98,13 +99,17 @@ void wxMaracasMultipleVolumeRendererManager::setVolumeColor(int volid, std::vect
 vtkImageData* wxMaracasMultipleVolumeRendererManager::getImageData(std::string filename){
        if(filename.compare("")!= 0){   
                
-               
                vtkMetaImageReader* reader =  vtkMetaImageReader::New();        
                reader->SetFileName(filename.c_str());
                reader->Update();
-               vtkImageData* img = reader->GetOutput();
+               vtkImageData* img = reader->GetOutput();                
+               vtkImageCast* cast = vtkImageCast::New(); 
+               cast->SetInput(img);
+               cast->SetOutputScalarTypeToUnsignedShort();
+               cast->Update();                 
                //reader->Delete();
-               return img;
+               //img->Delete();
+               return cast->GetOutput();
        }       
        return NULL;
 }