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=d725af03e25b41e03b212c26068be2c04dacd270;hp=9ed39f0dd062afb368733c35627e031c98f863cf;hpb=28c74ab5eb531ce001260e9bc3fcb0151fcfc56b;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
index 9ed39f0..ceffcaf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx
@@ -24,10 +24,9 @@ wxMaracasRendererView::wxMaracasRendererView(wxWindow* parent,std::string path)
 
 	wxauimanager = new wxAuiManager(this);
 
+	_idCount = 0;
 	_path = path;
 
-	wxtabs = new wxMaracasRenderTabbedPanel(this);
-
 	std::string iconsdir = path;
 	iconsdir+="/data/Icons";
 	this->_toolb = new ToolBarRenderer(this,iconsdir);
@@ -48,15 +47,7 @@ wxMaracasRendererView::~wxMaracasRendererView( )
 }
 
 /**
-**
-**/
-std::string wxMaracasRendererView::getPath()
-{
-	return _path;
-}
-
-/**
-**
+** Gets class instance correponding to given parameters
 **/
 wxMaracasRendererView* wxMaracasRendererView::getInstance(wxWindow* parent,std::string path)
 {
@@ -68,7 +59,7 @@ wxMaracasRendererView* wxMaracasRendererView::getInstance(wxWindow* parent,std::
 }
 
 /**
-**
+** Gets class intance
 **/
 wxMaracasRendererView* wxMaracasRendererView::getInstance()
 {
@@ -76,43 +67,40 @@ wxMaracasRendererView* wxMaracasRendererView::getInstance()
 }
 
 /**
-**
+** Gets path for the given panel
 **/
-void wxMaracasRendererView::setRenderer(vtkRenderer*  renderer)
+std::string wxMaracasRendererView::getPath()
 {
-	wxtabs->setRenderer(renderer);
+	return _path;
 }
 
 /**
-** Adds or removes a volume rendering actor
+** Returns internal panel
 **/
-void wxMaracasRendererView::addRemoveActorVol(int id, bool addremove)
+wxMaracasRenderTabbedPanel* wxMaracasRendererView::getTabbedPanel(int id) throw(char*)
 {
-	wxtabs->addRemoveActorV(id, addremove);
-}
+	int i;
+	for(i = 0; i < (int)tabsVector.size(); i++)
+	{
+		if(tabsVector[i]->getPropIdV() == id)
+			return tabsVector[i];
+	}
+	throw "id not found";
 
-/**
-** Adds or removes a surface rendering actor
-**/
-void wxMaracasRendererView::addRemoveSurf1Actor(int id, bool addremove)
-{
-	wxtabs->addRemoveActorSA(id, addremove);
+	return NULL;
 }
 
 /**
-** Adds or removes a surface rendering actor
+**
 **/
-void wxMaracasRendererView::addRemoveSurf2Actor(int id, bool addremove)
+void wxMaracasRendererView::setRenderer(vtkRenderer* renderer)
 {
-	wxtabs->addRemoveActorSB(id, addremove);
+	_renderer = renderer;
 }
 
-/**
-** Adds or removes a surface rendering actor
-**/
-void wxMaracasRendererView::addRemoveSurf3Actor(int id, bool addremove)
+void wxMaracasRendererView::setVtkBaseView(wxVtk3DBaseView* vbv)
 {
-	wxtabs->addRemoveActorSC(id, addremove);
+	baseView = vbv;
 }
 
 /**
@@ -122,29 +110,34 @@ 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);
+
 		if(filename.EndsWith(mhd))
 		{
-			addPanels(pathfile, filename);
+			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);
 		}
 	}
 	delete fildial;
 }
-
 /**
 ** Constructs and adds internal panel
 **/
-void wxMaracasRendererView::addPanels(wxString pathfile, wxString filename)
+void wxMaracasRendererView::addPanels(wxMaracasRenderTabbedPanel* wxtabs, vtkImageData* img, std::string pathfile, std::string filename)
 {
 	wxString s(filename.c_str(),wxConvUTF8);
 	
-	wxtabs->createControls(pathfile, filename);
+	wxtabs->createControls(img, pathfile, filename);
+	
 	wxAuiPaneInfo paneinfo;
 	wxauimanager->AddPane(wxtabs, paneinfo.DefaultPane().Centre().DestroyOnClose().Caption(s));
 	wxauimanager->Update();
@@ -153,17 +146,31 @@ void wxMaracasRendererView::addPanels(wxString pathfile, wxString filename)
 /**
 ** Returns internal panel
 **/
-wxMaracasRenderTabbedPanel* wxMaracasRendererView::getTabbedPanel()
+void wxMaracasRendererView::addVolumes(vtkImageData* img, std::string pathfile, std::string filename)
 {
-	return wxtabs;
-}
+	wxMaracasRenderTabbedPanel* wxtabs = new wxMaracasRenderTabbedPanel(this, _idCount, baseView);
+	wxtabs->setRenderer(_renderer);
+
+	tabsVector.push_back(wxtabs);
+	addPanels(wxtabs, img, pathfile, filename);	
 
+	_idCount++;
+}
 /**
 ** Deletes current volume
 **/
 void wxMaracasRendererView::deleteVolume(int volid)
 {
-	wxtabs->deleteVolume(volid);
+	
+	getTabbedPanel(volid)->deleteVolume(volid);
+}
+
+/**
+** Gets opened file names
+**/
+std::vector<std::string> wxMaracasRendererView::getFiles()
+{
+	return files;
 }
 
 /**
@@ -179,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();