X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfSegmentationMenu.cxx;h=5491252cd4f44e7c1d6f58cbe269d20e94fb78c1;hb=b935f54c82b090852001860eb12f5433779c22c4;hp=fb5e8eae932d81bdd7ad35aa9259541cdf9ac8b4;hpb=192dfdf774a06066eff90e9c50916723c8592706;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfSegmentationMenu.cxx b/lib/Interface_Icons_NDimensions/interfSegmentationMenu.cxx
index fb5e8ea..5491252 100644
--- a/lib/Interface_Icons_NDimensions/interfSegmentationMenu.cxx
+++ b/lib/Interface_Icons_NDimensions/interfSegmentationMenu.cxx
@@ -5,14 +5,13 @@ interfSegmentationMenu::interfSegmentationMenu(wxWindow * parent, int sizex, int
 	: interfMenuBar(parent, sizex, sizey)
 {
 	this->datadir = datdir;
-	contourevent = (wxContourEventHandler*)evtHandler;
+	//contourevent = (wxContourEventHandler*)evtHandler;
 	infoWin = NULL;
 	configPanel = NULL;
-	segmentPanel = NULL;
 	spreadPanel = NULL;
 	segmentPanelITK = NULL;
 	
-	eventHandler = evtHandler;
+	//eventHandler = evtHandler;
 
 	initButtons(this);
 }
@@ -55,65 +54,24 @@ interfSegmentationMenu::~interfSegmentationMenu()
 
 
 void  interfSegmentationMenu::onSegmentationPressed(wxCommandEvent& event){
-    if(segmentPanel == NULL){
-		segmentPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(""));
-			
-
-		wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);	
-		segmentPanel->SetSizer(flexsizer, true);
-		segmentPanel->SetAutoLayout( true );	
-		segmentPanel->SetEventHandler(this->contourevent);
-		
-		wxPanel* panel = contourevent->getSegmentationPanel(segmentPanel);
-	
-
-		wxStaticText* stattext = new wxStaticText(segmentPanel, -1, wxString("   Automatic Segmentation   "), wxDefaultPosition,
-			wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(""));
 
-		flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
-		flexsizer->Add(panel, wxEXPAND);
-		segmentPanel->Layout();
-	}
-	interfMainPanel::getInstance()->showPanel(segmentPanel);
-	contourevent->showAxis(true);
-	axisshown = true;
+	interfMainPanel::getInstance()->onSegmentationPressed();
 }
 
 
-void interfSegmentationMenu::hideAxis(){
-	if(axisshown){
-		axisshown = false;
-		contourevent->showAxis(axisshown);
-	}
-}
 
 void  interfSegmentationMenu::onSegmentationPressedITK(wxCommandEvent& event){
-    if(segmentPanelITK == NULL){
-		segmentPanelITK = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(""));
-			
-
-		wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);	
-		segmentPanelITK->SetSizer(flexsizer, true);
-		segmentPanelITK->SetAutoLayout( true );	
-		segmentPanelITK->SetEventHandler(this->contourevent);
-		
-		wxPanel* panel = contourevent->getSegmentationPanelITK(segmentPanelITK);
-	
 
-		wxStaticText* stattext = new wxStaticText(segmentPanelITK, -1, wxString("   Automatic ITK Segmentation   "), wxDefaultPosition,
-			wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(""));
+	interfMainPanel::getInstance()->onSegmentationPressedITK();
 
-		flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
-		flexsizer->Add(panel, wxEXPAND);
-		segmentPanelITK->Layout();
-	}
-	interfMainPanel::getInstance()->showPanel(segmentPanelITK);
-	//contourevent->showAxis(true);
-	//axisshown = true;
+    
 }
 
 void  interfSegmentationMenu::onSnakePressed(wxCommandEvent& event){
     
-	contourevent->onSnakePressed(this);
+	interfMainPanel::getInstance()->onSnakePressed();
 
 }
+
+//------------------------------------------------------------------------------------------------------------
+