#3332 creaContours Bug New - Manual Paint UnDo ReDo with vtk update (working)

[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 57fd497a452561a4a12581e93187cf765dd599f6..0fb3c372c74a2956117d29e3ff6b4c6e4bd5c25d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
@@ -30,15 +30,12 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
                : wxPanel( parent, -1 )
 {
        wxSizer *sizer = new wxFlexGridSizer( 1 );
-
        // Widget interface
-       wxStaticText *tittleText = new wxStaticText( this, -1,
-               _T("             Manual Paint") );
+       wxStaticText *tittleText = new wxStaticText( this, -1,_T("             Manual Paint") );
        //Title
        sizer->Add( tittleText );
        //giving some blank spaces
        sizer->Add( new wxStaticText( this, -1, _T("          key A : Enable/Disable   ") ) );
-
        this->ConfigureActiveCBButton( );
        this->ConfigureBrushToolRadioButton( );
        this->Configure2D3DRadioButton( );
@@ -49,15 +46,12 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
        this->ConfigureDistanceFillSld( );
        this->ConfigureTolFillSld( );
        this->ConfigureEditButtons( );
-
        //Buttons
-       wxStaticText *editButtonsText = new wxStaticText( this, -1,
-               _T("Edit Buttons") );
-       this->_buttonsSizer = new wxFlexGridSizer( 4 );
+       wxStaticText *editButtonsText   = new wxStaticText( this, -1,_T("Edit Buttons") );
+       this->_buttonsSizer                     = new wxFlexGridSizer( 4 );
        this->_buttonsSizer->Add( _btnUndo, 1, wxGROW );
        this->_buttonsSizer->Add( _btnRedo, 1, wxGROW );
        this->_buttonsSizer->Add( _btnCopy, 1, wxGROW );
-
        this->_gConfigSizer = new wxFlexGridSizer( 1 );
        //BrushTool Radio Button
        //giving blank space
@@ -67,8 +61,7 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
        //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( new wxStaticText( this, -1, _T( "Select Range" ) ), 1, wxGROW );
        this->_gConfigSizer->Add( _mBarSlices, 1, wxGROW );
        //GrayLevel Slider
        this->_gConfigSizer->Add( _txtGrayLevel );
@@ -90,8 +83,7 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
        //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") ) );
+       this->_brushSizer->Add( new wxStaticText( this, -1, _T("Brush Settings") ) );
        //BrushSize Slider
        this->_brushSizer->Add( _txtBrushSize );
 
@@ -118,31 +110,25 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
        this->_FillSizer->Add( _txtToleranceFill );
        wxFlexGridSizer *sizerTolerance = new wxFlexGridSizer( 2 );
        sizerTolerance->Add( _sldToleranceFill, 1, wxGROW );
-       sizerTolerance->Add( _tolerancefillCtrl, 1,
-               wxALIGN_BOTTOM | wxALIGN_LEFT | wxALL, 5 );
+       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 );
+       sizerDistance->Add( _distancefillCtrl, 1, 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 );
        sizer->Add( _FillSizer );
-
        this->ConnectComponents( ); //DFCH
        this->_FillSizer->Show( false );
-
        this->SetSizer( sizer );
        this->SetAutoLayout( true );
        this->Layout( );
-
 }
 
 //---------------------------------------------------------------------------
@@ -215,12 +201,11 @@ void wxManualPaintPanel::ConfigureRangeBar( )
        _mBarSlices->SetStart( min );
        _mBarSlices->SetEnd( max );
        _mBarSlices->Update( );
-
        SetRangeMin( min );
        SetRangeMax( max );
-
        //DFCH -- End BarSlices
 }
+
 //--------------------------------------------------------------------------
 void wxManualPaintPanel::ConfigureGrayLevelSld( )
 {
@@ -233,24 +218,26 @@ void wxManualPaintPanel::ConfigureGrayLevelSld( )
        _graylevelCtrl = new wxSpinCtrl( this, wxID_ANY, wxEmptyString,
        wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 65535, 0 );
 }
