2343 creaMaracasVisu Bug New Normal Interaction between ColorLayer and manualPaint

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualPaint / wxManualPaintPanel.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
index 2a0e6d3764ccd2d0f11fb7f4080eec64b059623e..4e8a54c403cac5fd3bbddc25d0b06d9b7708d9bc 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
@@ -39,6 +39,7 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
        //giving some blank spaces
        sizer->Add( new wxStaticText( this, -1, _T("             ") ) );
 
+       this->ConfigureActiveCBButton( );
        this->ConfigureBrushToolRadioButton( );
        this->Configure2D3DRadioButton( );
        this->ConfigureBrushFormRadioButton( );
@@ -52,7 +53,6 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
        //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 );
@@ -116,6 +116,8 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
                wxALIGN_BOTTOM | wxALIGN_LEFT | wxALL, 5 );
        this->_FillSizer->Add( sizerDistance );
 
+       sizer->Add( _activeCB );
+       sizer->Add( editButtonsText );
        sizer->Add( _buttonsSizer );
        sizer->Add( _gConfigSizer );
        sizer->Add( _brushSizer );
@@ -136,8 +138,16 @@ wxManualPaintPanel::~wxManualPaintPanel( )
 }
 
 //--------------------------------------------------------------------------
+void wxManualPaintPanel::ConfigureActiveCBButton( )
+{
+   _activeCB = new wxCheckBox (this, -1, _T("Active") );
+   _activeCB->SetValue(true);
+   SetActive( _activeCB->GetValue() );
+}
+
 
 //Panel Config
+//--------------------------------------------------------------------------
 void wxManualPaintPanel::ConfigureBrushToolRadioButton( )
 {
        wxString lstBrushForm[ 2 ];
@@ -147,6 +157,7 @@ void wxManualPaintPanel::ConfigureBrushToolRadioButton( )
                wxDefaultPosition, wxSize( 270, 45 ), 2, lstBrushForm, 2,
                wxRA_SPECIFY_COLS );
 }
+
 //--------------------------------------------------------------------------
 void wxManualPaintPanel::Configure2D3DRadioButton( )
 {
@@ -191,29 +202,33 @@ void wxManualPaintPanel::ConfigureRangeBar( )
        _mBarSlices->SetStart( min );
        _mBarSlices->SetEnd( max );
        _mBarSlices->Update( );
+
+       SetRangeMin( min );
+       SetRangeMax( max );
+
        //DFCH -- End BarSlices
 }
 //--------------------------------------------------------------------------
 void wxManualPaintPanel::ConfigureGrayLevelSld( )
 {
        _txtGrayLevel = new wxStaticText( this, -1,
-               wxString( _T("  Gray Level  ") ) );
+       wxString( _T("  Gray Level  ") ) );
        _sldGrayLevel = new wxSlider( this, -1, 0, 0, 255, wxDefaultPosition,
-               wxDefaultSize, wxSL_LABELS );
+       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, 65535, 0 );
+       wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 65535, 0 );
 }
 //--------------------------------------------------------------------------
 void wxManualPaintPanel::ConfigureBrushSizeSld( )
 {
        _txtBrushSize = new wxStaticText( this, -1,
-               wxString( _T("  Brush size  ") ) );
+       wxString( _T("  Brush size  ") ) );
        _sldBrushSize = new wxSlider( this, -1, 1, 1, 50, wxDefaultPosition,
-               wxDefaultSize, wxSL_LABELS );
+       wxDefaultSize, wxSL_LABELS );
        _BrushSizeCtrl = new wxSpinCtrl( this, wxID_ANY, wxEmptyString,
-               wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 65535, 0 );
+       wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 65535, 0 );
        _sldBrushSize->SetMinSize( wxSize( 200, -1 ) );
        _sldBrushSize->SetMaxSize( wxSize( 200, -1 ) );
 }
@@ -221,13 +236,13 @@ void wxManualPaintPanel::ConfigureBrushSizeSld( )
 void wxManualPaintPanel::ConfigureDistanceFillSld( )
 {
        _txtDistanceFill = new wxStaticText( this, -1,
-               wxString( _T("  Distance fill  ") ) );
+       wxString( _T("  Distance fill  ") ) );
        _sldDistanceFill = new wxSlider( this, -1, 50, 1, 500, wxDefaultPosition,
-               wxDefaultSize, wxSL_LABELS );
+       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, 50 );
+       wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 500, 50 );
        _txtDistanceFill->Disable( );
        _sldDistanceFill->Disable( );
        _distancefillCtrl->Disable( );
@@ -264,17 +279,14 @@ void wxManualPaintPanel::ConfigureEditButtons( )
  */
 void wxManualPaintPanel::ConnectComponents( ) //DFCH
 {
-       this->Connect(
-               _sldBrushSize->GetId( ),
+       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(),
+               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);
@@ -363,9 +375,23 @@ void wxManualPaintPanel::ConnectComponents( ) //DFCH
                                wxEVT_COMMAND_TEXT_UPDATED,
                                (wxObjectEventFunction) (void(wxPanel::*)(
                                                                wxCommandEvent&)) &wxManualPaintPanel::OnCtrBrushSize);
+               this->Connect
+               (
+                       _activeCB->GetId(),
+                       wxEVT_COMMAND_CHECKBOX_CLICKED, 
+                       (wxObjectEventFunction) (void (wxPanel::*)(wxCommandEvent&))&wxManualPaintPanel::OnActive);
 
        }
 
+
+  //-------------------------------------------------------------------------
+  void wxManualPaintPanel::OnActive(wxCommandEvent& event)
+  {
+       printf("EED wxManualPaintPanel::OnActive \n");
+       SetActive( _activeCB->GetValue() );
+  }
+
+
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::OnBrushSize( wxScrollEvent& event )
 {