X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfNewContourMenu.cxx;h=75660640030e122cc90549e1aa2748fad5948c9c;hb=532e76344aea0ee609187d05b871ddcb755f4d35;hp=5b12bd3951f99ad87ca189c8a974295432fc2159;hpb=192dfdf774a06066eff90e9c50916723c8592706;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfNewContourMenu.cxx b/lib/Interface_Icons_NDimensions/interfNewContourMenu.cxx
index 5b12bd3..7566064 100644
--- a/lib/Interface_Icons_NDimensions/interfNewContourMenu.cxx
+++ b/lib/Interface_Icons_NDimensions/interfNewContourMenu.cxx
@@ -5,12 +5,12 @@ interfNewContourMenu::interfNewContourMenu(wxWindow * parent, int sizex, int siz
 	: interfMenuBar(parent, sizex, sizey)
 {
 	this->datadir = datdir;
-	eventHandler = (wxContourEventHandler*)evtHandler;
+	//eventHandler = (wxContourEventHandler*)evtHandler;
 
 	panBull = NULL;
 	created = false;
 
-	initButtons(evtHandler);	
+	initButtons(this);	
 }
 
 void interfNewContourMenu::initButtons(wxEvtHandler* evtHandler) {
@@ -21,17 +21,17 @@ void interfNewContourMenu::initButtons(wxEvtHandler* evtHandler) {
 	
 	path.push_back(datadir + "/Spline.png");
 	nom.push_back("Create a contour using splines");	
-	funct.push_back(wxCommandEventHandler(wxContourEventHandler::onCreateContourSpline));
+	funct.push_back((wxObjectEventFunction)&interfNewContourMenu::onCreateContourSpline);
 	hand.push_back(evtHandler);
 
 	path.push_back(datadir+"/Rectangle.png");
 	nom.push_back("Create a contour using the basic shape of a rectangle");
-	funct.push_back(wxCommandEventHandler(wxContourEventHandler::onCreateContourRectangle));
+	funct.push_back((wxObjectEventFunction)&interfNewContourMenu::onCreateContourRectangle);
 	hand.push_back(evtHandler);
 
 	path.push_back(datadir + "/Circle.png");
 	nom.push_back("Create a contour using the basic shape of a Circle");
-	funct.push_back(wxCommandEventHandler(wxContourEventHandler::onCreateContourCircle));
+	funct.push_back((wxObjectEventFunction)&interfNewContourMenu::onCreateContourCircle);
 	hand.push_back(evtHandler);
 
 	path.push_back(datadir + "/bullseye.png");
@@ -39,6 +39,25 @@ void interfNewContourMenu::initButtons(wxEvtHandler* evtHandler) {
 	funct.push_back((wxObjectEventFunction) &interfNewContourMenu::onCreateContourBullseye);
 	hand.push_back(this);
 
+	path.push_back(datadir + "/Line.png");
+	nom.push_back("Create a Line");
+	funct.push_back((wxObjectEventFunction) &interfNewContourMenu::onCreateContourLine);
+	hand.push_back(this);
+
+	// RaC 09-09 ---------------------
+	path.push_back(datadir + "/Points.png");
+	nom.push_back("Create Points");
+	funct.push_back((wxObjectEventFunction) &interfNewContourMenu::onCreateContourPoints);
+	hand.push_back(this);
+	// RaC 09-09 ---------------------	
+
+	// RaC 10-09 ---------------------
+	path.push_back(datadir + "/Polygon.png");
+	nom.push_back("Create Polygon");
+	funct.push_back((wxObjectEventFunction) &interfNewContourMenu::onCreateContourPolygon);
+	hand.push_back(this);
+	// RaC 10-09 ---------------------	
+
     this->addButtons(path, nom);
 
 	this->setVectorFunction(funct);	
@@ -53,7 +72,7 @@ interfNewContourMenu::~interfNewContourMenu()
 {
 }
 
-void interfNewContourMenu::onCreateContourBullseye(wxEvtHandler* evtHandler){
+void interfNewContourMenu::onCreateContourBullseye(wxCommandEvent& event){
 
 
 	if(!created){
@@ -62,8 +81,34 @@ void interfNewContourMenu::onCreateContourBullseye(wxEvtHandler* evtHandler){
 								wxSize(100,200));
 		created = true;
 	}
-	eventHandler->createContourBullsEye(panBull);
+	interfMainPanel::getInstance()->onCreateContoursBullEye(panBull);
+	//eventHandler->createContourBullsEye(panBull);
 	interfMainPanel::getInstance()->showPanel(panBull);
 
 }
 
+void interfNewContourMenu::onCreateContourSpline( wxCommandEvent& event ){
+	interfMainPanel::getInstance()->onCreateContourSpline();
+}
+void interfNewContourMenu::onCreateContourRectangle( wxCommandEvent& event ){
+	interfMainPanel::getInstance()->onCreateContourRectangle();
+}
+void interfNewContourMenu::onCreateContourCircle( wxCommandEvent& event ){
+	interfMainPanel::getInstance()->onCreateContourCircle();
+}
+void interfNewContourMenu::onCreateContourLine( wxCommandEvent& event ){
+	interfMainPanel::getInstance()->onCreateContourLine();
+}
+
+// RaC 09-09 ---------------------
+void interfNewContourMenu::onCreateContourPoints( wxCommandEvent& event ){
+	interfMainPanel::getInstance()->onCreateContourPoints();
+}
+// RaC 09-09 ---------------------
+
+// RaC 10-09 ---------------------
+void interfNewContourMenu::onCreateContourPolygon( wxCommandEvent& event ){
+	interfMainPanel::getInstance()->onCreateContourPolygon();
+}
+// RaC 10-09 ---------------------
+