X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FwxManualPaintPanel.cpp;h=2ae9cf5dd2066fb282be810b96105e70d159224e;hb=5380f9e66daf440f27f33bb060e5ae1a646612cd;hp=40dcd5f8b82194a728de194601cc10de664a66f7;hpb=965c602117e9de99019d49bd78ca1d707a1a6bd2;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
index 40dcd5f..2ae9cf5 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
@@ -1,142 +1,521 @@
-
 #include "wxManualPaintPanel.h"
 #include <wx/radiobox.h>
 
-wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent)
- : wxPanel(parent, -1)
+wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
+		: wxPanel( parent, -1 )
 {
-
-    wxPanel	*panel			= this;
-    wxSizer *sizer			= NULL;
+	wxSizer *sizer = new wxFlexGridSizer( 1 );
 
 	// Widget interface
-	wxStaticText    *tittleText		= new wxStaticText(panel, -1, _T("             Manual Paint"));
-	wxStaticText    *txtBrushSize   = new wxStaticText(panel, -1, wxString(_T("  Brush size  ")));
-                     sldBrushSize   = new wxSlider(panel, -1, 1, 1, 20, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
-	wxStaticText    *txtGrayLevel   = new wxStaticText(panel, -1, wxString(_T("  Gray Level  ")));
-                     sldGrayLevel   = new wxSlider(panel, -1, 0, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
-                     graylevelCtrl  = new wxTextCtrl(panel , -1);
+	wxStaticText *tittleText = new wxStaticText( this, -1,
+		_T("             Manual Paint") );
+	//Title
+	sizer->Add( tittleText );
+	//giving some blank spaces
+	sizer->Add( new wxStaticText( this, -1, _T("             ") ) );
+
+	this->ConfigureBrushToolRadioButton( );
+	this->Configure2D3DRadioButton( );
+	this->ConfigureBrushFormRadioButton( );
+	this->ConfigureRangeBar( );
+	this->ConfigureGrayLevelSld( );
+	this->ConfigureBrushSizeSld( );
+	this->ConfigureDistanceFillSld( );
+	this->ConfigureTolFillSld( );
+	this->ConfigureEditButtons( );
 
-	wxString lst2D3D[2];
-	lst2D3D[0]=_T("2D circle");
-	lst2D3D[1]=_T("3D sphere");
-	wxRadioBox * rb2D3D = new wxRadioBox(panel, -1, _T("2D / 3D"), wxDefaultPosition, wxSize(270,45), 2 , lst2D3D,  2, wxRA_SPECIFY_COLS);
-    rb2D3D->SetSelection(1);
-    rb2D3D->Disable();
+	//Buttons
+	wxStaticText *editButtonsText = new wxStaticText( this, -1,
+		_T("Edit Buttons") );
+	sizer->Add( editButtonsText );
+	this->_buttonsSizer = new wxFlexGridSizer( 4 );
+	this->_buttonsSizer->Add( _btnUndo, 1, wxGROW );
+	this->_buttonsSizer->Add( _btnRedo, 1, wxGROW );
+	this->_buttonsSizer->Add( _btnCopy, 1, wxGROW );
 
-	wxString lstBrushForm[2];
-	lstBrushForm[0]=_T("rectangle/cube");
-	lstBrushForm[1]=_T("circle/sphere");
-	wxRadioBox * rbBrushForm = new wxRadioBox(panel, -1, _T("Brush form"), wxDefaultPosition, wxSize(270,45), 2 , lstBrushForm,  2, wxRA_SPECIFY_COLS);
-    rbBrushForm->Disable();
+	this->_gConfigSizer = new wxFlexGridSizer( 1 );
+	//BrushTool Radio Button
+	//giving blank space
+	this->_gConfigSizer->Add(
+		new wxStaticText( this, -1, _T("             ") ) );
+	//end of blank space
+	this->_gConfigSizer->Add( _rbBrushTool, 1, wxGROW );
+	//2D/3D Radio Button
+	this->_gConfigSizer->Add( _rb2D3D, 1, wxGROW );
+	//RangeBar
+	this->_gConfigSizer->Add(
+		new wxStaticText( this, -1, _T( "Select Range" ) ), 1, wxGROW );
+	this->_gConfigSizer->Add( _mBarSlices, 1, wxGROW );
+	//GrayLevel Slider
+	this->_gConfigSizer->Add( _txtGrayLevel );
+	wxFlexGridSizer *sizerGrayLevel = new wxFlexGridSizer( 2, wxHORIZONTAL );
+	sizerGrayLevel->Add( _sldGrayLevel, 1, wxGROW );
+	sizerGrayLevel->Add( _graylevelCtrl, 1,
+		wxALIGN_BOTTOM | wxALIGN_LEFT | wxALL, 5 );
+	this->_gConfigSizer->Add( sizerGrayLevel, 1, wxGROW );
 
-	wxString lstBrushTool[2];
-	lstBrushTool[0]=_T("Pensil");
-	lstBrushTool[1]=_T("Fill");
-	wxRadioBox  *rbBrushTool    = new wxRadioBox(panel, -1, _T("Brush tool"), wxDefaultPosition, wxSize(270,45), 2 , lstBrushTool,  2, wxRA_SPECIFY_COLS);
-    rbBrushTool->Disable();
+	//Brush
+	this->_brushSizer = new wxFlexGridSizer( 1 );
+	//giving blank space
+	this->_brushSizer->Add( new wxStaticText( this, -1, _T("             ") ) );
+	//end of blank space
+	this->_brushSizer->Add(
+		new wxStaticText( this, -1, _T("Brush Settings") ) );
+	//BrushSize Slider
+	this->_brushSizer->Add( _txtBrushSize );
+	wxFlexGridSizer *sizersdlBrushSize = new wxFlexGridSizer( 2, wxHORIZONTAL );
+	sizersdlBrushSize->Add( _sldBrushSize, 1, wxGROW );
+	sizersdlBrushSize->Add( _BrushSizeCtrl, 1,
+		wxALIGN_BOTTOM | wxALIGN_LEFT | wxALL, 5 );
+	this->_brushSizer->Add( sizersdlBrushSize );
+	//BrushForm RadioButton
+	this->_brushSizer->Add( _rbBrushForm, 1, wxGROW );
+	//Fill
+	this->_FillSizer = new wxFlexGridSizer( 1 );
+	//giving blank space
+	this->_FillSizer->Add( new wxStaticText( this, -1, _T("             ") ) );
+	//end of blank space
+	this->_FillSizer->Add( new wxStaticText( this, -1, _T("Fill Settings") ) );
+	//ToleranceFill
+	this->_FillSizer->Add( _txtToleranceFill );
+	wxFlexGridSizer *sizerTolerance = new wxFlexGridSizer( 2 );
+	sizerTolerance->Add( _sldToleranceFill, 1, wxGROW );
+	sizerTolerance->Add( _tolerancefillCtrl, 1,
+		wxALIGN_BOTTOM | wxALIGN_LEFT | wxALL, 5 );
+	this->_FillSizer->Add( sizerTolerance, 1, wxGROW );
+	//Distance Fill
+	this->_FillSizer->Add( _txtDistanceFill );
+	wxFlexGridSizer *sizerDistance = new wxFlexGridSizer( 2 );
+	sizerDistance->Add( _sldDistanceFill, 1, wxGROW );
+	sizerDistance->Add( _distancefillCtrl, 1,
+		wxALIGN_BOTTOM | wxALIGN_LEFT | wxALL, 5 );
+	this->_FillSizer->Add( sizerDistance );
 
-	wxButton     *btnCopy       = new wxButton( panel, -1, _T("Copy"));
-    btnCopy->Disable();
-	wxButton     *btnUndo       = new wxButton( panel, -1, _T("Undo"));
-    btnUndo->Disable();
+	sizer->Add( _buttonsSizer );
+	sizer->Add( _gConfigSizer );
+	sizer->Add( _brushSizer );
+	sizer->Add( _FillSizer );
 
-    Connect(sldBrushSize->GetId()   , wxEVT_SCROLL_THUMBRELEASE	        , (wxObjectEventFunction) &wxManualPaintPanel::OnBrushSize);
-    Connect(sldGrayLevel->GetId()   , wxEVT_SCROLL_THUMBRELEASE	        , (wxObjectEventFunction) &wxManualPaintPanel::OnSldGrayLevel);
-    Connect(graylevelCtrl->GetId()  , wxEVT_COMMAND_TEXT_UPDATED	    , (wxObjectEventFunction) &wxManualPaintPanel::OnCtrTxtGrayLevel);
+	this->ConnectComponents( ); //DFCH
+	this->_FillSizer->Show( false );
 
-    Connect(rb2D3D->GetId()         , wxEVT_COMMAND_RADIOBOX_SELECTED 	, (wxObjectEventFunction) &wxManualPaintPanel::On2D3D);
-    Connect(rbBrushForm->GetId()    , wxEVT_COMMAND_RADIOBOX_SELECTED 	, (wxObjectEventFunction) &wxManualPaintPanel::OnBrushForm);
-    Connect(rbBrushTool->GetId()    , wxEVT_COMMAND_RADIOBOX_SELECTED 	, (wxObjectEventFunction) &wxManualPaintPanel::OnBrushTool);
-	Connect(btnCopy->GetId()	    , wxEVT_COMMAND_BUTTON_CLICKED      , (wxObjectEventFunction) &wxManualPaintPanel::OnCopy);
-	Connect(btnUndo->GetId()	    , wxEVT_COMMAND_BUTTON_CLICKED      , (wxObjectEventFunction) &wxManualPaintPanel::OnUndo);
+	this->SetSizer( sizer );
+	this->SetAutoLayout( true );
+	this->Layout( );
 
-	wxFlexGridSizer *sizer1         = new wxFlexGridSizer(1);
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(tittleText);
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(txtBrushSize);
-    sizer1->Add(sldBrushSize, 1, wxGROW );
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(txtGrayLevel);
-    sizer1->Add(sldGrayLevel, 1, wxGROW );
-    sizer1->Add(graylevelCtrl);
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(rb2D3D, 1, wxGROW );
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(rbBrushForm, 1, wxGROW );
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(rbBrushTool, 1, wxGROW );
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(btnCopy, 1, wxGROW );
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(btnUndo, 1, wxGROW );
+}
 
-    sizer = sizer1;
-    panel->SetSizer(sizer);
-    panel->SetAutoLayout(true);
-    panel->Layout();
+//---------------------------------------------------------------------------
+wxManualPaintPanel::~wxManualPaintPanel( )
+{
+}
+
+//--------------------------------------------------------------------------
+
+//Panel Config
+void wxManualPaintPanel::ConfigureBrushToolRadioButton( )
+{
+	wxString lstBrushForm[ 2 ];
+	lstBrushForm[ 0 ] = _T("rectangle/cube");
+	lstBrushForm[ 1 ] = _T("circle/sphere");
+	_rbBrushForm = new wxRadioBox( this, -1, _T("Brush form"),
+		wxDefaultPosition, wxSize( 270, 45 ), 2, lstBrushForm, 2,
+		wxRA_SPECIFY_COLS );
+}
+//--------------------------------------------------------------------------
+void wxManualPaintPanel::Configure2D3DRadioButton( )
+{
+	wxString lst2D3D[ 2 ];
+	lst2D3D[ 0 ] = _T("2D");
+	lst2D3D[ 1 ] = _T("3D");
+	_rb2D3D = new wxRadioBox( this, -1, _T("2D / 3D"), wxDefaultPosition,
+		wxSize( 270, 45 ), 2, lst2D3D, 2, wxRA_SPECIFY_COLS );
+	_rb2D3D->SetSelection( 1 );
+
+}
+
+//--------------------------------------------------------------------------
+void wxManualPaintPanel::ConfigureBrushFormRadioButton( )
+{
+	wxString lstBrushTool[ 2 ];
+	lstBrushTool[ 0 ] = _T("Brush");
+	lstBrushTool[ 1 ] = _T("Fill");
+	_rbBrushTool = new wxRadioBox( this, -1, _T("Brush tool"),
+		wxDefaultPosition, wxSize( 270, 45 ), 2, lstBrushTool, 2,
+		wxRA_SPECIFY_COLS );
+}
+
+//--------------------------------------------------------------------------
+void wxManualPaintPanel::ConfigureRangeBar( )
+{
+	//DFCH -- BarSlices
+	double range[ 2 ];
+	GetScalarRange( range );
+	int min = 0; //range[0];
+	int max = 6000; //range[1];
+	_mBarSlices = new mBarRange( this, 70, 65 );
+	_mBarSlices->SetMin( 0 );
+	_mBarSlices->SetStart( 0 );
+	_mBarSlices->SetOrientation( true );
+	_mBarSlices->setActiveStateTo( true );
+	_mBarSlices->setVisibleLabels( true );
+	_mBarSlices->setDeviceEndMargin( 10 );
+	_mBarSlices->setDeviceBlitStart( 10, 10 );
+	_mBarSlices->setIfWithActualDrawed( false );
+	_mBarSlices->setRepresentedValues( min, max );
+	_mBarSlices->SetStart( min );
+	_mBarSlices->SetEnd( max );
+	_mBarSlices->Update( );
+	//DFCH -- End BarSlices
+}
+//--------------------------------------------------------------------------
+void wxManualPaintPanel::ConfigureGrayLevelSld( )
+{
+	_txtGrayLevel = new wxStaticText( this, -1,
+		wxString( _T("  Gray Level  ") ) );
+	_sldGrayLevel = new wxSlider( this, -1, 0, 0, 50, wxDefaultPosition,
+		wxDefaultSize, wxSL_LABELS );
+	_sldGrayLevel->SetMinSize( wxSize( 200, -1 ) );
+	_sldGrayLevel->SetMaxSize( wxSize( 200, -1 ) );
+	_graylevelCtrl = new wxSpinCtrl( this, wxID_ANY, wxEmptyString,
+		wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 50, 0 );
+}
+//--------------------------------------------------------------------------
+void wxManualPaintPanel::ConfigureBrushSizeSld( )
+{
+	_txtBrushSize = new wxStaticText( this, -1,
+		wxString( _T("  Brush size  ") ) );
+	_sldBrushSize = new wxSlider( this, -1, 1, 1, 20, wxDefaultPosition,
+		wxDefaultSize, wxSL_LABELS );
+	_BrushSizeCtrl = new wxSpinCtrl( this, wxID_ANY, wxEmptyString,
+		wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 20, 0 );
+	_sldBrushSize->SetMinSize( wxSize( 200, -1 ) );
+	_sldBrushSize->SetMaxSize( wxSize( 200, -1 ) );
+}
+//--------------------------------------------------------------------------
+void wxManualPaintPanel::ConfigureDistanceFillSld( )
+{
+	_txtDistanceFill = new wxStaticText( this, -1,
+		wxString( _T("  Distance fill  ") ) );
+	_sldDistanceFill = new wxSlider( this, -1, 500, 1, 500, wxDefaultPosition,
+		wxDefaultSize, wxSL_LABELS );
+	_sldDistanceFill->SetMinSize( wxSize( 200, -1 ) );
+	_sldDistanceFill->SetMaxSize( wxSize( 200, -1 ) );
+	_distancefillCtrl = new wxSpinCtrl( this, wxID_ANY, wxEmptyString,
+		wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 500, 500 );
+	_txtDistanceFill->Disable( );
+	_sldDistanceFill->Disable( );
+	_distancefillCtrl->Disable( );
+}
+//--------------------------------------------------------------------------
+void wxManualPaintPanel::ConfigureTolFillSld( )
+{
+	_txtToleranceFill = new wxStaticText( this, -1,
+		wxString( _T("  Tolerance fill  ") ) );
+	_sldToleranceFill = new wxSlider( this, -1, 50, 0, 50, wxDefaultPosition,
+		wxDefaultSize, wxSL_LABELS );
+	_sldToleranceFill->SetMinSize( wxSize( 200, -1 ) );
+	_sldToleranceFill->SetMaxSize( wxSize( 200, -1 ) );
+	_tolerancefillCtrl = new wxSpinCtrl( this, wxID_ANY, wxEmptyString,
+		wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 50, 50 );
+	_txtToleranceFill->Disable( );
+	_sldToleranceFill->Disable( );
+	_tolerancefillCtrl->Disable( );
+
+}
+//--------------------------------------------------------------------------
+void wxManualPaintPanel::ConfigureEditButtons( )
+{
+	_btnCopy = new wxButton( this, -1, _T("Copy") );
+	_btnCopy->Disable( );
+	_btnUndo = new wxButton( this, -1, _T("Undo") );
+	_btnRedo = new wxButton( this, -1, _T("Redo") );
+	//btnUndo->Disable();
+}
+//--------------------------------------------------------------------------
+
+/*
+ * The following function allows the management of the events
+ */
+void wxManualPaintPanel::ConnectComponents( ) //DFCH
+{
+	this->Connect(
+		_sldBrushSize->GetId( ),
+		wxEVT_SCROLL_THUMBRELEASE,
+		(wxObjectEventFunction) (void(wxPanel::*)(
+			wxScrollEvent& )) (&wxManualPaintPanel::OnBrushSize) );this ->Connect (_sldGrayLevel->GetId(),
+				wxEVT_SCROLL_THUMBRELEASE,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxScrollEvent&)) &wxManualPaintPanel::OnSldGrayLevel);
+		this->Connect
+		(
+				_graylevelCtrl->GetId(),
+				wxEVT_COMMAND_TEXT_UPDATED,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxCommandEvent&)) &wxManualPaintPanel::OnCtrTxtGrayLevel);
+
+		this->Connect (
+				_sldToleranceFill->GetId(),
+				wxEVT_SCROLL_THUMBRELEASE,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxScrollEvent&)) &wxManualPaintPanel::OnSldToleranceFill);this->Connect
+		(
+				_tolerancefillCtrl->GetId(),
+				wxEVT_COMMAND_TEXT_UPDATED,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxCommandEvent&)) &wxManualPaintPanel::OnCtrTxtToleranceFill);
+
+		this->Connect (
+				_sldDistanceFill->GetId(),
+				wxEVT_SCROLL_THUMBRELEASE,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxScrollEvent&)) &wxManualPaintPanel::OnSldDistanceFill);this->Connect
+		(
+				_distancefillCtrl->GetId(),
+				wxEVT_COMMAND_TEXT_UPDATED,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxCommandEvent&)) &wxManualPaintPanel::OnCtrTxtDistanceFill);
+
+		this->Connect (
+				_rb2D3D->GetId(),
+				wxEVT_COMMAND_RADIOBOX_SELECTED,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxCommandEvent&)) &wxManualPaintPanel::On2D3D);this->Connect
+		(
+				_rbBrushForm->GetId(),
+				wxEVT_COMMAND_RADIOBOX_SELECTED,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxCommandEvent&)) &wxManualPaintPanel::OnBrushForm);this->Connect
+		(
+				_rbBrushTool->GetId(),
+				wxEVT_COMMAND_RADIOBOX_SELECTED,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxCommandEvent&)) &wxManualPaintPanel::OnBrushTool);this->Connect
+		(
+				_btnCopy->GetId(),
+				wxEVT_COMMAND_BUTTON_CLICKED,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxCommandEvent&)) &wxManualPaintPanel::OnCopy);
+
+		this->Connect (
+				_btnUndo->GetId(),
+				wxEVT_COMMAND_BUTTON_CLICKED,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxCommandEvent&)) &wxManualPaintPanel::OnUndo);
+		this->Connect(_btnRedo->GetId(),
+				wxEVT_COMMAND_BUTTON_CLICKED,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxCommandEvent&)) &wxManualPaintPanel::OnRedo); //DFCH
+
+		this->Connect(
+				_mBarSlices->GetId(),
+				wxEVT_TSBAR,
+				(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onBarrange);
+		//			Connect(modBarRange->GetId(),98765,(wxObjectEventFunction) (wxCommandEventFunction)  &wxWidgetSliderMinMax::onActualChange_Bar );
+		this->Connect(
+				_mBarSlices->GetId(),
+				wxEVT_TSBAR_ACTUAL,
+				(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onActualChange_Bar);
+		this->Connect(
+				_mBarSlices->GetId(),
+				wxEVT_TSBAR_START,
+				(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onStartChange_Bar);
+		this->Connect(
+				_mBarSlices->GetId(),
+				wxEVT_TSBAR_END,
+				(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onEndChange_Bar);
+		this->Connect(
+				_mBarSlices->GetId(),
+				wxEVT_SELECTION_END,
+				(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onSelectionEnd);
+		this->Connect(
+				_mBarSlices->GetId(),
+				wxEVT_TSBAR_MOVED,
+				(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onMovedBar);
+		this->Connect
+		(
+				_BrushSizeCtrl->GetId(),
+				wxEVT_COMMAND_TEXT_UPDATED,
+				(wxObjectEventFunction) (void(wxPanel::*)(
+								wxCommandEvent&)) &wxManualPaintPanel::OnCtrBrushSize);
+
+	}
+
+//---------------------------------------------------------------------------
+void wxManualPaintPanel::OnBrushSize( wxScrollEvent& event )
+{
+	SetBrushSize( this->_sldBrushSize->GetValue( ) );
+	wxString text;
+	text.Printf( wxT("%d"), this->_sldBrushSize->GetValue( ) );
+	_BrushSizeCtrl->SetValue( text );
 }
 
 //---------------------------------------------------------------------------
-wxManualPaintPanel::~wxManualPaintPanel()
+void wxManualPaintPanel::OnSldGrayLevel( wxScrollEvent& event )
 {
+	SetGrayLevel( (double) ( _sldGrayLevel->GetValue( )) );
+
+	wxString text;
+	text.Printf( wxT("%d"), _sldGrayLevel->GetValue( ) );
+	_graylevelCtrl->SetValue( text );
 }
 
 //---------------------------------------------------------------------------
-void wxManualPaintPanel::OnBrushSize(wxScrollEvent& event)
+void wxManualPaintPanel::OnCtrTxtGrayLevel( wxCommandEvent &event )
 {
-    printf("EED %p wxManualPaintPanel::OnBrushSize\n", this);
-    SetBrushSize( sldBrushSize->GetValue() );
+	int graylevel = this->_graylevelCtrl->GetValue( );
+	this->_sldGrayLevel->SetValue( graylevel );
+	SetGrayLevel( graylevel );
 }
 
 //---------------------------------------------------------------------------
-void wxManualPaintPanel::OnSldGrayLevel(wxScrollEvent& event)
+void wxManualPaintPanel::OnSldDistanceFill( wxScrollEvent& event )
 {
-    printf("EED %p wxManualPaintPanel::OnGrayLevel\n", this);
-    SetGrayLevel( (double)(sldGrayLevel->GetValue()) );
+	SetDistanceFill( (double) ( _sldDistanceFill->GetValue( )) );
 
-    wxString text;
-    text.Printf( wxT("%d"), sldGrayLevel->GetValue() );
-    graylevelCtrl->SetValue(text);
+	wxString text;
+	text.Printf( wxT("%d"), _sldDistanceFill->GetValue( ) );
+	_distancefillCtrl->SetValue( text );
 }
 
 //---------------------------------------------------------------------------
-void wxManualPaintPanel::OnCtrTxtGrayLevel(wxCommandEvent &event)
+void wxManualPaintPanel::OnCtrTxtDistanceFill( wxCommandEvent &event )
+{
+	int distancefill = this->_distancefillCtrl->GetValue( );
+	this->_sldDistanceFill->SetValue( distancefill );
+	SetDistanceFill( distancefill );
+}
+//---------------------------------------------------------------------------
+void wxManualPaintPanel::OnCtrBrushSize( wxCommandEvent &event )
 {
-    printf("EED %p wxManualPaintPanel::OnCtrTxtGrayLevel\n", this);
+	int brushSize = _BrushSizeCtrl->GetValue( );
+	this->_sldBrushSize->SetValue( brushSize );
+	SetBrushSize( brushSize );
+}
 
-    double graylevel;
-    wxString text=graylevelCtrl->GetValue();
-    if (text.ToDouble(&graylevel))
-    {
-        SetGrayLevel( graylevel );
-    }
+//---------------------------------------------------------------------------
+void wxManualPaintPanel::OnSldToleranceFill( wxScrollEvent& event )
+{
+	SetToleranceFill( (double) ( _sldToleranceFill->GetValue( )) );
+
+	wxString text;
+	text.Printf( wxT("%d"), _sldToleranceFill->GetValue( ) );
+	_tolerancefillCtrl->SetValue( text );
 }
 
+//---------------------------------------------------------------------------
+void wxManualPaintPanel::OnCtrTxtToleranceFill( wxCommandEvent &event )
+{
+	int tolerance = _tolerancefillCtrl->GetValue( );
+	this->_sldToleranceFill->SetValue( tolerance );
+	SetToleranceFill( tolerance );
+}
+
+//---------------------------------------------------------------------------
+void wxManualPaintPanel::DisableControls( )
+{
+	_txtBrushSize->Disable( );
+	_sldBrushSize->Disable( );
+	_rbBrushForm->Disable( );
+
+	_txtToleranceFill->Disable( );
+	_sldToleranceFill->Disable( );
+	_tolerancefillCtrl->Disable( );
 
+	_txtDistanceFill->Disable( );
+	_sldDistanceFill->Disable( );
+	_distancefillCtrl->Disable( );
+}
 
 //---------------------------------------------------------------------------
-void wxManualPaintPanel::On2D3D(wxCommandEvent &event)
+void wxManualPaintPanel::On2D3D( wxCommandEvent &event )
 {
+	Set2D3D( _rb2D3D->GetSelection( ) );
 }
 
 //---------------------------------------------------------------------------
-void wxManualPaintPanel::OnBrushForm(wxCommandEvent &event)
+void wxManualPaintPanel::OnBrushForm( wxCommandEvent &event )
 {
+	SetBrushForm( _rbBrushForm->GetSelection( ) );
 }
 
 //---------------------------------------------------------------------------
-void wxManualPaintPanel::OnBrushTool(wxCommandEvent &event)
+void wxManualPaintPanel::OnBrushTool( wxCommandEvent &event )
 {
+	DisableControls( );
+	SetTool( _rbBrushTool->GetSelection( ) );
+
+	if( _rbBrushTool->GetSelection( ) == 0 ) //Brush tool
+	{
+		_txtBrushSize->Enable( );
+		_sldBrushSize->Enable( );
+		_rbBrushForm->Enable( );
+		_brushSizer->Show( true );
+		_FillSizer->Show( false );
+		this->Layout( );
+	}
+
+	if( _rbBrushTool->GetSelection( ) == 1 ) //Fill tool
+	{
+		_txtToleranceFill->Enable( );
+		_sldToleranceFill->Enable( );
+		_tolerancefillCtrl->Enable( );
+
+		_txtDistanceFill->Enable( );
+		_sldDistanceFill->Enable( );
+		_distancefillCtrl->Enable( );
+		_FillSizer->Show( true );
+		_brushSizer->Show( false );
+		this->Layout( );
+	}
 }
 
 //---------------------------------------------------------------------------
-void wxManualPaintPanel::OnCopy(wxCommandEvent &event)
+void wxManualPaintPanel::OnCopy( wxCommandEvent &event )
 {
 }
 
 //---------------------------------------------------------------------------
-void wxManualPaintPanel::OnUndo(wxCommandEvent &event)
+void wxManualPaintPanel::OnUndo( wxCommandEvent &event )
 {
+	this->_manualPaintModel->Undo( );
 }
+
+//---------------------------------------------------------------------------
+void wxManualPaintPanel::OnRedo( wxCommandEvent &event )
+{
+	this->_manualPaintModel->Redo( );
+}
+
+//--------------------------------------------------------------------------------------------------------------------------------
+// Min-Max Barrange received events
+//--------------------------------------------------------------------------------------------------------------------------------
+void wxManualPaintPanel::onBarrange( wxCommandEvent& event )
+{
+}
+void wxManualPaintPanel::onActualChange_Bar( wxCommandEvent& event )
+{
+	/*mbbtkSliderMinMax->bbSetOutputOutActual(modBarRange->GetActual());
+	 mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutActual"));*/
+}
+void wxManualPaintPanel::onStartChange_Bar( wxCommandEvent& event )
+{
+	SetRangeMin( _mBarSlices->GetStart( ) );
+}
+
+void wxManualPaintPanel::onEndChange_Bar( wxCommandEvent& event )
+{
+	SetRangeMax( _mBarSlices->GetEnd( ) );
+}
+
+void wxManualPaintPanel::onSelectionEnd( wxCommandEvent& event )
+{
+}
+
+void wxManualPaintPanel::onMovedBar( wxCommandEvent& event )
+{
+}
+//-------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+