X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererManager.cxx;h=3b279a75b6c41453c6cbe4159fc76678eec96eb6;hb=2725f81fc97c9faa92749159bdbaf9cedeef7af4;hp=ccee7cd76c2756a45a3c2ebfe67e5cc080d5c9e4;hpb=79df2a7fc2b468bc2e7279ac77c0148269fe6aee;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx
index ccee7cd..3b279a7 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/11/09 19:14:56 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2009/11/20 17:09:05 $
+  Version:   $Revision: 1.9 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -54,15 +54,23 @@ void wxMaracasMultipleVolumeRendererManager::Update(int ppid){
 /**
 **	Adds a prop3D to the manager and returns the identifier
 **/
-int wxMaracasMultipleVolumeRendererManager::addVolume(vtkImageData* vol, std::string dataname) throw(char*){
+int wxMaracasMultipleVolumeRendererManager::addVolume(int idTP, vtkImageData* vol, std::string dataname) throw(char*){
 	checkInvariant();
 	image = vol;
 	if(vol != NULL){
 		wxMaracasMultipleVolumeRendererManagerData* data = new wxMaracasMultipleVolumeRendererManagerData(vol, dataname);
 		prop3Dvect.push_back(data);
 		_renderer->AddActor(data->getProp3D());
-		data->setId(_idCount);
-		_idCount++;
+		if(idTP == -1)
+		{
+			data->setId(_idCount);
+			_idCount++;
+		}
+		else
+		{
+			data->setId(idTP);
+		}
+		printf("wxMaracasMultipleVolumeRendererManager::addVolume->idVolumeRenderer: %i\n", data->getId());
 		return data->getId();
 	}else{
 		throw "Check mhd imagefile file or input";
@@ -189,3 +197,7 @@ vtkColorTransferFunction* wxMaracasMultipleVolumeRendererManager::GetColorFuncti
 
 	return getViewData(volumeid)->GetColorFunction();
 }
+
+void wxMaracasMultipleVolumeRendererManager::changeCompositeMIPFunction(int id, int function) throw (char *){
+	getViewData(id)->changeCompositeMIPFunction(function);
+}
\ No newline at end of file