+
 //--------------------------------------------------------------------------
 void wxManualPaintPanel::ConfigureBrushSizeSld( )
 {
        _txtBrushSize = new wxStaticText( this, -1,
        wxString( _T("  Brush size  ") ) );
-       _sldBrushSize = new wxSlider( this, -1, 1, 1, 50, wxDefaultPosition,
+       _sldBrushSize = new wxSlider( this, -1, 5, 1, 50, wxDefaultPosition,
        wxDefaultSize, wxSL_LABELS );
        _BrushSizeCtrl = new wxSpinCtrl( this, wxID_ANY, wxEmptyString,
        wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 65535, 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, 50, 1, 500, wxDefaultPosition,
+       _sldDistanceFill = new wxSlider( this, -1, 5, 1, 500, wxDefaultPosition,
        wxDefaultSize, wxSL_LABELS );
        _sldDistanceFill->SetMinSize( wxSize( 200, -1 ) );
        _sldDistanceFill->SetMaxSize( wxSize( 200, -1 ) );
@@ -260,22 +247,20 @@ void wxManualPaintPanel::ConfigureDistanceFillSld( )
        _sldDistanceFill->Disable( );
        _distancefillCtrl->Disable( );
 }
+
 //--------------------------------------------------------------------------
 void wxManualPaintPanel::ConfigureTolFillSld( )
 {
-       _txtToleranceFill = new wxStaticText( this, -1,
-               wxString( _T("  Tolerance fill  ") ) );
-       _sldToleranceFill = new wxSlider( this, -1, 125, 0, 255, wxDefaultPosition,
-               wxDefaultSize, wxSL_LABELS );
+       _txtToleranceFill = new wxStaticText( this, -1,wxString( _T("  Tolerance fill  ") ) );
+       _sldToleranceFill = new wxSlider( this, -1, 125, 0, 255, 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, 65535, 50 );
+       _tolerancefillCtrl = new wxSpinCtrl( this, wxID_ANY, wxEmptyString,wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 65535, 50 );
        _txtToleranceFill->Disable( );
        _sldToleranceFill->Disable( );
        _tolerancefillCtrl->Disable( );
-
 }
+
 //--------------------------------------------------------------------------
 void wxManualPaintPanel::ConfigureEditButtons( )
 {
@@ -340,7 +325,7 @@ void wxManualPaintPanel::ConnectComponents( ) //DFCH
                                _rbBrushTool->GetId(),
                                wxEVT_COMMAND_RADIOBOX_SELECTED,
                                (wxObjectEventFunction) (void(wxPanel::*)(
-                                                               wxCommandEvent&)) &wxManualPaintPanel::OnBrushTool);this->Connect
+                                                               wxCommandEvent&)) &wxManualPaintPanel::OnTool);this->Connect
                (
                                _btnCopy->GetId(),
                                wxEVT_COMMAND_BUTTON_CLICKED,
@@ -400,7 +385,6 @@ void wxManualPaintPanel::ConnectComponents( ) //DFCH
   //-------------------------------------------------------------------------
   void wxManualPaintPanel::OnActive(wxCommandEvent& event)
   {
-       printf("EED wxManualPaintPanel::OnActive \n");
        SetActive( _activeCB->GetValue() );
   }
 
@@ -504,8 +488,9 @@ void wxManualPaintPanel::OnBrushForm( wxCommandEvent &event )
 }
 
 //---------------------------------------------------------------------------
-void wxManualPaintPanel::OnBrushTool( wxCommandEvent &event )
+void wxManualPaintPanel::OnTool( wxCommandEvent &event )
 {
+printf("EED wxManualPaintPanel::OnTool Start\n");
        DisableControls( );
        SetTool( _rbBrushTool->GetSelection( ) );
 
@@ -521,16 +506,26 @@ void wxManualPaintPanel::OnBrushTool( wxCommandEvent &event )
 
        if( _rbBrushTool->GetSelection( ) == 1 ) //Fill tool
        {
+printf("EED wxManualPaintPanel::OnTool 1\n");
                _txtToleranceFill->Enable( );
+printf("EED wxManualPaintPanel::OnTool 2\n");
                _sldToleranceFill->Enable( );
+printf("EED wxManualPaintPanel::OnTool 3\n");
                _tolerancefillCtrl->Enable( );
 
+printf("EED wxManualPaintPanel::OnTool 4\n");
                _txtDistanceFill->Enable( );
+printf("EED wxManualPaintPanel::OnTool 5\n");
                _sldDistanceFill->Enable( );
+printf("EED wxManualPaintPanel::OnTool 6\n");
                _distancefillCtrl->Enable( );
+printf("EED wxManualPaintPanel::OnTool 7\n");
                _FillSizer->Show( true );
+printf("EED wxManualPaintPanel::OnTool 8\n");
                _brushSizer->Show( false );
+printf("EED wxManualPaintPanel::OnTool 9\n");
                this->Layout( );
+printf("EED wxManualPaintPanel::OnTool 10\n");
        }
 }
 
@@ -542,13 +537,13 @@ void wxManualPaintPanel::OnCopy( wxCommandEvent &event )
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::OnUndo( wxCommandEvent &event )
 {
-       this->_manualPaintModel->Undo( );
+       this->_manualPaintControler->Undo( );
 }
 
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::OnRedo( wxCommandEvent &event )
 {
-       this->_manualPaintModel->Redo( );
+       this->_manualPaintControler->Redo( );
 }
 
 //--------------------------------------------------------------------------------------------------------------------------------