X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfToolsMenu.cxx;h=535a86ff7fc0eff02075da6cc8f98bad19b9697b;hb=6e3c929c883c405e0075fa8df10b12a935979367;hp=b4c8e007cc65dd7f4c7786564da579388a5ad54d;hpb=c80a486f463943ea0ce295ebca58fc10e956c38c;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx b/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx
index b4c8e00..535a86f 100644
--- a/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx
+++ b/lib/Interface_Icons_NDimensions/interfToolsMenu.cxx
@@ -5,14 +5,14 @@ interfToolsMenu::interfToolsMenu(wxWindow * parent, int sizex, int sizey,wxEvtHa
 	: interfMenuBar(parent, sizex, sizey)
 {
 	this->datadir = datdir;
-	contourevent = (wxContourEventHandler*)evtHandler;
-	infoWin = NULL;
+	//contourevent = (wxContourEventHandler*)evtHandler;
+	//infoWin = NULL;
 	configPanel = NULL;
 	segmentPanel = NULL;
 	spreadPanel = NULL;
 	segmentPanelITK = NULL;
 	
-	eventHandler = evtHandler;
+//	eventHandler = evtHandler;
 
 	initButtons(this);
 }
@@ -24,7 +24,7 @@ void interfToolsMenu::initButtons(wxEvtHandler* evtHandler) {
 
 	path.push_back(datadir + "/Spread.png");
 	nom.push_back("The selected contour will spread through all slides");
-	funct.push_back((wxObjectEventFunction) &interfMenuBar:: onActionButtonPressed);
+	funct.push_back((wxObjectEventFunction) &interfToolsMenu:: onRigidPressed);
 
 	path.push_back(datadir + "/Spread1.png");
 	nom.push_back("Select more than one contour and find the contours between them");
@@ -42,7 +42,7 @@ void interfToolsMenu::initButtons(wxEvtHandler* evtHandler) {
 	this->addButtons(path, nom);	
 	this->setVectorFunction(funct);
 
-	this->setButtonName(0, wxContour_ActionCommandsID::CHANGE_TOOL);
+	//this->setButtonName(0, wxContour_ActionCommandsID::CHANGE_TOOL);
 
 	this->connectEvents(evtHandler);
 	   
@@ -60,93 +60,27 @@ interfToolsMenu::~interfToolsMenu()
 	**	see setEventHandler(wxEventHandler*)
 	**/
 void interfToolsMenu::onRigidPressed(wxCommandEvent& event){
-	
+	interfMainPanel::getInstance()->onRigidPressed();
 }
 
 void  interfToolsMenu::onSpreadPressed(wxCommandEvent& event){
 
+	interfMainPanel::getInstance()->onSpreadPressed();
 
-	if(spreadPanel==NULL){
-
-		spreadPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
-		wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);	
-		spreadPanel->SetSizer(flexsizer, true);
-		spreadPanel->SetAutoLayout( true );	
-		spreadPanel->SetEventHandler(this->contourevent);
-		
-		wxPanel* panel = contourevent->getSpreadPanel(spreadPanel);
 	
-
-		wxStaticText* stattext = new wxStaticText(spreadPanel, -1, wxString(_T("   Automatic Spread   ")), wxDefaultPosition,
-			wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
-
-		flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
-		flexsizer->Add(panel, wxEXPAND);
-		spreadPanel->Layout();
-	}	
-	interfMainPanel::getInstance()->showPanel(spreadPanel);
-	hideAxis();
 }
 
 
 void  interfToolsMenu::onInformationPressed(wxCommandEvent& event){
 
-	if(infoWin ==NULL){
-		infoWin						= new wxFrame (interfMainPanel::getInstance()->getInfoPanel(), -1,_T("  Spread  "), wxDefaultPosition, wxDefaultSize, wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT | wxRESIZE_BORDER  );
-		infoWin->SetSize( wxSize(500,450) );
-		
-		wxSize sizepanel(200,300);
-		wxPanel *panel									= contourevent->getInformationPanel(infoWin);
-
-		wxBoxSizer * sizerPanel		= new wxBoxSizer(wxHORIZONTAL);
-		sizerPanel -> Add( panel->GetSizer()		, 1, wxEXPAND ,0);
-
-		infoWin->SetSizer( sizerPanel );
-		infoWin->SetAutoLayout( true );
-		infoWin->Layout();
-
-		infoWin->Show();		
+	interfMainPanel::getInstance()->onInformationPressed();
 
-	}else {
-
-		if (infoWin->IsShown()==true)
-		{
-			infoWin->Show(false);
-		} else  {
-			contourevent->FillGridWithContoursInformation();
-			infoWin->Show(true);
-		}
-	}	
+	
 }
 
 void  interfToolsMenu::onConfigurationPressed(wxCommandEvent& event){
 
-	if(configPanel == NULL){
-		configPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T("")));
-		wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);	
-		configPanel->SetSizer(flexsizer, true);
-		configPanel->SetAutoLayout( true );	
-		configPanel->SetEventHandler(this->contourevent);
-		
-		wxPanel* panel = contourevent->getConfigurationPanel(configPanel);
-
-		wxStaticText* stattext = new wxStaticText(configPanel, -1, wxString(_T("   Interface Configuration   ")), wxDefaultPosition,
-			wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
-
-		flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
+	interfMainPanel::getInstance()->onConfigurationPressed();
 
-		flexsizer->Add(panel, wxEXPAND);
-		configPanel->Layout();
-
-	}
-	interfMainPanel::getInstance()->showPanel(configPanel);
-
-	hideAxis();
 }
 
-void interfToolsMenu::hideAxis(){
-	if(axisshown){
-		axisshown = false;
-		contourevent->showAxis(axisshown);
-	}
-}