X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfEditMenu.cxx;h=8e23882e4fd0d3584bbc00cd281c3e8f9b31ab3d;hb=ffd5933600d8bad1de6ee62c305cc26a046166dd;hp=75aec01935ae46aa78a5cd3ae624565baf91672f;hpb=fc258c8e3f71aff8b57a8299d540b292405b7fe6;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfEditMenu.cxx b/lib/Interface_Icons_NDimensions/interfEditMenu.cxx
index 75aec01..8e23882 100644
--- 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,51 @@ 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);
 
+
     this->addButtons(path, nom);
 	this->setVectorFunction(funct);
 
-	this->setButtonName(0, wxContour_ActionCommandsID::COPY_TOOL);
-	this->setButtonName(1, wxContour_ActionCommandsID::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::onUndo(wxCommandEvent& event){
-	((wxContourEventHandler*)this->eventHandler)->onUNDO();
+void interfEditMenu::onPaste(wxCommandEvent& event)
+{
+	interfMainPanel::getInstance()->onPaste();
 }
-void interfEditMenu::onRedo(wxCommandEvent& event){
-	((wxContourEventHandler*)this->eventHandler)->onREDO();
+
+void interfEditMenu::onUndo(wxCommandEvent& event)
+{
+	interfMainPanel::getInstance()->onUndo();
+}
+
+void interfEditMenu::onRedo(wxCommandEvent& event)
+{
+	interfMainPanel::getInstance()->onRedo();
 }
 
 interfEditMenu::~interfEditMenu()