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);
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);
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);
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);
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 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());
}
}
//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 ; ii<sizeLstContourThings ; ii++)
+ {
+ _grid->SetCellValue( sizeZ, ii, _T(" ") );
+ } // for ii
+
}
void interfInformationPanel::setStringInfoPanel(wxString tmpString){
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
git://git.creatis.insa-lyon.fr / creaContours.git / blobdiff