X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfMainPanel.cxx;h=1d4bdfc5d54dad71dfb0ec78dcc0e20b770df102;hb=b128ce9887ab3b60445acb9cccdad0eb5f5658d9;hp=4f75c89106ed1713e3d62410da764d71ddcaf666;hpb=022ea4ddf8cd8a991cc9060f3c13e51af6bc226e;p=creaContours.git diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx index 4f75c89..1d4bdfc 100644 --- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx +++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx @@ -409,10 +409,6 @@ int interfMainPanel::GetImageDataSizeZ(){ return wxContourMainFrame::getInstance()->GetImageDataSizeZ(); } -void interfMainPanel::GetImageDataRange(double *range){ - wxContourMainFrame::getInstance()->GetImageDataRange(range); -} - void interfMainPanel::onSegmentationAllSlice(int minZ,int maxZ,int isovalue,int sampling,int method){ wxContourMainFrame::getInstance()->onSegmentationAllSlice(minZ, maxZ,isovalue,sampling,method); } @@ -561,10 +557,10 @@ void interfMainPanel::setStringSpread(std::string stringtemp){ void interfMainPanel::onInformationPressed(){ if(infoWin ==NULL){ - infoWin = new wxFrame (this, -1,_T(" Spread "), wxDefaultPosition, wxDefaultSize, wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT | wxRESIZE_BORDER ); - infoWin->SetSize( wxSize(500,450) ); + infoWin = new wxFrame (this, -1,_T(" Statistics "), wxDefaultPosition, wxDefaultSize, wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT | wxRESIZE_BORDER ); + infoWin->SetSize( wxSize(825,650) ); - wxSize sizepanel(200,300); + wxSize sizepanel(825,675); informationPanel = new interfInformationPanel(infoWin);//contourevent->getInformationPanel(infoWin); wxBoxSizer * sizerPanel = new wxBoxSizer(wxHORIZONTAL); @@ -627,8 +623,11 @@ void interfMainPanel::setColLableInfoPanel(int tmpIntB,wxString tmpTitleString){ } -void interfMainPanel::onSaveResults(std::string directory,std::string namefile, std::string filename, int typeContourGroup){ - wxContourMainFrame::getInstance()->onSaveResults(directory, namefile,filename, typeContourGroup); +void interfMainPanel::onSaveResults(std::string directory,std::string namefile, std::string filename, + int typeContourGroup, bool XYZValues, bool contourImage, bool statistics) +{ + wxContourMainFrame::getInstance()->onSaveResults(directory, namefile, filename, + typeContourGroup, XYZValues, contourImage, statistics); } wxString interfMainPanel::getCellValue(int j,int i){ @@ -757,3 +756,9 @@ void interfMainPanel::onThresholdPressed() showPanel(thresholdPanel); } +void interfMainPanel::ShowResultImages(int typeContourGroup) +{ + wxContourMainFrame::getInstance()->ShowResultImages(typeContourGroup); +} + +