X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FwxManualPaintPanel.cpp;h=e8f8d2c523e3cf90657b437f59d052d2ad1c134d;hb=07c470d8eed4bd0b96f829c7dc9f63cc5d714869;hp=babf7276dfef429f63c92c171ab0ae140b19196b;hpb=1875ac5ea44f35fb7259e847f628bb840e3964a8;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 babf727..e8f8d2c 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp @@ -6,66 +6,138 @@ wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent) : wxPanel(parent, -1) { - wxPanel *panel = this; - wxSizer *sizer = NULL; + wxPanel *panel = this; + wxSizer *sizer = NULL; // Widget interface - wxStaticText *tittleText = new wxStaticText(panel, -1, _T(" Manual Paint")); - wxStaticText *txtBrushSize = new wxStaticText(panel, -1, wxString(_T(" Brush size "))); - _sldBrushSize = new wxSlider(panel, -1, 1, 1, 20, wxDefaultPosition, wxDefaultSize, wxSL_LABELS); - wxStaticText *txtGrayLevel = new wxStaticText(panel, -1, wxString(_T(" Gray Level "))); - _sldGrayLevel = new wxSlider(panel, -1, 0, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_LABELS); - _graylevelCtrl = new wxTextCtrl(panel , -1); + wxStaticText *tittleText = new wxStaticText(panel, -1, _T(" Manual Paint")); + _txtBrushSize = new wxStaticText(panel, -1, wxString(_T(" Brush size "))); + _sldBrushSize = new wxSlider(panel, -1, 1, 1, 20, wxDefaultPosition, wxDefaultSize, wxSL_LABELS); + wxStaticText *txtGrayLevel = new wxStaticText(panel, -1, wxString(_T(" Gray Level "))); + _sldGrayLevel = new wxSlider(panel, -1, 0, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_LABELS); + _graylevelCtrl = new wxTextCtrl(panel , -1); + _txtToleranceFill = new wxStaticText(panel, -1, wxString(_T(" Tolerance fill "))); + _sldToleranceFill = new wxSlider(panel, -1, 50, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_LABELS); + _tolerancefillCtrl = new wxTextCtrl(panel , -1,_T("50") ); + _txtDistanceFill = new wxStaticText(panel, -1, wxString(_T(" Distance fill "))); + _sldDistanceFill = new wxSlider(panel, -1, 500, 1, 500, wxDefaultPosition, wxDefaultSize, wxSL_LABELS); + _distancefillCtrl = new wxTextCtrl(panel , -1,_T("500") ); + //DFCH -- BarSlices + double range[2]; + GetScalarRange( range ); + int min = 0;//range[0]; + int max = 6000;//range[1]; + _mBarSlices = new mBarRange( panel, 70, 65 ); + _mBarSlices->SetMin( 0 ); + _mBarSlices->SetStart( 0 ); + _mBarSlices->SetOrientation( true ); + _mBarSlices->setActiveStateTo( true ); + _mBarSlices->setVisibleLabels( true ); + _mBarSlices->setDeviceEndMargin( 10 ); + _mBarSlices->setDeviceBlitStart( 10, 10 ); + _mBarSlices->setIfWithActualDrawed( false ); + _mBarSlices->setRepresentedValues( min, max ); + _mBarSlices->SetStart( min ); + _mBarSlices->SetEnd( max ); + //DFCH -- End BarSlices wxString lst2D3D[2]; - lst2D3D[0]=_T("2D circle"); - lst2D3D[1]=_T("3D sphere"); + lst2D3D[0]=_T("2D"); + lst2D3D[1]=_T("3D"); _rb2D3D = new wxRadioBox(panel, -1, _T("2D / 3D"), wxDefaultPosition, wxSize(270,45), 2 , lst2D3D, 2, wxRA_SPECIFY_COLS); _rb2D3D->SetSelection(1); - _rb2D3D->Disable(); wxString lstBrushForm[2]; lstBrushForm[0]=_T("rectangle/cube"); lstBrushForm[1]=_T("circle/sphere"); _rbBrushForm = new wxRadioBox(panel, -1, _T("Brush form"), wxDefaultPosition, wxSize(270,45), 2 , lstBrushForm, 2, wxRA_SPECIFY_COLS); + _txtToleranceFill->Disable(); + _sldToleranceFill->Disable(); + _tolerancefillCtrl->Disable(); + + _txtDistanceFill->Disable(); + _sldDistanceFill->Disable(); + _distancefillCtrl->Disable(); + wxString lstBrushTool[2]; - lstBrushTool[0]=_T("Pensil"); + lstBrushTool[0]=_T("Brush"); lstBrushTool[1]=_T("Fill"); _rbBrushTool = new wxRadioBox(panel, -1, _T("Brush tool"), wxDefaultPosition, wxSize(270,45), 2 , lstBrushTool, 2, wxRA_SPECIFY_COLS); - _rbBrushTool->Disable(); wxButton *btnCopy = new wxButton( panel, -1, _T("Copy")); btnCopy->Disable(); wxButton *btnUndo = new wxButton( panel, -1, _T("Undo")); btnUndo->Disable(); - Connect(_sldBrushSize->GetId() , wxEVT_SCROLL_THUMBRELEASE , (wxObjectEventFunction) &wxManualPaintPanel::OnBrushSize); - Connect(_sldGrayLevel->GetId() , wxEVT_SCROLL_THUMBRELEASE , (wxObjectEventFunction) &wxManualPaintPanel::OnSldGrayLevel); - Connect(_graylevelCtrl->GetId() , wxEVT_COMMAND_TEXT_UPDATED , (wxObjectEventFunction) &wxManualPaintPanel::OnCtrTxtGrayLevel); + Connect(_sldBrushSize->GetId() , wxEVT_SCROLL_THUMBRELEASE , (wxObjectEventFunction)(void (wxPanel::*)(wxScrollEvent&)) (&wxManualPaintPanel::OnBrushSize)); + + Connect(_sldGrayLevel->GetId() , wxEVT_SCROLL_THUMBRELEASE , (wxObjectEventFunction)(void (wxPanel::*)(wxScrollEvent&)) &wxManualPaintPanel::OnSldGrayLevel); + Connect(_graylevelCtrl->GetId() , wxEVT_COMMAND_TEXT_UPDATED , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnCtrTxtGrayLevel); + + Connect(_sldToleranceFill->GetId() , wxEVT_SCROLL_THUMBRELEASE , (wxObjectEventFunction)(void (wxPanel::*)(wxScrollEvent&)) &wxManualPaintPanel::OnSldToleranceFill); + Connect(_tolerancefillCtrl->GetId() , wxEVT_COMMAND_TEXT_UPDATED , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnCtrTxtToleranceFill); + + Connect(_sldDistanceFill->GetId() , wxEVT_SCROLL_THUMBRELEASE , (wxObjectEventFunction)(void (wxPanel::*)(wxScrollEvent&)) &wxManualPaintPanel::OnSldDistanceFill); + Connect(_distancefillCtrl->GetId() , wxEVT_COMMAND_TEXT_UPDATED , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnCtrTxtDistanceFill); + + Connect(_rb2D3D->GetId() , wxEVT_COMMAND_RADIOBOX_SELECTED , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::On2D3D); + Connect(_rbBrushForm->GetId() , wxEVT_COMMAND_RADIOBOX_SELECTED , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnBrushForm); + Connect(_rbBrushTool->GetId() , wxEVT_COMMAND_RADIOBOX_SELECTED , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnBrushTool); + Connect(btnCopy->GetId() , wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnCopy); + Connect(btnUndo->GetId() , wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnUndo); + + Connect(_mBarSlices->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onBarrange ); +// Connect(modBarRange->GetId(),98765,(wxObjectEventFunction) (wxCommandEventFunction) &wxWidgetSliderMinMax::onActualChange_Bar ); + Connect(_mBarSlices->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onActualChange_Bar ); + Connect(_mBarSlices->GetId(),wxEVT_TSBAR_START,(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onStartChange_Bar ); + Connect(_mBarSlices->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onEndChange_Bar ); + Connect(_mBarSlices->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onSelectionEnd ); + Connect(_mBarSlices->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onMovedBar ); + - Connect(_rb2D3D->GetId() , wxEVT_COMMAND_RADIOBOX_SELECTED , (wxObjectEventFunction) &wxManualPaintPanel::On2D3D); - Connect(_rbBrushForm->GetId() , wxEVT_COMMAND_RADIOBOX_SELECTED , (wxObjectEventFunction) &wxManualPaintPanel::OnBrushForm); - Connect(_rbBrushTool->GetId() , wxEVT_COMMAND_RADIOBOX_SELECTED , (wxObjectEventFunction) &wxManualPaintPanel::OnBrushTool); - Connect(btnCopy->GetId() , wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxManualPaintPanel::OnCopy); - Connect(btnUndo->GetId() , wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxManualPaintPanel::OnUndo); wxFlexGridSizer *sizer1 = new wxFlexGridSizer(1); + sizer1->Add(new wxStaticText(panel,-1,_T(" "))); sizer1->Add(tittleText); + sizer1->Add(new wxStaticText(panel,-1,_T(" "))); - sizer1->Add(txtBrushSize); - sizer1->Add(_sldBrushSize, 1, wxGROW ); - sizer1->Add(new wxStaticText(panel,-1,_T(" "))); - sizer1->Add(txtGrayLevel); + sizer1->Add(_rbBrushTool, 1, wxGROW ); + + wxFlexGridSizer *sizerGrayLevel = new wxFlexGridSizer(2); + sizerGrayLevel->Add(txtGrayLevel); + sizerGrayLevel->Add(_graylevelCtrl); + sizer1->Add(sizerGrayLevel, 1, wxGROW); sizer1->Add(_sldGrayLevel, 1, wxGROW ); - sizer1->Add(_graylevelCtrl); + + sizer1->Add( new wxStaticText( this, -1, _T( "Selected Range" ) ), 1, wxGROW ); + sizer1->Add( _mBarSlices, 1, wxGROW ); + sizer1->Add(new wxStaticText(panel,-1,_T(" "))); sizer1->Add(_rb2D3D, 1, wxGROW ); + + sizer1->Add(new wxStaticText(panel,-1,_T(" "))); - sizer1->Add(_rbBrushForm, 1, wxGROW ); + sizer1->Add(_txtBrushSize); + sizer1->Add(_sldBrushSize, 1, wxGROW ); + sizer1->Add(new wxStaticText(panel,-1,_T(" "))); - sizer1->Add(_rbBrushTool, 1, wxGROW ); + sizer1->Add(_rbBrushForm, 1, wxGROW ); + + wxFlexGridSizer *sizerTolerance = new wxFlexGridSizer(2); + sizerTolerance->Add(_txtToleranceFill); + sizerTolerance->Add(_tolerancefillCtrl); + sizer1->Add( sizerTolerance ); + sizer1->Add(_sldToleranceFill, 1, wxGROW ); + + wxFlexGridSizer *sizerDistance = new wxFlexGridSizer(2); + sizerDistance->Add(_txtDistanceFill); + sizerDistance->Add(_distancefillCtrl); + sizer1->Add( sizerDistance ); + sizer1->Add(_sldDistanceFill, 1, wxGROW ); + + sizer1->Add(new wxStaticText(panel,-1,_T(" "))); sizer1->Add(btnCopy, 1, wxGROW ); sizer1->Add(new wxStaticText(panel,-1,_T(" "))); @@ -109,7 +181,65 @@ void wxManualPaintPanel::OnCtrTxtGrayLevel(wxCommandEvent &event) } } +//--------------------------------------------------------------------------- +void wxManualPaintPanel::OnSldDistanceFill(wxScrollEvent& event) +{ + SetDistanceFill( (double)(_sldDistanceFill->GetValue()) ); + wxString text; + text.Printf( wxT("%d"), _sldDistanceFill->GetValue() ); + _distancefillCtrl->SetValue(text); +} + +//--------------------------------------------------------------------------- +void wxManualPaintPanel::OnCtrTxtDistanceFill(wxCommandEvent &event) +{ + double distancefill; + wxString text=_distancefillCtrl->GetValue(); + if (text.ToDouble(&distancefill)) + { + SetDistanceFill( distancefill ); + } +} + +//--------------------------------------------------------------------------- +void wxManualPaintPanel::OnSldToleranceFill(wxScrollEvent& event) +{ + SetToleranceFill( (double)(_sldToleranceFill->GetValue()) ); + + wxString text; + text.Printf( wxT("%d"), _sldToleranceFill->GetValue() ); + _tolerancefillCtrl->SetValue(text); +} + +//--------------------------------------------------------------------------- +void wxManualPaintPanel::OnCtrTxtToleranceFill(wxCommandEvent &event) +{ + double tolerance; + wxString text=_tolerancefillCtrl->GetValue(); + if (text.ToDouble(&tolerance)) + { + SetToleranceFill( tolerance ); + } +} + + + +//--------------------------------------------------------------------------- +void wxManualPaintPanel::DisableControls() +{ + _txtBrushSize->Disable(); + _sldBrushSize->Disable(); + _rbBrushForm->Disable(); + + _txtToleranceFill->Disable(); + _sldToleranceFill->Disable(); + _tolerancefillCtrl->Disable(); + + _txtDistanceFill->Disable(); + _sldDistanceFill->Disable(); + _distancefillCtrl->Disable(); +} //--------------------------------------------------------------------------- void wxManualPaintPanel::On2D3D(wxCommandEvent &event) @@ -120,14 +250,32 @@ void wxManualPaintPanel::On2D3D(wxCommandEvent &event) //--------------------------------------------------------------------------- void wxManualPaintPanel::OnBrushForm(wxCommandEvent &event) { - printf("EED wxManualPaintPanel::OnBrushForm BrushForm=%d \n", _rbBrushForm->GetSelection()); SetBrushForm( _rbBrushForm->GetSelection() ); } //--------------------------------------------------------------------------- void wxManualPaintPanel::OnBrushTool(wxCommandEvent &event) { - SetBrushTool( _rbBrushTool->GetSelection() ); + DisableControls(); + SetTool( _rbBrushTool->GetSelection() ); + + if (_rbBrushTool->GetSelection()==0) //Brush tool + { + _txtBrushSize->Enable(); + _sldBrushSize->Enable(); + _rbBrushForm->Enable(); + } + + if (_rbBrushTool->GetSelection()==1) //Fill tool + { + _txtToleranceFill->Enable(); + _sldToleranceFill->Enable(); + _tolerancefillCtrl->Enable(); + + _txtDistanceFill->Enable(); + _sldDistanceFill->Enable(); + _distancefillCtrl->Enable(); + } } //--------------------------------------------------------------------------- @@ -139,3 +287,39 @@ void wxManualPaintPanel::OnCopy(wxCommandEvent &event) void wxManualPaintPanel::OnUndo(wxCommandEvent &event) { } + +//-------------------------------------------------------------------------------------------------------------------------------- +// Min-Max Barrange received events +//-------------------------------------------------------------------------------------------------------------------------------- +void wxManualPaintPanel :: onBarrange(wxCommandEvent& event) +{ +} +void wxManualPaintPanel :: onActualChange_Bar(wxCommandEvent& event) +{ + /*mbbtkSliderMinMax->bbSetOutputOutActual(modBarRange->GetActual()); + mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutActual"));*/ +} +void wxManualPaintPanel :: onStartChange_Bar(wxCommandEvent& event) +{ + SetRangeMin( _mBarSlices->GetStart() ); +} + +void wxManualPaintPanel :: onEndChange_Bar(wxCommandEvent& event) +{ + SetRangeMax( _mBarSlices->GetEnd() ); +} + +void wxManualPaintPanel :: onSelectionEnd(wxCommandEvent& event) +{ +} + +void wxManualPaintPanel :: onMovedBar(wxCommandEvent& event) +{ +} + //-------------------------------------------------------------------------- + //------------------------------------------------------------------------- + //-------------------------------------------------------------------------- + //-------------------------------------------------------------------------- + + +