X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRendererView.cxx;h=ceffcafe4934f645e20586758ea77589b1945479;hb=5380f9e66daf440f27f33bb060e5ae1a646612cd;hp=a99f3d08793af11227e74643d5d8e7fb9adce1ca;hpb=bee98ac008a4469f1ce8cbf67d178ec8561e19c0;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
index a99f3d0..ceffcaf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
@@ -24,6 +24,7 @@ wxMaracasRendererView::wxMaracasRendererView(wxWindow* parent,std::string path)
 
 	wxauimanager = new wxAuiManager(this);
 
+	_idCount = 0;
 	_path = path;
 
 	std::string iconsdir = path;
@@ -76,10 +77,10 @@ std::string wxMaracasRendererView::getPath()
 /**
 ** Returns internal panel
 **/
-wxMaracasRenderTabbedPanel* wxMaracasRendererView::getTabbedPanel(int id)throw(char*)
+wxMaracasRenderTabbedPanel* wxMaracasRendererView::getTabbedPanel(int id) throw(char*)
 {
 	int i;
-	for(i = 0; i < (tabsVector.size()); i++)
+	for(i = 0; i < (int)tabsVector.size(); i++)
 	{
 		if(tabsVector[i]->getPropIdV() == id)
 			return tabsVector[i];
@@ -92,11 +93,16 @@ wxMaracasRenderTabbedPanel* wxMaracasRendererView::getTabbedPanel(int id)throw(c
 /**
 **
 **/
-void wxMaracasRendererView::setRenderer(vtkRenderer*  renderer)
+void wxMaracasRendererView::setRenderer(vtkRenderer* renderer)
 {
 	_renderer = renderer;
 }
 
+void wxMaracasRendererView::setVtkBaseView(wxVtk3DBaseView* vbv)
+{
+	baseView = vbv;
+}
+
 /**
 ** Called when an image file is opened
 **/
@@ -104,12 +110,12 @@ void wxMaracasRendererView::onLoadImageFile()
 {
 	wxString mhd(_T("mhd"));	
 
-	wxFileDialog* fildial = new wxFileDialog(this, wxString(_T("Select a MHD file")),wxString(_T("")),
-		wxString(_T("")),wxString(_T("MHD files (*.mhd)|*.mhd")) );
+	wxFileDialog* fildial = new wxFileDialog(this, wxString(_T("Select a MHD file")), wxString(_T("")),
+					wxString(_T("")), wxString(_T("MHD files (*.mhd)|*.mhd")) );
 
 	if(fildial->ShowModal()==wxID_OK)
 	{
-        wxString filename = fildial->GetFilename();
+        	wxString filename = fildial->GetFilename();
 		files.push_back( std::string(filename.mb_str()) );
 		wxString pathfile(fildial->GetDirectory() + _T("/") + filename);
 
@@ -117,6 +123,7 @@ void wxMaracasRendererView::onLoadImageFile()
 		{
 			std::string sPath = std::string(pathfile.mb_str());
 			std::string sFileName = std::string(filename.mb_str());
+			printf("wxMaracasRendererView::onLoadImageFile->Opening file... \n");
 			addVolumes(NULL, sPath, sFileName);
 		}
 	}
@@ -141,11 +148,13 @@ void wxMaracasRendererView::addPanels(wxMaracasRenderTabbedPanel* wxtabs, vtkIma
 **/
 void wxMaracasRendererView::addVolumes(vtkImageData* img, std::string pathfile, std::string filename)
 {
-	wxMaracasRenderTabbedPanel* wxtabs = new wxMaracasRenderTabbedPanel(this);
+	wxMaracasRenderTabbedPanel* wxtabs = new wxMaracasRenderTabbedPanel(this, _idCount, baseView);
 	wxtabs->setRenderer(_renderer);
 
 	tabsVector.push_back(wxtabs);
 	addPanels(wxtabs, img, pathfile, filename);	
+
+	_idCount++;
 }
 /**
 ** Deletes current volume
@@ -156,38 +165,6 @@ void wxMaracasRendererView::deleteVolume(int volid)
 	getTabbedPanel(volid)->deleteVolume(volid);
 }
 
-/**
-** Adds or removes a volume rendering actor
-**/
-void wxMaracasRendererView::addRemoveActorVol(int id, bool addremove)
-{
-	//wxtabs->addRemoveActorV(id, addremove);
-}
-
-/**
-** Adds or removes a surface rendering actor
-**/
-void wxMaracasRendererView::addRemoveSurf1Actor(int id, bool addremove)
-{
-	//wxtabs->addRemoveActorSA(id, addremove);
-}
-
-/**
-** Adds or removes a surface rendering actor
-**/
-void wxMaracasRendererView::addRemoveSurf2Actor(int id, bool addremove)
-{
-	//wxtabs->addRemoveActorSB(id, addremove);
-}
-
-/**
-** Adds or removes a surface rendering actor
-**/
-void wxMaracasRendererView::addRemoveSurf3Actor(int id, bool addremove)
-{
-	//wxtabs->addRemoveActorSC(id, addremove);
-}
-
 /**
 ** Gets opened file names
 **/
@@ -209,15 +186,6 @@ ToolBarRenderer::ToolBarRenderer(wxWindow * parent,std::string iconsdir)
 	wxBitmap bitmap0(OpenImage_xpm);
 	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);
-	this->AddTool(2, wxString(_T("test")),*bitmap2);	*/
-
-	/*iconfil = iconsdir;
-	iconfil+= "/Open.png";
-	wxBitmap* bitmap30 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
-	this->AddTool(30, wxString(_T("test")),*bitmap30);*/
-
 	this->Realize();
 
 	_evthand = new ToolBarEventHandlerRenderer();