X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSurfaceRendering.cxx;h=a8c44428fa7134d40895caf4792b99ecc6ba4111;hb=fc309690300a29fbfbac04f6fdf72783202617ad;hp=fc13b85644a3dee56b42dfe3c4d1007eeef174f9;hpb=476100b14fe16ecb940787a8f98d65e8359d7f58;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
index fc13b85..a8c4442 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasSurfaceRendering.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/11/13 11:47:41 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2010/01/13 13:31:10 $
+  Version:   $Revision: 1.8 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -15,8 +15,6 @@
 
 =========================================================================*/
 
-
-
 // EOF - wxMaracasMPR.cxx
 
 #include "wxMaracasSurfaceRendering.h"
@@ -44,17 +42,16 @@ wxMaracasSurfaceRendering::wxMaracasSurfaceRendering( wxWindow* parent,std::stri
 	iconsdir+="/data/Icons";
 	this->_toolb = new ToolBar(this,iconsdir);
 	
-	/*Carolina: "Surface Rendering" label recently added*/
-	wxStaticText* txt = new wxStaticText(this, -1, wxString(_T("  Surface Rendering  ")));
+	//Carolina: "Surface Rendering" label recently added
+	//wxStaticText* txt = new wxStaticText(this, -1, wxString(_T("  Surface Rendering  ")));
 	wxAuiPaneInfo paneinfo;
-	wxauimanager->AddPane(txt,paneinfo.ToolbarPane().Top());
+	//wxauimanager->AddPane(txt,paneinfo.ToolbarPane().Top());
 	wxauimanager->AddPane(_toolb,paneinfo.ToolbarPane().Top());
 
 	wxauimanager->Update();
 	createFileChooser();
 }
 wxMaracasSurfaceRendering::~wxMaracasSurfaceRendering( ){
-
 	delete _toolb;
 }
 
@@ -62,8 +59,6 @@ std::string wxMaracasSurfaceRendering::getPath(){
 	return _path;
 }
 
-
-
 void wxMaracasSurfaceRendering::createFileChooser(){
 
 }
@@ -183,7 +178,7 @@ void wxMaracasSurfaceRendering::loadPropMHD(wxString filename, wxString dataname
 
 void wxMaracasSurfaceRendering::addPropMHD(vtkImageData* imgdata, std::string dataname){
 	try{
-		int id = surrendmanager->addPropMHD(imgdata,dataname);
+		int id = surrendmanager->addPropMHD(-1, imgdata,dataname);
 		if(id!=-1){
 
 			wxMaracasSurfaceRenderingPanel* controlpan = new wxMaracasSurfaceRenderingProp3DMHD(this, id, false, -1);
@@ -214,7 +209,7 @@ void wxMaracasSurfaceRendering::loadProp3D(wxString filename, wxString dataname)
 
 void wxMaracasSurfaceRendering::addProp3D(vtkProp3D* prop3D, std::string dataname){
 	try{
-		int id = surrendmanager->addProp3D(prop3D,dataname);
+		int id = surrendmanager->addProp3D(-1, prop3D,dataname);
 		if(id!=-1){
 			wxMaracasSurfaceRenderingPanel* controlpan = new wxMaracasSurfaceRenderingProp3D(this, id, false, -1);
 			addSurfaceRenderingPanel(controlpan, dataname);