X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FwxManualPaintPanel.cpp;h=57fd497a452561a4a12581e93187cf765dd599f6;hb=9a8f7c9cb08ffcb57f1558b9d20f7fbcd95df017;hp=2a0e6d3764ccd2d0f11fb7f4080eec64b059623e;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;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 2a0e6d3..57fd497 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
@@ -37,8 +37,9 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
 	//Title
 	sizer->Add( tittleText );
 	//giving some blank spaces
-	sizer->Add( new wxStaticText( this, -1, _T("             ") ) );
+	sizer->Add( new wxStaticText( this, -1, _T("          key A : Enable/Disable   ") ) );
 
+	this->ConfigureActiveCBButton( );
 	this->ConfigureBrushToolRadioButton( );
 	this->Configure2D3DRadioButton( );
 	this->ConfigureBrushFormRadioButton( );
@@ -52,7 +53,6 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
 	//Buttons
 	wxStaticText *editButtonsText = new wxStaticText( this, -1,
 		_T("Edit Buttons") );
-	sizer->Add( editButtonsText );
 	this->_buttonsSizer = new wxFlexGridSizer( 4 );
 	this->_buttonsSizer->Add( _btnUndo, 1, wxGROW );
 	this->_buttonsSizer->Add( _btnRedo, 1, wxGROW );
@@ -61,8 +61,7 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
 	this->_gConfigSizer = new wxFlexGridSizer( 1 );
 	//BrushTool Radio Button
 	//giving blank space
-	this->_gConfigSizer->Add(
-		new wxStaticText( this, -1, _T("             ") ) );
+	this->_gConfigSizer->Add(  new wxStaticText( this, -1, _T("             ") ) );
 	//end of blank space
 	this->_gConfigSizer->Add( _rbBrushTool, 1, wxGROW );
 	//2D/3D Radio Button
@@ -73,7 +72,14 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
 	this->_gConfigSizer->Add( _mBarSlices, 1, wxGROW );
 	//GrayLevel Slider
 	this->_gConfigSizer->Add( _txtGrayLevel );
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 	wxFlexGridSizer *sizerGrayLevel = new wxFlexGridSizer( 2, wxHORIZONTAL );
+#else
+	wxFlexGridSizer *sizerGrayLevel = new wxFlexGridSizer( 2 );
+#endif
+
 	sizerGrayLevel->Add( _sldGrayLevel, 1, wxGROW );
 	sizerGrayLevel->Add( _graylevelCtrl, 1,
 		wxALIGN_BOTTOM | wxALIGN_LEFT | wxALL, 5 );
@@ -88,7 +94,14 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
 		new wxStaticText( this, -1, _T("Brush Settings") ) );
 	//BrushSize Slider
 	this->_brushSizer->Add( _txtBrushSize );
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 	wxFlexGridSizer *sizersdlBrushSize = new wxFlexGridSizer( 2, wxHORIZONTAL );
+#else
+	wxFlexGridSizer *sizersdlBrushSize = new wxFlexGridSizer( 2 );
+#endif
+
 	sizersdlBrushSize->Add( _sldBrushSize, 1, wxGROW );
 	sizersdlBrushSize->Add( _BrushSizeCtrl, 1,
 		wxALIGN_BOTTOM | wxALIGN_LEFT | wxALL, 5 );
@@ -116,6 +129,8 @@ wxManualPaintPanel::wxManualPaintPanel( wxWindow * parent )
 		wxALIGN_BOTTOM | wxALIGN_LEFT | wxALL, 5 );
 	this->_FillSizer->Add( sizerDistance );
 
+	sizer->Add( _activeCB );
+	sizer->Add( editButtonsText );
 	sizer->Add( _buttonsSizer );
 	sizer->Add( _gConfigSizer );
 	sizer->Add( _brushSizer );
@@ -136,8 +151,16 @@ wxManualPaintPanel::~wxManualPaintPanel( )
 }
 
 //--------------------------------------------------------------------------
+void wxManualPaintPanel::ConfigureActiveCBButton( )
+{
+   _activeCB = new wxCheckBox (this, -1, _T("Active") );
+   _activeCB->SetValue(true);
+   SetActive( _activeCB->GetValue() );
+}
+
 
 //Panel Config
+//--------------------------------------------------------------------------
 void wxManualPaintPanel::ConfigureBrushToolRadioButton( )
 {
 	wxString lstBrushForm[ 2 ];
@@ -147,6 +170,7 @@ void wxManualPaintPanel::ConfigureBrushToolRadioButton( )
 		wxDefaultPosition, wxSize( 270, 45 ), 2, lstBrushForm, 2,
 		wxRA_SPECIFY_COLS );
 }
