X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FInterface_Icons_NDimensions%2FinterfToolsPanels.cxx;h=671047dda4d1abd67e819701e4e58df8bb692e59;hb=c86e56d7883a16ec6734f64b61b3d87e49527a43;hp=baa8cd810574b04aa25fa41ab78fd3dabd8e2727;hpb=866b5d203f30800ea0c9c7ab22901776c695ffd0;p=creaContours.git diff --git a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx index baa8cd8..671047d 100644 --- a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx +++ b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx @@ -51,9 +51,25 @@ 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") ); + _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); @@ -62,20 +78,44 @@ interfConfigurationPanel::interfConfigurationPanel(wxWindow * parent) Connect( _brithtnessColorLevel->GetId() , wxEVT_SCROLL_CHANGED, (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel); Connect( _brithtnessColorLevel->GetId() , wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel); Connect( _interpolationCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &interfConfigurationPanel::OnInterpolation); + 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( new wxStaticText(this,-1, _T("Color level")) , 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( new wxStaticText(this ,-1, _T(" ")) , 1, wxGROW ); + sizerB -> Add( _showTextContourCheckBox , 1, wxGROW ); + sizerB -> Add( new wxStaticText(this,-1, _T(" ")) , 1, wxGROW ); + sizerB -> Add( _beforContourCheckBox , 1, wxGROW ); + sizerB -> Add( _afterContourCheckBox , 1, wxGROW ); + sizerB -> Add( new wxStaticText(this,-1, _T(" ")) , 1, wxGROW ); + sizerB -> Add( sizerB1 , 1, wxGROW ); + sizerB -> Add( _jumpSpinCtrl , 1, wxGROW ); + sizerB -> Add( _shiftSpinCtrl , 1, wxGROW ); + - wxFlexGridSizer * sizer = new wxFlexGridSizer(1); - sizer -> Add( new wxStaticText(this,-1, _T("Contour width")) , 1, wxGROW ); - sizer -> Add( _withOfContourLine , 1, wxGROW ); - sizer -> Add( new wxStaticText(this,-1, _T(" ")) , 1, wxGROW ); - sizer -> Add( new wxStaticText(this,-1, _T(" ")) , 1, wxGROW ); - sizer -> Add( new wxStaticText(this,-1, _T("Brightness of the image")) , 1, wxGROW ); - sizer -> Add( new wxStaticText(this,-1, _T("--Window level--")) , 1, wxGROW ); - sizer -> Add( _brithtnessWindowLevel , 1, wxGROW ); - sizer -> Add( new wxStaticText(this,-1, _T("--Color level--")) , 1, wxGROW ); - sizer -> Add( _brithtnessColorLevel, 1, wxGROW ); - sizer -> Add( new wxStaticText(this,-1, _T(" ")) , 1, wxGROW ); - sizer -> Add( new wxStaticText(this,-1, _T(" ")) , 1, wxGROW ); - sizer -> Add( _interpolationCheckBox , 1, wxGROW ); + 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 ); //JCP 13-10-08 @@ -91,8 +131,8 @@ interfConfigurationPanel::~interfConfigurationPanel() { } -void interfConfigurationPanel::onWidthOfContour(wxScrollEvent& event){ - +void interfConfigurationPanel::onWidthOfContour(wxScrollEvent& event) +{ double width = (double)_withOfContourLine->GetValue() / 2.0; interfMainPanel::getInstance()->onWidthOfContour(width); } @@ -100,19 +140,35 @@ void interfConfigurationPanel::onWidthOfContour(wxScrollEvent& event){ void interfConfigurationPanel::onBrigthnessColorWindowLevel(wxScrollEvent& event){ int colorwindow = _brithtnessColorLevel->GetValue(); int windowlevel = _brithtnessWindowLevel->GetValue(); - interfMainPanel::getInstance()->onBrigthnessColorWindowLevel(colorwindow, windowlevel); - } void interfConfigurationPanel::OnInterpolation(wxCommandEvent& event) { - interfMainPanel::getInstance()->onInterpolation(_interpolationCheckBox->GetValue()); +} + +void interfConfigurationPanel::OnBeforAfterContour(wxCommandEvent& event) +{ + interfMainPanel::getInstance()->onBeforAfterContour(_beforContourCheckBox->GetValue() , _afterContourCheckBox->GetValue() ); +} + +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 **/ @@ -195,7 +251,15 @@ void interfSpreadPanel::appendStringSpread(std::string val){ /* // if */ wxString newstring; //newstring.Printf("%s %d -",_wxtextctrlSpread->GetValue(), actualSlice ); + +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 newstring.append(wxString(_wxtextctrlSpread->GetValue(),wxConvUTF8)); +#else + newstring.append( _wxtextctrlSpread->GetValue() ); +#endif + + newstring.append(wxString(" ",wxConvUTF8)); newstring.append(wxString(val.c_str(),wxConvUTF8)); _wxtextctrlSpread->SetValue(newstring); @@ -213,8 +277,10 @@ void interfSpreadPanel::setStringSpread(std::string stringtemp){ ** Begin of information panel **/ interfInformationPanel::interfInformationPanel(wxWindow * parent) -: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN) +//: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN) +: wxPanel(parent, -1) { +printf("EED interfInformationPanel::interfInformationPanel Start\n"); //wxPanel *panel = new wxPanel(parent,-1,wxDefaultPosition, wxDefaultSize,wxTAB_TRAVERSAL); wxString lstOptions[4]; lstOptions[0]=_T("Current Slice"); @@ -222,7 +288,6 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent) // lstOptions[2]=_T("All Slices"); _informationRadiobox = new wxRadioBox(this, -1, _T("Slice analysis"), wxDefaultPosition, wxSize(270,45), 2 , lstOptions, 2, wxRA_SPECIFY_COLS); - wxString lstOptContOperation[5]; lstOptContOperation[0]=_T("AND"); lstOptContOperation[1]=_T("OR"); @@ -232,53 +297,73 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent) _radiolstboxContourGroup->SetSelection(1); Connect( _radiolstboxContourGroup->GetId(), wxEVT_COMMAND_RADIOBOX_SELECTED , (wxObjectEventFunction) &interfInformationPanel::onContourGroup ); +printf("EED interfInformationPanel::interfInformationPanel 1\n"); - _XYZValues = new wxCheckBox(this, -1, _T("Save Contour Values") ); - _XYZValues->SetValue(true); - _contourImage = new wxCheckBox(this, -1, _T("Extract Contours as Images") ); + _XYZValues = new wxCheckBox(this, -1, _T("Save Contour Values") ); + _XYZValues->SetValue(true); + _contourImage = new wxCheckBox(this, -1, _T("Extract Contours as Images") ); _contourImage->SetValue(true); - - _statistics = new wxCheckBox(this, -1, _T("Save Statistics") ); + _statistics = new wxCheckBox(this, -1, _T("Save Statistics") ); _statistics->SetValue(true); + wxButton *informationContourLabelsBtn = new wxButton(this,-1,_T("Contour labels"),wxDefaultPosition, wxSize(140,35) ); +#if wxMAJOR_VERSION <= 2 informationContourLabelsBtn->SetEventHandler( this ); +#else + // informationContourLabelsBtn->SetEventHandler( this ); + printf("EED interfInformationPanel::interfInformationPanel OOOjjjooooooo informationContourLabelsBtn->SetEventHandler \n"); +#endif Connect( informationContourLabelsBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onInformationContourLabels ); wxButton *statisticsContourBtn = new wxButton(this,-1,_T("Contour statistics"),wxDefaultPosition, wxSize(140,35) ); +#if wxMAJOR_VERSION <= 2 statisticsContourBtn->SetEventHandler( this ); +#else + //statisticsContourBtn->SetEventHandler( this ); + printf("EED interfInformationPanel::interfInformationPanel OOOjjjooooooo statisticsContourBtn->SetEventHandler \n"); +#endif Connect( statisticsContourBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onExtractInformation ); wxButton *showResultImagesBtn = new wxButton(this,-1,_T("Show result images"),wxDefaultPosition, wxSize(140,35) ); +#if wxMAJOR_VERSION <= 2 showResultImagesBtn->SetEventHandler( this ); +#else + //showResultImagesBtn->SetEventHandler( this ); + printf("EED interfInformationPanel::interfInformationPanel OOOjjjooooooo showResultImagesBtn->SetEventHandler \n"); +#endif Connect( showResultImagesBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onShowResultImages ); - wxButton *saveResultsBtn = new wxButton(this,-1,_T("Save Results"),wxDefaultPosition, wxSize(140,35) ); +#if wxMAJOR_VERSION <= 2 saveResultsBtn->SetEventHandler( this ); - Connect( saveResultsBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onSaveResults ); +#else +//EED saveResultsBtn->SetEventHandler( this ); +printf("EED interfInformationPanel::interfInformationPanel OOOjjjooooooo saveResultsBtn->SetEventHandler \n"); +#endif + Connect( saveResultsBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onSaveResults ); int sizeZ = interfMainPanel::getInstance()->GetImageDataSizeZ(); + //_theViewPanel->getSceneManager()->GetImageDataSizeZ(); _mbarrangeSliceInformation = new mBarRange(this,65,65); _mbarrangeSliceInformation->SetMin(0); _mbarrangeSliceInformation->SetStart(0); - _mbarrangeSliceInformation-> SetOrientation( true ); - _mbarrangeSliceInformation-> setActiveStateTo(true); - _mbarrangeSliceInformation-> setVisibleLabels( true ); - _mbarrangeSliceInformation-> setDeviceEndMargin(10); - _mbarrangeSliceInformation-> setRepresentedValues( 0 , sizeZ-1 ); - _mbarrangeSliceInformation-> setDeviceBlitStart(10,10); - _mbarrangeSliceInformation-> setIfWithActualDrawed( false ); - _mbarrangeSliceInformation-> SetStart( 0 ); - _mbarrangeSliceInformation-> SetEnd( sizeZ-1 ); - - + _mbarrangeSliceInformation->SetOrientation( true ); + _mbarrangeSliceInformation->setActiveStateTo(true); + _mbarrangeSliceInformation->setVisibleLabels( true ); + _mbarrangeSliceInformation->setDeviceEndMargin(10); + _mbarrangeSliceInformation->setRepresentedValues( 0 , sizeZ-1 ); + _mbarrangeSliceInformation->setDeviceBlitStart(10,10); + _mbarrangeSliceInformation->setIfWithActualDrawed( false ); + _mbarrangeSliceInformation->SetStart( 0 ); + _mbarrangeSliceInformation->SetEnd( sizeZ-1 ); double range[2]; interfMainPanel::getInstance()->getImageRange(range); +printf("EED interfInformationPanel::interfInformationPanel 2\n"); int min = (int)floor (range[0]); int max = (int)ceil (range[1]); @@ -305,61 +390,89 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent) Connect(_mbarrangeRangeInformation->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction) &interfInformationPanel::onRangeSliceInformation ); +printf("EED interfInformationPanel::interfInformationPanel 3\n"); _staticTextInformation = new wxStaticText(this,-1,_T(" ")); - _grid = new wxGrid( this, wxID_ANY, wxPoint( 0, 0 ), - wxSize( 200, 500 ) ); - + wxSize( 200, 250 ) ); int i,gridCol=10,gridRow=sizeZ+2; _grid->CreateGrid( 0, 0 ); _grid->AppendRows(gridRow); _grid->AppendCols(gridCol); - for (i=0;iSetRowLabelValue(i, _T(" ") ); } // _grid->SetColLabelSize(0); - - FillGridWithContoursInformation(); + +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 wxFlexGridSizer * sizerSave = new wxFlexGridSizer(2,2); +#else + wxFlexGridSizer * sizerSave = new wxFlexGridSizer(2,2,0,0); +#endif sizerSave -> Add( new wxStaticText(this,-1,_T("Save Options: ")) , 1, wxGROW ); sizerSave->Add( _XYZValues, 1, wxALL, 2 ); sizerSave->Add( _statistics, 1, wxALL, 2 ); sizerSave->Add( _contourImage, 1, wxALL, 2 ); + +printf("EED interfInformationPanel::interfInformationPanel 4\n"); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 wxFlexGridSizer * sizerA = new wxFlexGridSizer(10); +#else + wxFlexGridSizer * sizerA = new wxFlexGridSizer(1,10,0,0); +#endif sizerA->Add( _informationRadiobox, 1, wxALL, 2 ); sizerA->Add( _radiolstboxContourGroup, 1, wxALL, 2 ); sizerA->Add( sizerSave, 1, wxALL, 2 ); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 wxFlexGridSizer * sizerB = new wxFlexGridSizer(10); +#else + wxFlexGridSizer * sizerB = new wxFlexGridSizer(1,4,0,0); +#endif sizerB->Add( informationContourLabelsBtn, 1, wxALL, 2 ); sizerB->Add( statisticsContourBtn, 1, wxALL, 2 ); sizerB->Add( showResultImagesBtn, 1, wxALL, 2 ); sizerB->Add( saveResultsBtn, 1, wxALL, 2 ); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 wxFlexGridSizer * sizer = new wxFlexGridSizer(1,8); +#else + wxFlexGridSizer * sizer = new wxFlexGridSizer(20,1,0,0); +#endif +printf("EED interfInformationPanel::interfInformationPanel 5\n"); sizer->Add( sizerA , 1, wxALL , 0 ); - sizer->Add( new wxStaticText(this ,-1,_T("Slice Range")) , 1, wxALL , 0 ); +printf("EED interfInformationPanel::interfInformationPanel 5.1\n"); + sizer->Add( new wxStaticText(this ,1,_T("Slice Range")) , 1, wxALL , 0 ); +printf("EED interfInformationPanel::interfInformationPanel 5.2\n"); sizer->Add( _mbarrangeSliceInformation , 1, wxALL|wxGROW , 2 ); - sizer->Add( new wxStaticText(this ,-1,_T("Gray Range")) , 1, wxALL , 0 ); +printf("EED interfInformationPanel::interfInformationPanel 5.3\n"); + sizer->Add( new wxStaticText(this ,1,_T("Gray Range")) , 1, wxALL , 0 ); +printf("EED interfInformationPanel::interfInformationPanel 5.4\n"); sizer->Add( _mbarrangeRangeInformation , 1, wxALL|wxGROW , 2 ); + + sizer->Add( sizerB , 1, wxEXPAND , 0 ); sizer->Add( _staticTextInformation , 1, wxEXPAND , 0 ); sizer->Add( _grid , 1, wxEXPAND , 0 ); - this->SetSizer( sizer ); this->SetSize( wxSize(1500,1500) ); - //this->SetBackgroundColour( wxColour(100,100,100) ); this->SetAutoLayout( true ); +printf("EED interfInformationPanel::interfInformationPanel 5.10\n"); this->Layout(); //return panel; + +printf("EED interfInformationPanel::interfInformationPanel End\n"); + } interfInformationPanel::~interfInformationPanel() @@ -409,7 +522,12 @@ void interfInformationPanel::onExtractInformation(wxCommandEvent& event){ void interfInformationPanel::onSaveResults(wxCommandEvent& event) { +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 wxFileDialog dialog(this, _T("Choose a filename"), _T(""), _T(""), wxFileSelectorDefaultWildcardStr, wxSAVE ); +#else + wxFileDialog dialog(this, _T("Choose a filename"), _T(""), _T(""), wxFileSelectorDefaultWildcardStr, wxFD_SAVE ); +#endif if (dialog.ShowModal() == wxID_OK) { onExtractInformation( event );