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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
index 9225874..dba00aa 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/05/04 15:06:42 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2009/05/29 13:39:56 $
+  Version:   $Revision: 1.9 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -20,6 +20,9 @@
 // EOF - wxMaracasMPR.cxx
 
 #include "wxMaracasIRMView.h"
+//#include "wxMaracasIRMViewPanel.h"
+#include "wxMaracasIRMViewProp3DMHD.h"
+#include "wxMaracasIRMViewProp3D.h"
 
 #include <wx/colordlg.h>
 #include <wx/bmpbuttn.h>
@@ -206,118 +209,10 @@ void wxMaracasIRMView::deleteActor(int propid){
 	}
 }
 
-/**
-**	Implementation of viewProp3D
-**/
-
-wxMaracasIRMViewProp3D::wxMaracasIRMViewProp3D(wxWindow* parent,int propid)
-:wxMaracasIRMViewPanel(parent, propid){
-	createControls();	
-}
-
-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")));
-	Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasIRMViewProp3D::onCheckBoxChange);	
-	checkbox->SetValue(true);	
-
-	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);	
-	wxFlexGridSizer* sizeropacity = new wxFlexGridSizer(1,1,1);	
-	sizeropacity->Add(label,wxFIXED_MINSIZE);
-	sizeropacity->Add(opacity,wxFIXED_MINSIZE);
-
-	sizerirmprop->Add(sizeropacity,wxFIXED_MINSIZE);
-
-	//this->addControl(sizeropacity);
-	this->addControl(sizerirmprop);
-	
-}
-void wxMaracasIRMViewProp3D::onCheckBoxChange(wxCommandEvent& event){	
-	wxMaracasIRMView::getInstance()->addRemoveActor(this->getPropId(), checkbox->GetValue());
-}
-void wxMaracasIRMViewProp3D::onColorChange(wxCommandEvent& event){
-	wxColourDialog* colourdiag = new wxColourDialog(this);
-	if(colourdiag->ShowModal()==wxID_OK){
-		wxColour colour = colourdiag->GetColourData().GetColour();
-		_colorchoose->SetBackgroundColour(colour);
-
-		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);
-	}
-	delete colourdiag;
-}
-/*void wxMaracasIRMViewProp3D::onActionButtonPressedEliminate( wxCommandEvent& event ){	
-
-}*/
-
-void wxMaracasIRMViewProp3D::onOpacityRelease(wxScrollEvent& event ){
-
-	wxMaracasIRMView::getInstance()->changeOpacity(this->getPropId(),opacity->GetValue());
-
-}
-
-
-/**
-**	IRM viewProp3DMHD implementation
-**/
-wxMaracasIRMViewProp3DMHD::wxMaracasIRMViewProp3DMHD(wxWindow* parent, int propid)
-: wxMaracasIRMViewProp3D(parent, propid)
-{
-	
-}
-wxMaracasIRMViewProp3DMHD::~wxMaracasIRMViewProp3DMHD(){
-	//this->Show(false);
-	//wxMaracasIRMView::getInstance()->addRemoveActor(_propid, false);
-}
-void wxMaracasIRMViewProp3DMHD::createControls(int maxisovalue){
-	
-	wxFlexGridSizer* sizer = new wxFlexGridSizer(1,1,1);
 
-	wxStaticText* label = new wxStaticText(this, -1, wxString(_T("IsoValue")));
-	sizer->Add(label, wxGROW);
-	//this->addControl(label);
-	isovalue = new wxSlider(this, -1,maxisovalue,0,maxisovalue,wxDefaultPosition,wxDefaultSize,wxSL_HORIZONTAL|wxSL_LABELS);
-	sizer->Add(isovalue, wxGROW);
-	//this->addControl(isovalue);
 
-	this->addControl(sizer);	
-	Connect(isovalue->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasIRMViewProp3DMHD::onIsoValueRelease);	
-}
 
-void wxMaracasIRMViewProp3DMHD::onIsoValueRelease(wxScrollEvent& event ){
 
-	wxMaracasIRMView::getInstance()->changeIsoValue(this->getPropId(), isovalue->GetValue()/1.0);
-	
-}
 /**
 **
 **/
@@ -360,3 +255,5 @@ BEGIN_EVENT_TABLE(ToolBar, wxToolBar)
 	EVT_MENU(0, ToolBar::onLoadImageFile)    
 	   
 END_EVENT_TABLE()
+
+