X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfToolsPanels.cxx;h=c4a05d0dbfc2700017249bbbfa1780468b681683;hb=2ddb9de651984bea4376da16a35e2f02a78a76c0;hp=08f736097b34d432237b9bcbfdf7dc353bcad5a3;hpb=ae4e82199b7c2de2c149f84be5a10edcce7596e0;p=creaContours.git diff --git a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx index 08f7360..c4a05d0 100644 --- a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx +++ b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx @@ -8,7 +8,7 @@ interfConfigurationPanel::interfConfigurationPanel(wxWindow * parent) _withOfContourLine = new wxSlider(this, -1, 1 , 1, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); double range[2]; - interfMainPanel::getInstance()->GetImageDataRange(range); + interfMainPanel::getInstance()->getImageRange(range); //this->_theViewPanel->getSceneManager()->GetImageDataRange(range); //wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)this->_theViewPanel->getWxVtkBaseView(); @@ -19,9 +19,12 @@ interfConfigurationPanel::interfConfigurationPanel(wxWindow * parent) int colorwindow = interfMainPanel::getInstance()->getColorWindow(); int windowlevel = interfMainPanel::getInstance()->getWindowLevel(); + int min = (int)floor (range[0]); + int max = (int)ceil (range[1]); + - _brithtnessWindowLevel = new wxSlider(this, -1, windowlevel , 1, (int)range[1], wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); - _brithtnessColorLevel = new wxSlider(this, -1, colorwindow , 1, (int)range[1], wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); + _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->SetValue(true); @@ -185,16 +188,20 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent) wxString lstOptions[4]; lstOptions[0]=_T("Current Slice"); lstOptions[1]=_T("Range Slices"); - lstOptions[2]=_T("All Slices"); - _informationRadiobox = new wxRadioBox(this, -1, _T("Slice analysis"), wxDefaultPosition, wxSize(270,45), 3 , lstOptions, 3, wxRA_SPECIFY_COLS); +// 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"); lstOptContOperation[2]=_T("XOR"); lstOptContOperation[3]=_T("ALL"); _radiolstboxContourGroup = new wxRadioBox(this, -1, _T("Contour group"), wxDefaultPosition, wxSize(270,45), 4 , lstOptContOperation, 4, wxRA_SPECIFY_COLS); - + _radiolstboxContourGroup->SetSelection(1); + Connect( _radiolstboxContourGroup->GetId(), wxEVT_COMMAND_RADIOBOX_SELECTED , (wxObjectEventFunction) &interfInformationPanel::onContourGroup ); + + _XYZValues = new wxCheckBox(this, -1, _T("Save Contour Values") ); _XYZValues->SetValue(true); @@ -212,11 +219,16 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent) statisticsContourBtn->SetEventHandler( this ); Connect( statisticsContourBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onExtractInformation ); + wxButton *showResultImagesBtn = new wxButton(this,-1,_T("Show result images"),wxDefaultPosition, wxSize(140,35) ); + showResultImagesBtn->SetEventHandler( this ); + Connect( showResultImagesBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onShowResultImages ); + + wxButton *saveResultsBtn = new wxButton(this,-1,_T("Save Results"),wxDefaultPosition, wxSize(140,35) ); saveResultsBtn->SetEventHandler( this ); Connect( saveResultsBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onSaveResults ); - - + + int sizeZ = interfMainPanel::getInstance()->GetImageDataSizeZ(); //_theViewPanel->getSceneManager()->GetImageDataSizeZ(); _mbarrangeSliceInformation = new mBarRange(this,65,65); @@ -232,22 +244,24 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent) _mbarrangeSliceInformation-> SetStart( 0 ); _mbarrangeSliceInformation-> SetEnd( sizeZ-1 ); - double range[2]; - interfMainPanel::getInstance()->GetImageDataRange(range); - //this->_theViewPanel->getSceneManager()->GetImageDataRange(range); - _mbarrangeRangeInformation = new mBarRange(this,65,65); + interfMainPanel::getInstance()->getImageRange(range); + + int min = (int)floor (range[0]); + int max = (int)ceil (range[1]); + + _mbarrangeRangeInformation = new mBarRange(this,65,65); _mbarrangeRangeInformation->SetMin(0); _mbarrangeRangeInformation->SetStart(0); _mbarrangeRangeInformation-> SetOrientation( true ); _mbarrangeRangeInformation-> setActiveStateTo(true); _mbarrangeRangeInformation-> setVisibleLabels( true ); _mbarrangeRangeInformation-> setDeviceEndMargin(10); - _mbarrangeRangeInformation-> setRepresentedValues( range[0] , range[1] ); + _mbarrangeRangeInformation-> setRepresentedValues( min , max ); _mbarrangeRangeInformation-> setDeviceBlitStart(10,10); _mbarrangeRangeInformation-> setIfWithActualDrawed( false ); - _mbarrangeRangeInformation-> SetStart( (int)range[0] ); - _mbarrangeRangeInformation-> SetEnd( (int)range[1] ); + _mbarrangeRangeInformation-> SetStart( min ); + _mbarrangeRangeInformation-> SetEnd( max ); _staticTextInformation = new wxStaticText(this,-1,_T(" ")); @@ -256,7 +270,7 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent) wxPoint( 0, 0 ), wxSize( 200, 500 ) ); - int i,gridCol=10,gridRow=sizeZ; + int i,gridCol=10,gridRow=sizeZ+2; _grid->CreateGrid( 0, 0 ); _grid->AppendRows(gridRow); _grid->AppendCols(gridCol); @@ -285,6 +299,7 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent) wxFlexGridSizer * sizerB = new wxFlexGridSizer(10); sizerB->Add( informationContourLabelsBtn, 1, wxALL ,2 ); sizerB->Add( statisticsContourBtn, 1, wxALL ,2 ); + sizerB->Add( showResultImagesBtn, 1, wxALL ,2 ); sizerB->Add( saveResultsBtn, 1, wxALL ,2 ); wxFlexGridSizer * sizer = new wxFlexGridSizer(1,8); @@ -311,31 +326,50 @@ void interfInformationPanel::onInformationContourLabels(wxCommandEvent& event){ wxBusyCursor wait; FillGridWithContoursInformation(); } + + +void interfInformationPanel::onShowResultImages(wxCommandEvent& event) +{ +// onExtractInformation( event ); + int selection = _informationRadiobox->GetSelection(); + int minZ = _mbarrangeSliceInformation->GetStart(); + int maxZ = _mbarrangeSliceInformation->GetEnd(); + int typeContourGroup = _radiolstboxContourGroup->GetSelection(); + interfMainPanel::getInstance()->ShowResultImages( typeContourGroup , selection, minZ, maxZ); +} + + void interfInformationPanel::onExtractInformation(wxCommandEvent& event){ wxBusyCursor wait; _grid->ClearGrid(); int typeContourGroup = this->_radiolstboxContourGroup->GetSelection(); - int selection = _informationRadiobox->GetSelection(); - int minZ = _mbarrangeSliceInformation->GetStart(); - int maxZ = _mbarrangeSliceInformation->GetEnd(); - - interfMainPanel::getInstance()->onInformationContourLabels(typeContourGroup, selection, minZ, maxZ); - + int selection = _informationRadiobox->GetSelection(); + int minZ = _mbarrangeSliceInformation->GetStart(); + int maxZ = _mbarrangeSliceInformation->GetEnd(); + int grayRangeMin = _mbarrangeRangeInformation->GetStart(); + int grayRangeMax = _mbarrangeRangeInformation->GetEnd(); + interfMainPanel::getInstance()->onInformationContourLabels(typeContourGroup, selection, minZ, maxZ,grayRangeMin,grayRangeMax); } + void interfInformationPanel::onSaveResults(wxCommandEvent& event) { - wxFileDialog dialog(this, _T("Choose a file"), _T(""), _T(""), _T("*.txt"), wxSAVE ); + wxFileDialog dialog(this, _T("Choose a filename"), _T(""), _T(""), wxFileSelectorDefaultWildcardStr, wxSAVE ); if (dialog.ShowModal() == wxID_OK) { onExtractInformation( event ); + int selection = _informationRadiobox->GetSelection(); + int minZ = _mbarrangeSliceInformation->GetStart(); + int maxZ = _mbarrangeSliceInformation->GetEnd(); std::string directory=(const char *)(dialog.GetDirectory().mb_str()); std::string namefile=(const char *)(dialog.GetFilename().mb_str()); std::string filename = (const char *)(dialog.GetPath().mb_str() ); int typeContourGroup = _radiolstboxContourGroup->GetSelection(); interfMainPanel::getInstance()->onSaveResults(directory, namefile, filename, - typeContourGroup, _XYZValues->GetValue(), _contourImage->GetValue(), _statistics->GetValue()); + typeContourGroup, + selection,minZ,maxZ, + _XYZValues->GetValue(), _contourImage->GetValue(), _statistics->GetValue()); } } @@ -370,8 +404,16 @@ void interfInformationPanel::FillGridWithContoursInformation(){ //tempString = wxString((*contourthing)->getName().c_str(),wxConvUTF8) ; tempString = wxString(lstContourThings[ii].c_str(),wxConvUTF8) ; _grid->SetCellValue( z, ii, tempString ); - } - } + } // for ii + }// for z + + // Last line + _grid->SetRowLabelValue(sizeZ, _T(" ") ); + for (ii=0 ; iiSetCellValue( sizeZ, ii, _T(" ") ); + } // for ii + } void interfInformationPanel::setStringInfoPanel(wxString tmpString){ @@ -402,3 +444,55 @@ wxString interfInformationPanel::getCellValue(int j,int i){ return _grid->GetCellValue( j , i ); } +void interfInformationPanel::onContourGroup(wxCommandEvent& event) +{ + printf("EED interfInformationPanel::onContourGroup \n"); + int contourGroup=_radiolstboxContourGroup->GetSelection(); + if (contourGroup==3) + { + contourGroup=0; + } + interfMainPanel::getInstance()->SetContourGroup( _radiolstboxContourGroup->GetSelection() ); +} + +//CMRU 29-08-09----------------------------------------------------------------------------------------------- +interfCalibrationPanel:: interfCalibrationPanel(wxWindow * parent) +: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN) +{ + double range[2]; + interfMainPanel::getInstance()->getImageRange(range); + + //Radio buttons + wxString options[3]; + options[0]=_T("mm"); + options[1]=_T("cm"); + options[2]=_T("inch"); + + _unitsRadiobox = new wxRadioBox(this, -1, _T("Unit of measurement"), wxPoint(2, 25), wxSize(145,45), 3 , options, 3, wxRA_SPECIFY_COLS); + _unitsRadiobox->SetSelection(0); + + //The label + new wxStaticText(this, wxID_ANY, wxT("Real Size: "), wxPoint(2, 5)); + + //Text Control + _size = new wxTextCtrl(this, wxID_ANY, wxT(""), wxPoint(78,3), wxSize(70, 20), 0, wxDefaultValidator, wxTextCtrlNameStr); + + //The button + new wxButton(this, 1, wxT("Calibrate"), wxPoint(78, 70), wxSize(70, 25), 0, wxDefaultValidator, wxT("button")); + + //Conexion del boton con su respectivo manejador + Connect(1, wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction) &interfCalibrationPanel::onCalibrate); + +} + +interfCalibrationPanel:: ~interfCalibrationPanel() +{ +} + +void interfCalibrationPanel::onCalibrate(wxCommandEvent& event) +{ + wxString size =_size->GetValue(); + int unit = _unitsRadiobox->GetSelection(); + interfMainPanel::getInstance()->onCalibration(size, unit); +} +//------------------------------------------------------------------------------------------------------------ \ No newline at end of file