Changes with manualBaseModel. It improves the functionality with the new

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

diff --git a/lib/Interface_Icons_NDimensions/interfEditMenu.cxx b/lib/Interface_Icons_NDimensions/interfEditMenu.cxx
index d566f3e76b268b0fcc6804cd0a768d958757700b..2aea2621f2396b86c0a4c493957bfae353212fb0 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfEditMenu.cxx
+++ b/lib/Interface_Icons_NDimensions/interfEditMenu.cxx
@@ -5,7 +5,7 @@ interfEditMenu::interfEditMenu(wxWindow * parent, int sizex, int sizey,wxEvtHand
        : interfMenuBar(parent, sizex, sizey)
 {
        this->datadir = datdir;
-       eventHandler = evtHandler;
+//     eventHandler = evtHandler;
        initButtons(this);
 }
 
@@ -15,38 +15,53 @@ void interfEditMenu::initButtons(wxEvtHandler* evtHandler) {
        std::vector<wxObjectEventFunction> funct;
 
        path.push_back(datadir + "/copy.png");
-       nom.push_back("Copy the selected contour");
-       funct.push_back((wxObjectEventFunction) &interfMenuBar:: onActionButtonPressed);
+       nom.push_back("Copy the selected contour  ctrl + c");
+       funct.push_back((wxObjectEventFunction) &interfEditMenu:: onCopy);
 
        path.push_back(datadir + "/paste.png");
-       nom.push_back("Paste the copied contour");
-       funct.push_back((wxObjectEventFunction) &interfMenuBar:: onActionButtonPressed);
+       nom.push_back("Paste the copied contour  ctrl + v");
+       funct.push_back((wxObjectEventFunction) &interfEditMenu:: onPaste);
 
        path.push_back(datadir + "/undo.png");
-       nom.push_back("Undo");
+       nom.push_back("Undo  ctrl + z");
        funct.push_back((wxObjectEventFunction) &interfEditMenu:: onUndo);
 
        path.push_back(datadir + "/redo.png");
-       nom.push_back("Redo");
+       nom.push_back("Redo  ctrl + y");
        funct.push_back((wxObjectEventFunction) &interfEditMenu:: onRedo);
 
+//CMRU 17-08-09 ------------------------------------------------------------------
+       path.push_back(datadir + "/Letter.PNG");
+       nom.push_back("Insert a Label");
+       funct.push_back((wxObjectEventFunction)&interfEditMenu::onPrintLabel);
+//-------------------------------------------------------------------------------
+
     this->addButtons(path, nom);
        this->setVectorFunction(funct);
 
-       this->setButtonName(0, wxContour_ActionCommnadsID::COPY_TOOL);
-       this->setButtonName(1, wxContour_ActionCommnadsID::PASTE_TOOL);
+       this->setButtonName(0, 'C');
+       this->setButtonName(1, 'P');
        this->setButtonName(2, '-');
        this->setButtonName(3, '-');
 
        this->connectEvents(evtHandler);
 
 }
+void interfEditMenu::onCopy(wxCommandEvent& event){
+       interfMainPanel::getInstance()->onCopy();
+}
+void interfEditMenu::onPaste(wxCommandEvent& event){
 
+       interfMainPanel::getInstance()->onPaste();
+}
 void interfEditMenu::onUndo(wxCommandEvent& event){
-       ((wxContourEventHandler*)this->eventHandler)->onUNDO();
+       interfMainPanel::getInstance()->onUndo();
 }
 void interfEditMenu::onRedo(wxCommandEvent& event){
-       ((wxContourEventHandler*)this->eventHandler)->onREDO();
+       interfMainPanel::getInstance()->onRedo();
+}
+void interfEditMenu::onPrintLabel(wxCommandEvent& event){
+       interfMainPanel::getInstance()->onPrintLabel();
 }
 
 interfEditMenu::~interfEditMenu()