X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FwxManualPaintPanel.cpp;h=78f1d036f0ef660d83cd37d1279542b56aaa7bd0;hb=3eef3f302abd6996a4eaebb0536770bca9bf428d;hp=3170c69e8f8087ddbc4590e844a0e197ed899d4b;hpb=23b33a3a7e3f42eacbaad218510fb77e27aa9c2f;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 3170c69..78f1d03 100644
--- 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,13 +20,13 @@ 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];
-	lst2D3D[0]=_T("2D circle");
-	lst2D3D[1]=_T("3D sphere");
+	lst2D3D[0]=_T("2D");
+	lst2D3D[1]=_T("3D");
                     _rb2D3D         = new wxRadioBox(panel, -1, _T("2D / 3D"), wxDefaultPosition, wxSize(270,45), 2 , lst2D3D,  2, wxRA_SPECIFY_COLS);
     _rb2D3D->SetSelection(1);
 
@@ -53,28 +53,31 @@ wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent)
 	wxButton     *btnUndo           = new wxButton( panel, -1, _T("Undo"));
     btnUndo->Disable();
 
-    Connect(_sldBrushSize->GetId()      , wxEVT_SCROLL_THUMBRELEASE	        , (wxObjectEventFunction) &wxManualPaintPanel::OnBrushSize);
+    Connect(_sldBrushSize->GetId()      , wxEVT_SCROLL_THUMBRELEASE	        , (wxObjectEventFunction)(void (wxPanel::*)(wxScrollEvent&)) (&wxManualPaintPanel::OnBrushSize));
 
-    Connect(_sldGrayLevel->GetId()      , wxEVT_SCROLL_THUMBRELEASE	        , (wxObjectEventFunction) &wxManualPaintPanel::OnSldGrayLevel);
-    Connect(_graylevelCtrl->GetId()     , wxEVT_COMMAND_TEXT_UPDATED	    , (wxObjectEventFunction) &wxManualPaintPanel::OnCtrTxtGrayLevel);
+    Connect(_sldGrayLevel->GetId()      , wxEVT_SCROLL_THUMBRELEASE	        , (wxObjectEventFunction)(void (wxPanel::*)(wxScrollEvent&)) &wxManualPaintPanel::OnSldGrayLevel);
+    Connect(_graylevelCtrl->GetId()     , wxEVT_COMMAND_TEXT_UPDATED	    , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnCtrTxtGrayLevel);
 
-    Connect(_sldToleranceFill->GetId()  , wxEVT_SCROLL_THUMBRELEASE	        , (wxObjectEventFunction) &wxManualPaintPanel::OnSldToleranceFill);
-    Connect(_tolerancefillCtrl->GetId() , wxEVT_COMMAND_TEXT_UPDATED	    , (wxObjectEventFunction) &wxManualPaintPanel::OnCtrTxtToleranceFill);
+    Connect(_sldToleranceFill->GetId()  , wxEVT_SCROLL_THUMBRELEASE	        , (wxObjectEventFunction)(void (wxPanel::*)(wxScrollEvent&)) &wxManualPaintPanel::OnSldToleranceFill);
+    Connect(_tolerancefillCtrl->GetId() , wxEVT_COMMAND_TEXT_UPDATED	    , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnCtrTxtToleranceFill);
 
-    Connect(_sldDistanceFill->GetId()   , wxEVT_SCROLL_THUMBRELEASE	        , (wxObjectEventFunction) &wxManualPaintPanel::OnSldDistanceFill);
-    Connect(_distancefillCtrl->GetId()  , wxEVT_COMMAND_TEXT_UPDATED	    , (wxObjectEventFunction) &wxManualPaintPanel::OnCtrTxtDistanceFill);
+    Connect(_sldDistanceFill->GetId()   , wxEVT_SCROLL_THUMBRELEASE	        , (wxObjectEventFunction)(void (wxPanel::*)(wxScrollEvent&)) &wxManualPaintPanel::OnSldDistanceFill);
+    Connect(_distancefillCtrl->GetId()  , wxEVT_COMMAND_TEXT_UPDATED	    , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnCtrTxtDistanceFill);
 
-    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);
+    Connect(_rb2D3D->GetId()            , wxEVT_COMMAND_RADIOBOX_SELECTED 	, (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::On2D3D);
+    Connect(_rbBrushForm->GetId()       , wxEVT_COMMAND_RADIOBOX_SELECTED 	, (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnBrushForm);
+    Connect(_rbBrushTool->GetId()       , wxEVT_COMMAND_RADIOBOX_SELECTED 	, (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnBrushTool);
+	Connect(btnCopy->GetId()	        , wxEVT_COMMAND_BUTTON_CLICKED      , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnCopy);
+	Connect(btnUndo->GetId()	        , wxEVT_COMMAND_BUTTON_CLICKED      , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnUndo);
 
 	wxFlexGridSizer *sizer1         = new wxFlexGridSizer(1);
 
     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();
 
@@ -216,7 +218,6 @@ void wxManualPaintPanel::On2D3D(wxCommandEvent &event)
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::OnBrushForm(wxCommandEvent &event)
 {
-    printf("EED wxManualPaintPanel::OnBrushForm BrushForm=%d \n", _rbBrushForm->GetSelection());
     SetBrushForm( _rbBrushForm->GetSelection() );
 }
 
@@ -224,10 +225,11 @@ void wxManualPaintPanel::OnBrushForm(wxCommandEvent &event)
 void wxManualPaintPanel::OnBrushTool(wxCommandEvent &event)
 {
     DisableControls();
-    SetBrushTool( _rbBrushTool->GetSelection() );
+    SetTool( _rbBrushTool->GetSelection() );
 
     if (_rbBrushTool->GetSelection()==0)  //Brush tool
     {
+        _txtBrushSize->Enable();
         _sldBrushSize->Enable();
         _rbBrushForm->Enable();
     }