X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfEditMenu.cxx;h=ad0797193c9dc82e6b4ef768fbd6419729ee622a;hb=6169c4084c0371bd7bf8d961b4bad3a1f58ba12b;hp=d566f3e76b268b0fcc6804cd0a768d958757700b;hpb=192dfdf774a06066eff90e9c50916723c8592706;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfEditMenu.cxx b/lib/Interface_Icons_NDimensions/interfEditMenu.cxx
index d566f3e..ad07971 100644
--- a/lib/Interface_Icons_NDimensions/interfEditMenu.cxx
+++ b/lib/Interface_Icons_NDimensions/interfEditMenu.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "interfEditMenu.h"
 
 
@@ -5,7 +30,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 +40,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_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();
+void interfEditMenu::onUndo(wxCommandEvent& event)
+{
+	interfMainPanel::getInstance()->onUndo();
 }
-void interfEditMenu::onRedo(wxCommandEvent& event){
-	((wxContourEventHandler*)this->eventHandler)->onREDO();
+
+void interfEditMenu::onRedo(wxCommandEvent& event)
+{
+	interfMainPanel::getInstance()->onRedo();
 }
 
 interfEditMenu::~interfEditMenu()