*** 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 3170c69e8f8087ddbc4590e844a0e197ed899d4b..4d9a5e7e08a095f9bc0481fce813613731ecafda 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
@@ -11,7 +11,7 @@ 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  ")));
+                     _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);
@@ -20,8 +20,8 @@ wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent)
                      _sldToleranceFill  = new wxSlider(panel, -1, 50, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
                      _tolerancefillCtrl = new wxTextCtrl(panel , -1,_T("50") );
                      _txtDistanceFill   = new wxStaticText(panel, -1, wxString(_T("  Distance fill  ")));
-                     _sldDistanceFill   = new wxSlider(panel, -1, 50, 1, 50, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
-                     _distancefillCtrl  = new wxTextCtrl(panel , -1,_T("50") );
+                     _sldDistanceFill   = new wxSlider(panel, -1, 500, 1, 500, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
+                     _distancefillCtrl  = new wxTextCtrl(panel , -1,_T("500") );
 
 
        wxString lst2D3D[2];
@@ -75,6 +75,9 @@ wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent)
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
     sizer1->Add(tittleText);
 
+    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
+    sizer1->Add(_rbBrushTool, 1, wxGROW );
+
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
     sizer1->Add(txtGrayLevel);
     sizer1->Add(_sldGrayLevel, 1, wxGROW );
@@ -83,11 +86,9 @@ wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent)
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
     sizer1->Add(_rb2D3D, 1, wxGROW );
 
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(_rbBrushTool, 1, wxGROW );
 
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(txtBrushSize);
+    sizer1->Add(_txtBrushSize);
     sizer1->Add(_sldBrushSize, 1, wxGROW );
 
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
@@ -195,6 +196,7 @@ void wxManualPaintPanel::OnCtrTxtToleranceFill(wxCommandEvent &event)
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::DisableControls()
 {
+    _txtBrushSize->Disable();
     _sldBrushSize->Disable();
     _rbBrushForm->Disable();
 
@@ -228,6 +230,7 @@ void wxManualPaintPanel::OnBrushTool(wxCommandEvent &event)
 
     if (_rbBrushTool->GetSelection()==0)  //Brush tool
     {
+        _txtBrushSize->Enable();
         _sldBrushSize->Enable();
         _rbBrushForm->Enable();
     }