X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererView.cxx;h=83b10631eabf28a4bcec00a8378d6d4b495bc686;hb=37319ea6defbf2dc5ddce23e0b65c2247543ae33;hp=539648acc4411fa72eef397f500474e8e3b80aec;hpb=cc00f80af2e160ce2af3ddd2903c4a41c023cc94;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx
index 539648a..83b1063 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/07/08 14:22:14 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/10/15 11:56:43 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -41,7 +41,9 @@ wxMaracasMultipleVolumeRendererView::wxMaracasMultipleVolumeRendererView( wxWind
 	std::string iconsdir = path;
 	iconsdir+="/data/Icons";
 	this->_toolb = new ToolBarMultipleVolumeRenderer(this,iconsdir);
+	wxStaticText* txt = new wxStaticText(this, -1, wxString(_T("  Volume Rendering  ")));
 	wxAuiPaneInfo paneinfo;
+	wxauimanager->AddPane(txt,paneinfo.ToolbarPane().Top());
 	wxauimanager->AddPane(_toolb,paneinfo.ToolbarPane().Top());
 
 	wxauimanager->Update();	
@@ -100,8 +102,6 @@ void wxMaracasMultipleVolumeRendererView::addVolumeViewPanel(wxMaracasMultipleVo
 	wxAuiPaneInfo paneinfo;
 	wxauimanager->AddPane(irmview, paneinfo.DefaultPane().Centre().DestroyOnClose().Caption(s));
 	wxauimanager->Update();
-
-
 }
 	
 void wxMaracasMultipleVolumeRendererView::addVolume(vtkImageData* img, std::string dataname){
@@ -111,6 +111,7 @@ void wxMaracasMultipleVolumeRendererView::addVolume(vtkImageData* img, std::stri
 		if(id!=-1){
 			wxMaracasMultipleVolumeRendererPanel* controlpan = new wxMaracasMultipleVolumeRendererPanel(this, id,img);
 			addVolumeViewPanel(controlpan, dataname);
+			controlpan->updateVolume();
 		}
 	}catch(char* str){
 		std::cout << "Exception : " << str << '\n';
@@ -123,24 +124,31 @@ void wxMaracasMultipleVolumeRendererView::loadVolume(wxString filename, wxString
 
 	std::string s = std::string(filename.mb_str());
 	vtkImageData* img = volmanager->getImageData(s);
+	imgVect.push_back(img);
+
 	if(img!=NULL){
 		s = std::string(dataname.mb_str());
 		addVolume(img, s);
 	}
-    
 }
 
 void wxMaracasMultipleVolumeRendererView::deleteVolume(int volid){
-	volmanager->deleteActor(volid);
+	//volmanager->deleteActor(volid);
 }
 
 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){
+	return volmanager->GetTransferFunction(volumeid);
+}
+vtkColorTransferFunction* wxMaracasMultipleVolumeRendererView::GetColorFunction(int volumeid){
+    return volmanager->GetColorFunction(volumeid);
+}
 /**
 **
 **/
@@ -155,7 +163,7 @@ ToolBarMultipleVolumeRenderer::ToolBarMultipleVolumeRenderer(wxWindow * parent,s
 	//iconfil+= "/OpenImage.png";
 	//wxBitmap* bitmap0 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
 	wxBitmap bitmap0(OpenImage_xpm);
-	this->AddTool(1, wxString(_T("test")),bitmap0);
+	this->AddTool(1, wxString(_T("test")),bitmap0, NULL, wxITEM_NORMAL, wxString(_T("Open File")));
 
 	/*iconfil+= "/Open.png";
 	wxBitmap* bitmap2 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);