*** empty log message ***

[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 40dcd5f8b82194a728de194601cc10de664a66f7..babf7276dfef429f63c92c171ab0ae140b19196b 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
@@ -12,42 +12,41 @@ wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent)
        // 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);
+                     _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);
+                     _sldGrayLevel  = new wxSlider(panel, -1, 0, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
+                     _graylevelCtrl = new wxTextCtrl(panel , -1);
 
        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();
+                    _rb2D3D         = new wxRadioBox(panel, -1, _T("2D / 3D"), wxDefaultPosition, wxSize(270,45), 2 , lst2D3D,  2, wxRA_SPECIFY_COLS);
+    _rb2D3D->SetSelection(1);
+    _rb2D3D->Disable();
 
        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();
+                    _rbBrushForm    = new wxRadioBox(panel, -1, _T("Brush form"), wxDefaultPosition, wxSize(270,45), 2 , lstBrushForm,  2, wxRA_SPECIFY_COLS);
 
        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();
+                    _rbBrushTool    = new wxRadioBox(panel, -1, _T("Brush tool"), wxDefaultPosition, wxSize(270,45), 2 , lstBrushTool,  2, wxRA_SPECIFY_COLS);
+    _rbBrushTool->Disable();
 
-       wxButton     *btnCopy       = new wxButton( panel, -1, _T("Copy"));
+       wxButton     *btnCopy           = new wxButton( panel, -1, _T("Copy"));
     btnCopy->Disable();
-       wxButton     *btnUndo       = new wxButton( panel, -1, _T("Undo"));
+       wxButton     *btnUndo           = new wxButton( panel, -1, _T("Undo"));
     btnUndo->Disable();
 
-    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);
+    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);
 
-    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(_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);
 
@@ -56,17 +55,17 @@ wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent)
     sizer1->Add(tittleText);
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
     sizer1->Add(txtBrushSize);
-    sizer1->Add(sldBrushSize, 1, wxGROW );
+    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(_sldGrayLevel, 1, wxGROW );
+    sizer1->Add(_graylevelCtrl);
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(rb2D3D, 1, wxGROW );
+    sizer1->Add(_rb2D3D, 1, wxGROW );
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(rbBrushForm, 1, wxGROW );
+    sizer1->Add(_rbBrushForm, 1, wxGROW );
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(rbBrushTool, 1, wxGROW );
+    sizer1->Add(_rbBrushTool, 1, wxGROW );
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
     sizer1->Add(btnCopy, 1, wxGROW );
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
@@ -86,28 +85,24 @@ wxManualPaintPanel::~wxManualPaintPanel()
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::OnBrushSize(wxScrollEvent& event)
 {
-    printf("EED %p wxManualPaintPanel::OnBrushSize\n", this);
-    SetBrushSize( sldBrushSize->GetValue() );
+    SetBrushSize( _sldBrushSize->GetValue() );
 }
 
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::OnSldGrayLevel(wxScrollEvent& event)
 {
-    printf("EED %p wxManualPaintPanel::OnGrayLevel\n", this);
-    SetGrayLevel( (double)(sldGrayLevel->GetValue()) );
+    SetGrayLevel( (double)(_sldGrayLevel->GetValue()) );
 
     wxString text;
-    text.Printf( wxT("%d"), sldGrayLevel->GetValue() );
-    graylevelCtrl->SetValue(text);
+    text.Printf( wxT("%d"), _sldGrayLevel->GetValue() );
+    _graylevelCtrl->SetValue(text);
 }
 
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::OnCtrTxtGrayLevel(wxCommandEvent &event)
 {
-    printf("EED %p wxManualPaintPanel::OnCtrTxtGrayLevel\n", this);
-
     double graylevel;
-    wxString text=graylevelCtrl->GetValue();
+    wxString text=_graylevelCtrl->GetValue();
     if (text.ToDouble(&graylevel))
     {
         SetGrayLevel( graylevel );
@@ -119,16 +114,20 @@ void wxManualPaintPanel::OnCtrTxtGrayLevel(wxCommandEvent &event)
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::On2D3D(wxCommandEvent &event)
 {
+    Set2D3D( _rb2D3D->GetSelection() );
 }
 
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::OnBrushForm(wxCommandEvent &event)
 {
+    printf("EED wxManualPaintPanel::OnBrushForm BrushForm=%d \n", _rbBrushForm->GetSelection());
+    SetBrushForm( _rbBrushForm->GetSelection() );
 }
 
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::OnBrushTool(wxCommandEvent &event)
 {
+    SetBrushTool( _rbBrushTool->GetSelection() );
 }
 
 //---------------------------------------------------------------------------