X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererView.cxx;h=dc3ee24af95088b0b22099c955a05040fe8a3587;hb=212f0d0bcfc27b9e79be4c1536e49dcb7f55041d;hp=06bd49b7ad0931398f292456c5c2feed3ca8356f;hpb=8e28248048ebb13908702adb87a319047af16939;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx
index 06bd49b..dc3ee24 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasMultipleVolumeRendererView.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/10/16 17:01:42 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2009/11/20 17:09:05 $
+  Version:   $Revision: 1.9 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -70,12 +70,31 @@ wxMaracasMultipleVolumeRendererView* wxMaracasMultipleVolumeRendererView::getIns
 	return instance;
 }
 
+void wxMaracasMultipleVolumeRendererView::changeCompositeMIPFunction(int id, int function){
+	try{
+		volmanager->changeCompositeMIPFunction(id, function);
+	}
+	catch(char* str){
+		std::cout << "Exception : " << str << '\n';
+		wxMessageDialog* diag = new wxMessageDialog(this, wxString( str,wxConvUTF8 ), wxString( str,wxConvUTF8 ), wxICON_ERROR);
+		diag->ShowModal();
+	}
+}
+
 void wxMaracasMultipleVolumeRendererView::setRenderer(vtkRenderer*  renderer){
 	volmanager->setRenderer(renderer);
 }
 
 void wxMaracasMultipleVolumeRendererView::addRemoveActor(int id, bool addremove){
-	volmanager->addRemoveActor(id, addremove);
+	try{
+		volmanager->addRemoveActor(id, addremove);
+	}
+	catch(char* str){
+		std::cout << "Exception : " << str << '\n';
+		wxMessageDialog* diag = new wxMessageDialog(this, wxString( str,wxConvUTF8 ), wxString( str,wxConvUTF8 ), wxICON_ERROR);
+		diag->ShowModal();
+	}
+	
 }
 
 void wxMaracasMultipleVolumeRendererView::onLoadImageFile(){
@@ -107,9 +126,9 @@ void wxMaracasMultipleVolumeRendererView::addVolumeViewPanel(wxMaracasMultipleVo
 void wxMaracasMultipleVolumeRendererView::addVolume(vtkImageData* img, std::string dataname){
 
 	try{
-		int id = volmanager->addVolume(img,dataname);		
+		int id = volmanager->addVolume(-1, img,dataname);		
 		if(id!=-1){
-			wxMaracasMultipleVolumeRendererPanel* controlpan = new wxMaracasMultipleVolumeRendererPanel(this, id,img);
+			wxMaracasMultipleVolumeRendererPanel* controlpan = new wxMaracasMultipleVolumeRendererPanel(this, id,img, false);
 			addVolumeViewPanel(controlpan, dataname);
 			controlpan->updateVolume();
 		}
@@ -132,15 +151,24 @@ void wxMaracasMultipleVolumeRendererView::loadVolume(wxString filename, wxString
 	}
 }
 
-void wxMaracasMultipleVolumeRendererView::deleteVolume(int volid){
-	//volmanager->deleteActor(volid);
+void wxMaracasMultipleVolumeRendererView::deleteVolume(int volid)
+{
+	try{
+		volmanager->deleteActor(volid);
+	}
+
+	catch(char* str){
+		std::cout << "Exception : " << str << '\n';
+		wxMessageDialog* diag = new wxMessageDialog(this, wxString(str,wxConvUTF8 ), wxString(str,wxConvUTF8 ), wxICON_ERROR);
+		diag->ShowModal();
+	}
 }
 
 void wxMaracasMultipleVolumeRendererView::SetValuesColorPointsFunction(int volid, std::vector<double> greylevelcolors,std::vector<double> red,std::vector<double> green,std::vector<double> blue){
-	//volmanager->setVolumeColor(volid, greylevelcolors, red, green, blue);
+	volmanager->setVolumeColor(volid, greylevelcolors, red, green, blue);
 }
 void wxMaracasMultipleVolumeRendererView::SetValuesPointsFunction(int volid, std::vector<double> greylevel, std::vector<double> values){
-	//volmanager->setVolumeOpacity(volid, greylevel, values);
+	volmanager->setVolumeOpacity(volid, greylevel, values);
 }
 
 vtkPiecewiseFunction* wxMaracasMultipleVolumeRendererView::GetTransferFunction(int volumeid){
@@ -149,6 +177,11 @@ vtkPiecewiseFunction* wxMaracasMultipleVolumeRendererView::GetTransferFunction(i
 vtkColorTransferFunction* wxMaracasMultipleVolumeRendererView::GetColorFunction(int volumeid){
     return volmanager->GetColorFunction(volumeid);
 }
+
+std::vector<vtkImageData*> wxMaracasMultipleVolumeRendererView::GetOutputImages(){
+	return imgVect;
+}
+
 /**
 **
 **/