X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FwxManualPaintPanel.h;h=8b377ada38b9ecd9d00a012b979c60106be38fd8;hb=f050938d3947f6b785289da6d58f8fec2da57421;hp=79f053db2c75021b37d3bdb7dfd0e306be44cdab;hpb=23b33a3a7e3f42eacbaad218510fb77e27aa9c2f;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.h
index 79f053d..8b377ad 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.h
@@ -2,50 +2,89 @@
 #define _WX_MANUAL_PAINT_PANEL_H_
 
 #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);
+	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:
-    wxSlider        *_sldBrushSize;
-    wxSlider        *_sldGrayLevel;
-    wxTextCtrl      *_graylevelCtrl;
-    wxRadioBox      *_rbBrushForm;
-    wxRadioBox      *_rb2D3D;
-    wxRadioBox      *_rbBrushTool;
-
-    wxStaticText    *_txtToleranceFill;
-    wxSlider        *_sldToleranceFill;
-    wxTextCtrl      *_tolerancefillCtrl;
+	wxStaticText *_txtBrushSize;
+	wxSlider *_sldBrushSize;
+	wxSpinCtrl *_BrushSizeCtrl;
 
-	wxStaticText    *_txtDistanceFill;
-    wxSlider        *_sldDistanceFill;
-    wxTextCtrl      *_distancefillCtrl;
+	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_