: 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) {
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");
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);
+/*
+ path.push_back(datadir + "/Line.png");
+ nom.push_back("Create Points");
+ funct.push_back((wxObjectEventFunction) &interfNewContourMenu::onCreateContourPoints);
+ hand.push_back(this);
+*/
this->addButtons(path, nom);
this->setVectorFunction(funct);
{
}
-void interfNewContourMenu::onCreateContourBullseye(wxEvtHandler* evtHandler){
+void interfNewContourMenu::onCreateContourBullseye(wxCommandEvent& event){
if(!created){
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();
+}
+/*
+void interfNewContourMenu::onCreateContourPoints( wxCommandEvent& event ){
+ interfMainPanel::getInstance()->onCreateContourLine();
+}
+*/
+