X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfMainPanel.cxx;h=1d4bdfc5d54dad71dfb0ec78dcc0e20b770df102;hb=a6507d91019d9f428af751e5b0b3a7d19d6f0bf6;hp=60a8d17c929c0bc164365d0ddceb4f41dd52d1fc;hpb=9f3ce26fe4bcc20f4927bec7ec25de8787ca2a1d;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index 60a8d17..1d4bdfc 100644
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -12,6 +12,7 @@
 */
 
 interfMainPanel* interfMainPanel::interfmainpanel=NULL;
+wxFrame* interfMainPanel::_newframe=NULL;
 
 interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtHandler * evtHandler, std::string datadir)
 : wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN)
@@ -124,29 +125,31 @@ interfMainPanel::~interfMainPanel(void)
 
 interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, std::string datadir, wxEvtHandler * evtHandler){	
 
-	wxFrame* newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT);
+	_newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT);
 	
 																						
 	if(interfmainpanel == NULL){
-		interfmainpanel = new interfMainPanel(newframe, 350, 850, evtHandler, datadir);
+		interfmainpanel = new interfMainPanel(_newframe, 350, 850, evtHandler, datadir);
 	}
 
-	newframe->Show(TRUE);
+	_newframe->Show(TRUE);
 	return interfmainpanel;
 }
 
 interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, wxEvtHandler * evtHandler){	
 
-	wxFrame* newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT );
+	_newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT );
 
 	if(interfmainpanel == NULL){
-		interfmainpanel = new interfMainPanel(newframe, 350, 850, evtHandler);
+		interfmainpanel = new interfMainPanel(_newframe, 350, 850, evtHandler);
 	}
 
-	newframe->Show(TRUE);
+	_newframe->Show(TRUE);
 	return interfmainpanel;
 }
-
+bool interfMainPanel::Show(bool show){
+	return _newframe->Show(show);
+}
 interfMainPanel* interfMainPanel::getInstance()
 {	
 
@@ -155,7 +158,8 @@ interfMainPanel* interfMainPanel::getInstance()
 
 void interfMainPanel :: resetInstance()
 {
-	delete interfmainpanel;
+	//delete interfmainpanel;
+	delete _newframe;
 	interfmainpanel = NULL;
 }
 
@@ -405,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);
 }
@@ -557,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);
@@ -623,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){
@@ -701,17 +704,17 @@ void interfMainPanel::onMirrorChangeWidth(int width)
 }
 
 
-void interfMainPanel::onThreshold(int minVal, int maxVal)
+void interfMainPanel::onThreshold()
 {
-	wxContourMainFrame::getInstance()->onThreshold(minVal, maxVal);
+	wxContourMainFrame::getInstance()->onThreshold();
 }
 
-void interfMainPanel::onThresholdChange(int minVal, int maxVal)
+void interfMainPanel::onThresholdChange()
 {
-	wxContourMainFrame::getInstance()->onThresholdChange(minVal, maxVal);
+	wxContourMainFrame::getInstance()->onThresholdChange();
 }
 
-void interfMainPanel::onThresholdInstantChange(int range[])
+void interfMainPanel::onThresholdInstantChange(double range[])
 {
 	panelThreshold->onThresholdInstantChange(range);
 }
@@ -752,3 +755,10 @@ void interfMainPanel::onThresholdPressed()
 	}	
 	showPanel(thresholdPanel);
 }
+
+void interfMainPanel::ShowResultImages(int typeContourGroup)
+{
+	wxContourMainFrame::getInstance()->ShowResultImages(typeContourGroup);
+}
+
+