X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSurfaceRendering.cxx;fp=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSurfaceRendering.cxx;h=66a580b327cddef5d952173fd7c59ba1865902b8;hb=062ae799e283a7de038b13d78eaf7d8495086378;hp=baf18a76f04eb363ce7a4e9e2cba2267a724d5d3;hpb=232ec9b6d385d293bd7fd4c70de521f25906fe39;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.cxx
index baf18a7..66a580b 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/10/15 11:56:43 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/10/16 15:17:57 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -51,13 +51,10 @@ wxMaracasSurfaceRendering::wxMaracasSurfaceRendering( wxWindow* parent,std::stri
 
 	wxauimanager->Update();
 	createFileChooser();
-
-
 }
 wxMaracasSurfaceRendering::~wxMaracasSurfaceRendering( ){
 
 	delete _toolb;
-
 }
 
 std::string wxMaracasSurfaceRendering::getPath(){
@@ -107,7 +104,6 @@ void wxMaracasSurfaceRendering::changeColor(int propid, double red, double green
 		wxMessageDialog* diag = new wxMessageDialog(this, s, s, wxICON_ERROR);
 		diag->ShowModal();
 		delete diag;
-
 	}
 }
 
@@ -133,8 +129,8 @@ void wxMaracasSurfaceRendering::onLoadImageFile(){
 		//}
 	}
 	delete fildial;
-
 }
+
 void wxMaracasSurfaceRendering::loadPropMHD(wxString filename, wxString dataname){
 
 	std::string s = std::string(filename.mb_str());
@@ -143,7 +139,6 @@ void wxMaracasSurfaceRendering::loadPropMHD(wxString filename, wxString dataname
 		s = std::string(dataname.mb_str());
 		addPropMHD(img, s);
 	}
-
 }
 
 void wxMaracasSurfaceRendering::addPropMHD(vtkImageData* imgdata, std::string dataname){
@@ -162,7 +157,6 @@ void wxMaracasSurfaceRendering::addPropMHD(vtkImageData* imgdata, std::string da
 		std::cout << "Exception : " << str << '\n';
 		wxMessageDialog* diag = new wxMessageDialog(this, wxString( str,wxConvUTF8 ), wxString( str,wxConvUTF8 ), wxICON_ERROR);
 		diag->ShowModal();
-
 	}
 }
 
@@ -175,9 +169,6 @@ void wxMaracasSurfaceRendering::loadProp3D(wxString filename, wxString dataname)
 	}else{
 		//TODO msj to the user indicating error in file
 	}
-
-
-
 }
 
 void wxMaracasSurfaceRendering::addProp3D(vtkProp3D* prop3D, std::string dataname){
@@ -192,7 +183,6 @@ void wxMaracasSurfaceRendering::addProp3D(vtkProp3D* prop3D, std::string datanam
 		wxMessageDialog* diag = new wxMessageDialog(this, wxString(str,wxConvUTF8 ), wxString(str,wxConvUTF8 ), wxICON_ERROR);
 		diag->ShowModal();
 	}
-
 }
 void wxMaracasSurfaceRendering::addSurfaceRenderingPanel(wxMaracasSurfaceRenderingPanel* surrend, std::string dataname){
 
@@ -200,8 +190,6 @@ void wxMaracasSurfaceRendering::addSurfaceRenderingPanel(wxMaracasSurfaceRenderi
 	wxAuiPaneInfo paneinfo;
 	wxauimanager->AddPane(surrend, paneinfo.DefaultPane().Centre().DestroyOnClose().Caption(s));
 	wxauimanager->Update();
-
-
 }
 
 void wxMaracasSurfaceRendering::deleteActor(int propid){
@@ -212,10 +200,6 @@ void wxMaracasSurfaceRendering::deleteActor(int propid){
 	}
 }
 
-
-
-
-
 /**
 **
 **/
@@ -223,8 +207,6 @@ void wxMaracasSurfaceRendering::deleteActor(int propid){
 ToolBar::ToolBar(wxWindow * parent,std::string iconsdir)
 : wxToolBar(parent, -1, wxDefaultPosition, wxDefaultSize)
 {
-
-
 	std::string iconfil = iconsdir;
 
 	//iconfil+= "/OpenImage.png";
@@ -245,7 +227,6 @@ ToolBar::ToolBar(wxWindow * parent,std::string iconsdir)
 
 	_evthand = new ToolBarEventHandler();
 	this->SetEventHandler(_evthand);
-
 }
 
 ToolBar::~ToolBar(void){
@@ -254,6 +235,7 @@ ToolBar::~ToolBar(void){
 ToolBarEventHandler::ToolBarEventHandler()
 : wxEvtHandler(){
 }
+
 ToolBarEventHandler::~ToolBarEventHandler(){
 }
 
@@ -262,7 +244,6 @@ void ToolBarEventHandler::onLoadImageFile(wxCommandEvent& event){
 }
 
 
-
 BEGIN_EVENT_TABLE(ToolBarEventHandler, wxEvtHandler)
 	EVT_MENU(1, ToolBarEventHandler::onLoadImageFile)
 END_EVENT_TABLE()