From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Fri, 10 Jul 2009 13:18:24 +0000 (+0000)
Subject: all volumes in ushort
X-Git-Tag: EED.02Oct2009~16
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=677073a8b01d85b5c1be31e6bbf7a2a0a74fcd19;p=creaMaracasVisu.git

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 16186ba..980ac8d 100644
--- 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;
 }