X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererManager.cxx;h=70d05bd52b9f61b915ccd49609076579eeeaf252;hb=0eb7703d529af805f4a4f2a1b01b4151283c2327;hp=980ac8dbf7c3bd5d4dc6e88ae0699f3aeb132302;hpb=677073a8b01d85b5c1be31e6bbf7a2a0a74fcd19;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx
index 980ac8d..70d05bd 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/10 13:18:24 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/11/03 10:32:38 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -37,11 +37,11 @@ void wxMaracasMultipleVolumeRendererManager::setRenderer(vtkRenderer*  renderer)
 /**
 **	Adds a prop3D to the manager and returns the identifier
 **/
-int wxMaracasMultipleVolumeRendererManager::addVolume(vtkImageData* vol, std::string dataname)  throw(char*){
+int wxMaracasMultipleVolumeRendererManager::addVolume(vtkImageData* vol, std::string dataname) throw(char*){
 	checkInvariant();
 	if(vol != NULL){
 		wxMaracasMultipleVolumeRendererManagerData* data = new wxMaracasMultipleVolumeRendererManagerData(vol, dataname);
-		prop3Dvect.push_back(data);		
+		prop3Dvect.push_back(data);
 		_renderer->AddActor(data->getProp3D());
 		data->setId(_idCount);
 		_idCount++;
@@ -102,7 +102,8 @@ vtkImageData* wxMaracasMultipleVolumeRendererManager::getImageData(std::string f
 		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();
@@ -110,6 +111,7 @@ vtkImageData* wxMaracasMultipleVolumeRendererManager::getImageData(std::string f
 		//reader->Delete();
 		//img->Delete();
 		return cast->GetOutput();
+		//return img;
 	}	
 	return NULL;
 }
@@ -158,3 +160,11 @@ void wxMaracasMultipleVolumeRendererManager::deleteActor(int propid) throw (char
 	}	
     
 }
+
+vtkPiecewiseFunction* wxMaracasMultipleVolumeRendererManager::GetTransferFunction(int volumeid){
+	return getViewData(volumeid)->GetTransferFunction();
+}
+vtkColorTransferFunction* wxMaracasMultipleVolumeRendererManager::GetColorFunction(int volumeid){
+
+	return getViewData(volumeid)->GetColorFunction();
+}