X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfToolsPanels.cxx;h=caad0115465dcfb2010f17b6e4dfc1dfc985b7d7;hb=00bfeafb3fccce1256ae503a345ebfcaacc6a960;hp=ea290acd2a6812d31c141fbbb5a1acd943c4c76f;hpb=ef966ac5e14dc46db8fc657c7892c9af975eb2a3;p=creaContours.git diff --git a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx index ea290ac..caad011 100644 --- a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx +++ b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx @@ -51,19 +51,24 @@ interfConfigurationPanel::interfConfigurationPanel(wxWindow * parent) _brithtnessWindowLevel = new wxSlider(this, -1, windowlevel , min, max, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); _brithtnessColorLevel = new wxSlider(this, -1, colorwindow , min, max, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); - _interpolationCheckBox = new wxCheckBox(this, -1, _T("Image Interpolation") ); + _interpolationCheckBox = new wxCheckBox(this, -1, _T("Interpolation") ); _interpolationCheckBox->SetValue(true); - _showTextContourCheckBox = new wxCheckBox(this, -1, _T("Labels Contours") ); + _showTextContourCheckBox = new wxCheckBox(this, -1, _T("Labels") ); _showTextContourCheckBox->SetValue(true); - _beforContourCheckBox = new wxCheckBox(this, -1, _T("Befor Contour") ); _beforContourCheckBox->SetValue(false); _afterContourCheckBox = new wxCheckBox(this, -1, _T("After Contour") ); _afterContourCheckBox->SetValue(false); + wxButton *jumpBackwareSlice = new wxButton(this,-1,_T("/\\"),wxDefaultPosition, wxDefaultSize); + wxButton *jumpFordwareSlice = new wxButton(this,-1,_T("\\/"),wxDefaultPosition, wxDefaultSize); + _jumpSpinCtrl = new wxSpinCtrl(this,-1,wxString("10") ); + _jumpSpinCtrl->SetRange(1,100); + _shiftSpinCtrl = new wxSpinCtrl(this,-1,wxString("0") ); + _shiftSpinCtrl->SetRange(0,99); Connect( _withOfContourLine->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction) &interfConfigurationPanel::onWidthOfContour); Connect( _withOfContourLine->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction) &interfConfigurationPanel::onWidthOfContour); @@ -76,27 +81,40 @@ interfConfigurationPanel::interfConfigurationPanel(wxWindow * parent) Connect( _showTextContourCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &interfConfigurationPanel::OnShowTextContour); Connect( _beforContourCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &interfConfigurationPanel::OnBeforAfterContour); Connect( _afterContourCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &interfConfigurationPanel::OnBeforAfterContour); + Connect( jumpBackwareSlice->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfConfigurationPanel::OnBackwareSlice ); + Connect( jumpFordwareSlice->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfConfigurationPanel::OnFordwareSlice ); + wxFlexGridSizer * sizerA = new wxFlexGridSizer(1); sizerA -> Add( new wxStaticText(this,-1, _T("Contour width")) , 1, wxGROW ); sizerA -> Add( _withOfContourLine , 1, wxGROW ); sizerA -> Add( new wxStaticText(this,-1, _T(" ")) , 1, wxGROW ); sizerA -> Add( new wxStaticText(this,-1, _T("Window level")) , 1, wxGROW ); - sizerA -> Add( _brithtnessWindowLevel , 1, wxGROW ); + sizerA -> Add( _brithtnessWindowLevel , 1, wxGROW ); sizerA -> Add( new wxStaticText(this,-1, _T("Color level")) , 1, wxGROW ); - sizerA -> Add( _brithtnessColorLevel, 1, wxGROW ); + sizerA -> Add( _brithtnessColorLevel , 1, wxGROW ); sizerA -> Add( new wxStaticText(this,-1, _T(" ")) , 1, wxGROW ); + wxFlexGridSizer * sizerB1 = new wxFlexGridSizer(2); + sizerB1-> Add( jumpBackwareSlice , 1, wxGROW ); + sizerB1 -> Add( jumpFordwareSlice , 1, wxGROW ); + wxFlexGridSizer * sizerB = new wxFlexGridSizer(1); - sizerB -> Add( _interpolationCheckBox , 1, wxGROW ); + sizerB -> Add( _interpolationCheckBox , 1, wxGROW ); + sizerB -> Add( new wxStaticText(this ,-1, _T(" ")) , 1, wxGROW ); + sizerB -> Add( _showTextContourCheckBox , 1, wxGROW ); sizerB -> Add( new wxStaticText(this,-1, _T(" ")) , 1, wxGROW ); - sizerB -> Add( _showTextContourCheckBox , 1, wxGROW ); + sizerB -> Add( _beforContourCheckBox , 1, wxGROW ); + sizerB -> Add( _afterContourCheckBox , 1, wxGROW ); sizerB -> Add( new wxStaticText(this,-1, _T(" ")) , 1, wxGROW ); - sizerB -> Add( _beforContourCheckBox , 1, wxGROW ); - sizerB -> Add( _afterContourCheckBox , 1, wxGROW ); + sizerB -> Add( sizerB1 , 1, wxGROW ); + sizerB -> Add( _jumpSpinCtrl , 1, wxGROW ); + sizerB -> Add( _shiftSpinCtrl , 1, wxGROW ); + - wxFlexGridSizer * sizer = new wxFlexGridSizer(2); + wxFlexGridSizer * sizer = new wxFlexGridSizer(3); sizer -> Add( sizerA , 1, wxGROW ); + sizer -> Add( new wxStaticText(this,-1, _T(" ")) , 1, wxGROW ); sizer -> Add( sizerB , 1, wxGROW ); this->SetSizer( sizer ); @@ -140,6 +158,16 @@ void interfConfigurationPanel::OnShowTextContour(wxCommandEvent& event) interfMainPanel::getInstance()->onShowTextContour(_showTextContourCheckBox->GetValue() ); } +void interfConfigurationPanel::OnBackwareSlice(wxCommandEvent& event) +{ + interfMainPanel::getInstance()->onJumpSlice( -_jumpSpinCtrl->GetValue(), _shiftSpinCtrl->GetValue() ); +} + +void interfConfigurationPanel::OnFordwareSlice(wxCommandEvent& event) +{ + interfMainPanel::getInstance()->onJumpSlice( _jumpSpinCtrl->GetValue(), _shiftSpinCtrl->GetValue() ); +} + /** ** Begin of the spread panel