X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasIRMView.cxx;h=9225874c8c3042b4afbc1ff138b6d69418f172e0;hb=1bf58cfa1758464b422d1d0cca808e528043e691;hp=4242c4f20a8da4e61a0ba503d38b3e445239ae3c;hpb=540c5242ac6cd8ab330f1642b0fc82e3b49d20db;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
index 4242c4f..9225874 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasIRMView.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/14 14:48:07 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2009/05/04 15:06:42 $
+  Version:   $Revision: 1.7 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -24,6 +24,9 @@
 #include <wx/colordlg.h>
 #include <wx/bmpbuttn.h>
 
+#include <OpenImage.xpm>
+#include <Color.xpm>
+
 wxMaracasIRMView* wxMaracasIRMView::instance=NULL;
 
 wxMaracasIRMView::wxMaracasIRMView( wxWindow* parent,std::string path) 
@@ -84,7 +87,7 @@ void wxMaracasIRMView::changeOpacity(int _propid, int value){
 	irmmanager->changeOpacity(_propid,value);
 }
 
-void wxMaracasIRMView::changeIsoValue(int propid, int value){	
+void wxMaracasIRMView::changeIsoValue(int propid, double value){	
 	irmmanager->changeIsoValue(propid, value);
 }
 
@@ -191,7 +194,16 @@ void wxMaracasIRMView::addIRMViewPanel(wxMaracasIRMViewPanel* irmview, std::stri
 	wxAuiPaneInfo paneinfo;	
 	wxauimanager->AddPane(irmview, paneinfo.DefaultPane().Centre().DestroyOnClose().Caption(s));
 	wxauimanager->Update();
+	
+	
+}
 
+void wxMaracasIRMView::deleteActor(int propid){
+	try{
+		irmmanager->deleteActor(propid);
+	}catch(char* e){
+		
+	}
 }
 
 /**
@@ -203,40 +215,47 @@ wxMaracasIRMViewProp3D::wxMaracasIRMViewProp3D(wxWindow* parent,int propid)
 	createControls();	
 }
 
-wxMaracasIRMViewProp3D::~wxMaracasIRMViewProp3D(){
-	wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
+wxMaracasIRMViewProp3D::~wxMaracasIRMViewProp3D(){	
+	//wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
+	wxMaracasIRMView::getInstance()->deleteActor(_propid);
 }
 
 void wxMaracasIRMViewProp3D::createControls(){
 
+	wxFlexGridSizer* sizerirmprop = new wxFlexGridSizer(1,1,1);
+	
 	wxString choices[2];
 	choices[0] = wxString(_T("On"));
 	choices[1] = wxString(_T("Off"));
 	checkbox = new  wxCheckBox(this,-1,wxString(_T("Show Actor")));
-	this->addControl(checkbox);
-
 	Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onCheckBoxChange);	
 	checkbox->SetValue(true);	
-	
-	std::string iconfile = wxMaracasIRMView::getInstance()->getPath();
-	iconfile+= "/Data/Icons/Color.png";
-	wxBitmap* bitmap = new wxBitmap(wxString(iconfile.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);	
-	_colorchoose = new wxBitmapButton(this, -1, *bitmap,wxDefaultPosition,wxSize(30,30));	
-	Connect(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onColorChange);		
 
-	wxBoxSizer* sizercolor = new wxBoxSizer(wxVERTICAL);
-	sizercolor->Add(checkbox,wxFIXED_MINSIZE);
-	sizercolor->Add(_colorchoose,wxFIXED_MINSIZE);
-	this->addControl(sizercolor);
+	sizerirmprop->Add(checkbox,wxFIXED_MINSIZE);
 
+	//this->addControl(checkbox);	
+	
+	wxBitmap bitmap(Color_xpm);
+	_colorchoose = new wxBitmapButton(this, -1, bitmap,wxDefaultPosition,wxSize(30,30));	
+	Connect(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onColorChange);			
+	sizerirmprop->Add(_colorchoose,wxFIXED_MINSIZE);	
+
+	//sizercolor->Add(checkbox,wxFIXED_MINSIZE);
+	//sizercolor->Add(_colorchoose,wxFIXED_MINSIZE);
+	//this->addControl(sizercolor);
+	
 	
 	wxStaticText* label = new wxStaticText(this, -1, wxString(_T("Opacity")));		
 	opacity = new wxSlider(this, -1,100,0,100,wxDefaultPosition,wxDefaultSize,wxSL_HORIZONTAL|wxSL_LABELS);	
 	Connect(opacity->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onOpacityRelease);	
-	wxBoxSizer* sizeropacity = new wxBoxSizer(wxVERTICAL);	
+	wxFlexGridSizer* sizeropacity = new wxFlexGridSizer(1,1,1);	
 	sizeropacity->Add(label,wxFIXED_MINSIZE);
 	sizeropacity->Add(opacity,wxFIXED_MINSIZE);
-	this->addControl(sizeropacity);
+
+	sizerirmprop->Add(sizeropacity,wxFIXED_MINSIZE);
+
+	//this->addControl(sizeropacity);
+	this->addControl(sizerirmprop);
 	
 }
 void wxMaracasIRMViewProp3D::onCheckBoxChange(wxCommandEvent& event){	
@@ -248,9 +267,9 @@ void wxMaracasIRMViewProp3D::onColorChange(wxCommandEvent& event){
 		wxColour colour = colourdiag->GetColourData().GetColour();
 		_colorchoose->SetBackgroundColour(colour);
 
-		float r = colour.Red()/255;
-		float g = colour.Green()/255;
-		float b = colour.Blue()/255;
+		double r = (double)(colour.Red())/255.0;
+		double g = (double)(colour.Green())/255.0;
+		double b = (double)(colour.Blue())/255.0;
 		
 		wxMaracasIRMView::getInstance()->changeColor(this->getPropId(),r,g,b);
 	}
@@ -276,11 +295,12 @@ wxMaracasIRMViewProp3DMHD::wxMaracasIRMViewProp3DMHD(wxWindow* parent, int propi
 	
 }
 wxMaracasIRMViewProp3DMHD::~wxMaracasIRMViewProp3DMHD(){
-
+	//this->Show(false);
+	//wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
 }
 void wxMaracasIRMViewProp3DMHD::createControls(int maxisovalue){
-
-	wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
+	
+	wxFlexGridSizer* sizer = new wxFlexGridSizer(1,1,1);
 
 	wxStaticText* label = new wxStaticText(this, -1, wxString(_T("IsoValue")));
 	sizer->Add(label, wxGROW);
@@ -295,7 +315,7 @@ void wxMaracasIRMViewProp3DMHD::createControls(int maxisovalue){
 
 void wxMaracasIRMViewProp3DMHD::onIsoValueRelease(wxScrollEvent& event ){
 
-	wxMaracasIRMView::getInstance()->changeIsoValue(this->getPropId(), isovalue->GetValue());
+	wxMaracasIRMView::getInstance()->changeIsoValue(this->getPropId(), isovalue->GetValue()/1.0);
 	
 }
 /**
@@ -309,9 +329,10 @@ ToolBar::ToolBar(wxWindow * parent,std::string iconsdir)
 
 	std::string iconfil = iconsdir;
 
-	iconfil+= "/OpenImage.png";
-	wxBitmap* bitmap0 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
-	this->AddTool(0, wxString(_T("test")),*bitmap0);
+	//iconfil+= "/OpenImage.png";
+	//wxBitmap* bitmap0 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);
+	wxBitmap bitmap0(OpenImage_xpm);
+	this->AddTool(0, wxString(_T("test")),bitmap0);
 
 	/*iconfil+= "/Open.png";
 	wxBitmap* bitmap2 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG);