X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererManagerData.cxx;h=d1197c5f5c6a20519dc87e0e7562bbc238a38478;hb=ba3bf1e05af2b03d6b013606b9d885d8fb0b2cb4;hp=de064e339aff011d3c87fdcbb66aa2a9b05cd896;hpb=cc00f80af2e160ce2af3ddd2903c4a41c023cc94;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.cxx
index de064e3..d1197c5 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 #include "wxMaracasMultipleVolumeRendererManagerData.h"
 
@@ -15,6 +40,8 @@ wxMaracasMultipleVolumeRendererManagerData::wxMaracasMultipleVolumeRendererManag
 
 	_volumePlanes  = vtkPlanes::New();
 	_compositeFunction = vtkVolumeRayCastCompositeFunction::New();
+	_MIPFunction = vtkVolumeRayCastMIPFunction::New();
+
 	_volumeMapper = vtkVolumeRayCastMapper::New();	
 	_volumeMapper->SetVolumeRayCastFunction(_compositeFunction);
 	_volumeMapper->SetClippingPlanes( _volumePlanes );
@@ -58,7 +85,7 @@ void wxMaracasMultipleVolumeRendererManagerData::setVolumeColor(std::vector<doub
 	_ctfun->RemoveAllPoints();
 	for(int i = 0; i < greylevelcolors.size();i++){
 		_ctfun->AddRGBPoint(greylevelcolors[i], red[i],green[i], blue[i]);
-	//			std::cout<<"transfer color function "<<greylevelcolors[i]<<" "<<red[i]<<" "<<green[i]<<" "<<blue[i]<<std::endl;
+				//std::cout<<"wxMaracasMultipleVolumeRendererManagerData::setVolumeColor "<<greylevelcolors[i]<<" "<<red[i]<<" "<<green[i]<<" "<<blue[i]<<std::endl;
 	}		
 	_newvol->Update();	
 }
@@ -71,7 +98,7 @@ void wxMaracasMultipleVolumeRendererManagerData::setVolumeOpacity(std::vector<do
 	_tfun->RemoveAllPoints();
 	for(int i = 0; i < greylevel.size();i++){
 		_tfun->AddPoint(greylevel[i], value[i]);
-//			std::cout<<"transfer function "<<greylevel[i]<<" "<< value[i]<<std::endl;
+			//std::cout<<"wxMaracasMultipleVolumeRendererManagerData::setVolumeOpacity "<<greylevel[i]<<" "<< value[i]<<std::endl;
 	}
     _newvol->Update();
 }
@@ -79,8 +106,23 @@ void wxMaracasMultipleVolumeRendererManagerData::setVolumeOpacity(std::vector<do
 /**
 **	Check if the variables are setted correctly
 **/
-void wxMaracasMultipleVolumeRendererManagerData::checkInvariant(){
+void wxMaracasMultipleVolumeRendererManagerData::checkInvariant()throw (char *){
+	if(!_compositeFunction){
+		throw "No composite function initialized";
+	}
+	if(!_MIPFunction){
+		throw "No MIP function initialized";
+	}
+	if(!_volumeMapper){
+		throw "No volume mapper initialized";
+	}
+}
 
+/**
+**	Check if the variables are setted correctly
+**/
+void wxMaracasMultipleVolumeRendererManagerData::Update(){
+	 _newvol->Update();
 }
 /**
 **	get the prop3D 
@@ -114,3 +156,12 @@ void wxMaracasMultipleVolumeRendererManagerData::setDataname(std::string datanam
 	_dataname = dataname;
 }
 
+void wxMaracasMultipleVolumeRendererManagerData::changeCompositeMIPFunction(int function) throw (char *){
+	checkInvariant();
+	if(function == 0){
+		_volumeMapper->SetVolumeRayCastFunction(_compositeFunction);
+	}else{
+		_volumeMapper->SetVolumeRayCastFunction(_MIPFunction);
+	}
+	
+}