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=909759870ca012ede8fc3dad2beb40ad3d227517;hb=ada3e60bcd998550327dac4f95b65f0c113f063b;hp=0a175e46711ebcd96833dbecdd7523c32382fa25;hpb=965c602117e9de99019d49bd78ca1d707a1a6bd2;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 0a175e4..9097598 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.h
@@ -2,6 +2,11 @@
 #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>
 
@@ -17,12 +22,45 @@ public:
     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);
 
 private:
-    wxSlider        *sldBrushSize;
-    wxSlider        *sldGrayLevel;
-    wxTextCtrl      *graylevelCtrl;
+    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
+
+
+
+
 
 protected: