Changes with manualBaseModel. It improves the functionality with the new

[creaContours.git] / lib / Interface_Icons_NDimensions / interfNewContourMenu.cxx

diff --git a/lib/Interface_Icons_NDimensions/interfNewContourMenu.cxx b/lib/Interface_Icons_NDimensions/interfNewContourMenu.cxx
index 5b12bd3951f99ad87ca189c8a974295432fc2159..35cb02bfd61a3b774ecb2a6f11092817d5007383 100644 (file)
--- 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,18 @@ 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 ---------------------      
+
     this->addButtons(path, nom);
 
        this->setVectorFunction(funct); 
@@ -53,7 +65,7 @@ interfNewContourMenu::~interfNewContourMenu()
 {
 }
 
-void interfNewContourMenu::onCreateContourBullseye(wxEvtHandler* evtHandler){
+void interfNewContourMenu::onCreateContourBullseye(wxCommandEvent& event){
 
 
        if(!created){
@@ -62,8 +74,28 @@ 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 ---------------------
+