#include "ManualPaintPanel.h"
-
#include "mBarRange.h" //DFCH
#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();
- 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 DisableControls();
- void OnSldToleranceFill(wxScrollEvent& event);
- void OnCtrTxtToleranceFill(wxCommandEvent &event);
- void OnSldDistanceFill(wxScrollEvent& event);
- void OnCtrTxtDistanceFill(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);
+ 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 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 );
private:
- wxStaticText *_txtBrushSize;
- wxSlider *_sldBrushSize;
-
- wxSlider *_sldGrayLevel;
- wxTextCtrl *_graylevelCtrl;
- wxRadioBox *_rbBrushForm;
- wxRadioBox *_rb2D3D;
- wxRadioBox *_rbBrushTool;
-
- wxStaticText *_txtToleranceFill;
- wxSlider *_sldToleranceFill;
- wxTextCtrl *_tolerancefillCtrl;
-
- wxStaticText *_txtDistanceFill;
- wxSlider *_sldDistanceFill;
- wxTextCtrl *_distancefillCtrl;
-
- mBarRange * _mBarSlices; //DFCH
-
-
-
-
+ wxStaticText *_txtBrushSize;
+ wxSlider *_sldBrushSize;
+ wxSpinCtrl *_BrushSizeCtrl;
+
+ wxStaticText *_txtGrayLevel;
+ wxSlider *_sldGrayLevel;
+ wxSpinCtrl *_graylevelCtrl;
+ wxRadioBox *_rbBrushForm;
+ wxRadioBox *_rb2D3D;
+ wxRadioBox *_rbBrushTool;
+
+ wxStaticText *_txtToleranceFill;
+ wxSlider *_sldToleranceFill;
+ wxSpinCtrl *_tolerancefillCtrl;
+
+ wxStaticText *_txtDistanceFill;
+ wxSlider *_sldDistanceFill;
+ 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:
};
-
#endif // _WX_MANUAL_PAINT_PANEL_H_