DFCH: ManualPain GUI Cleaned with some new features. :)

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.h
index 230f9aba1241b4892fe97c042bb13ac9d2473b6a..8b377ada38b9ecd9d00a012b979c60106be38fd8 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.h
@@ -7,61 +7,82 @@
 #include "creaWx.h" //DFCH
 #include <wx/wx.h>
 #include <wx/panel.h>
+#include <wx/spinctrl.h>
+#include <wx/string.h>
 
-class wxManualPaintPanel: public wxPanel, public ManualPaintPanel {
+class wxManualPaintPanel: public wxPanel, public ManualPaintPanel
+{
 public:
-       wxManualPaintPanel(wxWindow * parent);
-       virtual ~wxManualPaintPanel();
+       wxManualPaintPanel( wxWindow * parent );
+       virtual ~wxManualPaintPanel( );
+       //Panel Config
+       void ConfigureBrushToolRadioButton( );
+       void Configure2D3DRadioButton( );
+       void ConfigureBrushFormRadioButton( );
+       void ConfigureRangeBar( );
+       void ConfigureGrayLevelSld( );
+       void ConfigureBrushSizeSld( );
+       void ConfigureDistanceFillSld( );
+       void ConfigureTolFillSld( );
+       void ConfigureEditButtons( );
        //Events
-       void ConnectComponents(); //DFCH
-       void OnBrushSize(wxScrollEvent& event);
-       void OnSldGrayLevel(wxScrollEvent& event);
-       void OnCtrTxtGrayLevel(wxCommandEvent &event);
-       void On2D3D(wxCommandEvent &event);
-       void OnBrushForm(wxCommandEvent &event);
-       void OnBrushTool(wxCommandEvent &event);
-       void OnCopy(wxCommandEvent &event);
-       void OnUndo(wxCommandEvent &event);
-       void OnRedo(wxCommandEvent &event);
-       void DisableControls();
-       void OnSldToleranceFill(wxScrollEvent& event);
-       void OnCtrTxtToleranceFill(wxCommandEvent &event);
-       void OnSldDistanceFill(wxScrollEvent& event);
-       void OnCtrTxtDistanceFill(wxCommandEvent &event);
+       void ConnectComponents( ); //DFCH
+       void OnBrushSize( wxScrollEvent& event );
+       void OnSldGrayLevel( wxScrollEvent& event );
+       void OnCtrTxtGrayLevel( wxCommandEvent &event );
+       void On2D3D( wxCommandEvent &event );
+       void OnBrushForm( wxCommandEvent &event );
+       void OnBrushTool( wxCommandEvent &event );
+       void OnCopy( wxCommandEvent &event );
+       void OnUndo( wxCommandEvent &event );
+       void OnRedo( wxCommandEvent &event );
+       void DisableControls( );
+       void OnSldToleranceFill( wxScrollEvent& event );
+       void OnCtrTxtToleranceFill( wxCommandEvent &event );
+       void OnSldDistanceFill( wxScrollEvent& event );
+       void OnCtrTxtDistanceFill( wxCommandEvent &event );
+       void OnCtrBrushSize( wxCommandEvent &event );
        //This method changes the min/max in the Selected Range Widget
        //--------------------------------------------------------------------------------------------------------------------------------
        // Min-Max Barrange received events
        //--------------------------------------------------------------------------------------------------------------------------------
-       void onBarrange(wxCommandEvent& event);
-       void onActualChange_Bar(wxCommandEvent& event);
-       void onStartChange_Bar(wxCommandEvent& event);
-       void onEndChange_Bar(wxCommandEvent& event);
-       void onSelectionEnd(wxCommandEvent& event);
-       void onMovedBar(wxCommandEvent& event);
+       void onBarrange( wxCommandEvent& event );
+       void onActualChange_Bar( wxCommandEvent& event );
+       void onStartChange_Bar( wxCommandEvent& event );
+       void onEndChange_Bar( wxCommandEvent& event );
+       void onSelectionEnd( wxCommandEvent& event );
+       void onMovedBar( wxCommandEvent& event );
 
 private:
        wxStaticText *_txtBrushSize;
        wxSlider *_sldBrushSize;
+       wxSpinCtrl *_BrushSizeCtrl;
 
+       wxStaticText *_txtGrayLevel;
        wxSlider *_sldGrayLevel;
-       wxTextCtrl *_graylevelCtrl;
+       wxSpinCtrl *_graylevelCtrl;
        wxRadioBox *_rbBrushForm;
        wxRadioBox *_rb2D3D;
        wxRadioBox *_rbBrushTool;
 
        wxStaticText *_txtToleranceFill;
        wxSlider *_sldToleranceFill;
-       wxTextCtrl *_tolerancefillCtrl;
+       wxSpinCtrl *_tolerancefillCtrl;
 
        wxStaticText *_txtDistanceFill;
        wxSlider *_sldDistanceFill;
-       wxTextCtrl *_distancefillCtrl;
+       wxSpinCtrl *_distancefillCtrl;
 
        mBarRange * _mBarSlices; //DFCH
        wxButton *_btnCopy; //DFCH
        wxButton *_btnUndo; //DFCH
        wxButton *_btnRedo; //DFCH
 
+       wxFlexGridSizer *_buttonsSizer; //DFCH
+       wxFlexGridSizer *_FillSizer; //DFCH
+       wxFlexGridSizer *_gConfigSizer; //DFCH
+       wxFlexGridSizer *_brushSizer; //DFCH
+
 protected:
 
 };