+
 //--------------------------------------------------------------------------
 void wxManualPaintPanel::Configure2D3DRadioButton( )
 {
@@ -191,29 +215,33 @@ void wxManualPaintPanel::ConfigureRangeBar( )
 	_mBarSlices->SetStart( min );
 	_mBarSlices->SetEnd( max );
 	_mBarSlices->Update( );
+
+	SetRangeMin( min );
+	SetRangeMax( max );
+
 	//DFCH -- End BarSlices
 }
 //--------------------------------------------------------------------------
 void wxManualPaintPanel::ConfigureGrayLevelSld( )
 {
 	_txtGrayLevel = new wxStaticText( this, -1,
-		wxString( _T("  Gray Level  ") ) );
+	wxString( _T("  Gray Level  ") ) );
 	_sldGrayLevel = new wxSlider( this, -1, 0, 0, 255, wxDefaultPosition,
-		wxDefaultSize, wxSL_LABELS );
+	wxDefaultSize, wxSL_LABELS );
 	_sldGrayLevel->SetMinSize( wxSize( 200, -1 ) );
 	_sldGrayLevel->SetMaxSize( wxSize( 200, -1 ) );
 	_graylevelCtrl = new wxSpinCtrl( this, wxID_ANY, wxEmptyString,
-		wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 65535, 0 );
+	wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 65535, 0 );
 }
 //--------------------------------------------------------------------------
 void wxManualPaintPanel::ConfigureBrushSizeSld( )
 {
 	_txtBrushSize = new wxStaticText( this, -1,
-		wxString( _T("  Brush size  ") ) );
+	wxString( _T("  Brush size  ") ) );
 	_sldBrushSize = new wxSlider( this, -1, 1, 1, 50, wxDefaultPosition,
-		wxDefaultSize, wxSL_LABELS );
+	wxDefaultSize, wxSL_LABELS );
 	_BrushSizeCtrl = new wxSpinCtrl( this, wxID_ANY, wxEmptyString,
-		wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 65535, 0 );
+	wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 65535, 0 );
 	_sldBrushSize->SetMinSize( wxSize( 200, -1 ) );
 	_sldBrushSize->SetMaxSize( wxSize( 200, -1 ) );
 }
@@ -221,13 +249,13 @@ void wxManualPaintPanel::ConfigureBrushSizeSld( )
 void wxManualPaintPanel::ConfigureDistanceFillSld( )
 {
 	_txtDistanceFill = new wxStaticText( this, -1,
-		wxString( _T("  Distance fill  ") ) );
+	wxString( _T("  Distance fill  ") ) );
 	_sldDistanceFill = new wxSlider( this, -1, 50, 1, 500, wxDefaultPosition,
-		wxDefaultSize, wxSL_LABELS );
+	wxDefaultSize, wxSL_LABELS );
 	_sldDistanceFill->SetMinSize( wxSize( 200, -1 ) );
 	_sldDistanceFill->SetMaxSize( wxSize( 200, -1 ) );
 	_distancefillCtrl = new wxSpinCtrl( this, wxID_ANY, wxEmptyString,
-		wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 500, 50 );
+	wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 500, 50 );
 	_txtDistanceFill->Disable( );
 	_sldDistanceFill->Disable( );
 	_distancefillCtrl->Disable( );
@@ -264,17 +292,14 @@ void wxManualPaintPanel::ConfigureEditButtons( )
  */
 void wxManualPaintPanel::ConnectComponents( ) //DFCH
 {
-	this->Connect(
-		_sldBrushSize->GetId( ),
+	this->Connect(_sldBrushSize->GetId( ),
 		wxEVT_SCROLL_THUMBRELEASE,
 		(wxObjectEventFunction) (void(wxPanel::*)(
-			wxScrollEvent& )) (&wxManualPaintPanel::OnBrushSize) );this ->Connect (_sldGrayLevel->GetId(),
-				wxEVT_SCROLL_THUMBRELEASE,
-				(wxObjectEventFunction) (void(wxPanel::*)(
-								wxScrollEvent&)) &wxManualPaintPanel::OnSldGrayLevel);
-		this->Connect
-		(
-				_graylevelCtrl->GetId(),
+		wxScrollEvent& )) (&wxManualPaintPanel::OnBrushSize) );this ->Connect (_sldGrayLevel->GetId(),
+		wxEVT_SCROLL_THUMBRELEASE,
+                (wxObjectEventFunction) (void(wxPanel::*)( wxScrollEvent&)) &wxManualPaintPanel::OnSldGrayLevel);
+
+		this->Connect(  _graylevelCtrl->GetId(),
 				wxEVT_COMMAND_TEXT_UPDATED,
 				(wxObjectEventFunction) (void(wxPanel::*)(
 								wxCommandEvent&)) &wxManualPaintPanel::OnCtrTxtGrayLevel);
@@ -363,9 +388,23 @@ void wxManualPaintPanel::ConnectComponents( ) //DFCH
 				wxEVT_COMMAND_TEXT_UPDATED,
 				(wxObjectEventFunction) (void(wxPanel::*)(
 								wxCommandEvent&)) &wxManualPaintPanel::OnCtrBrushSize);
+		this->Connect
+		(
+			_activeCB->GetId(),
+	     		wxEVT_COMMAND_CHECKBOX_CLICKED, 
+	     		(wxObjectEventFunction) (void (wxPanel::*)(wxCommandEvent&))&wxManualPaintPanel::OnActive);
 
 	}
 
+
+  //-------------------------------------------------------------------------
+  void wxManualPaintPanel::OnActive(wxCommandEvent& event)
+  {
+	printf("EED wxManualPaintPanel::OnActive \n");
+	SetActive( _activeCB->GetValue() );
+  }
+
+
 //---------------------------------------------------------------------------
 void wxManualPaintPanel::OnBrushSize( wxScrollEvent& event )
 {