X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfNewContourMenu.h;h=fbc820185efe1036e2e763560a5cfe7c15536832;hb=b467cd27f8b79c7e33d1f44dd4eaaf4030c65151;hp=fb74e771d679f1bf82b07176e221557182c4b17b;hpb=570ca9b0fbbcf41df223486c05eab3f4166fc3d3;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfNewContourMenu.h b/lib/Interface_Icons_NDimensions/interfNewContourMenu.h
index fb74e77..fbc8201 100644
--- a/lib/Interface_Icons_NDimensions/interfNewContourMenu.h
+++ b/lib/Interface_Icons_NDimensions/interfNewContourMenu.h
@@ -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.
+# ------------------------------------------------------------------------ */
+
 #ifndef __interfNEWCONTOURMENUH__
 #define __interfNEWCONTOURMENUH__
 
@@ -5,7 +30,8 @@
 #include "interfMenuBar.h"
 #include "interfMainPanel.h"
 
-#include <wxContourEventHandler.h>
+#include "PanelBullEyeOptions.h"
+//#include <wxContourEventHandler.h>
 
 class interfNewContourMenu 
 	: public interfMenuBar
@@ -17,16 +43,42 @@ public:
     
     virtual void initButtons(wxEvtHandler* evtHandler) ;
 
-	void onCreateContourBullseye(wxEvtHandler* evtHandler);
-
 	
 
 private:
-	wxContourEventHandler* eventHandler;
-	PanelBullEyeOptions* panBull;
+	//wxContourEventHandler* eventHandler;
+	wxPanel* panBull;
 	bool created;
 	
-	
+	/**
+	**	This method is in charge of capturing the event when the button is clicked
+	**/
+	void onCreateContourBullseye(wxCommandEvent& event);
+	/**
+	**	This method is in charge of capturing the event when the button is clicked
+	**/
+	void onCreateContourSpline( wxCommandEvent& event );
+	/**
+	**	This method is in charge of capturing the event when the button is clicked
+	**/
+	void onCreateContourRectangle( wxCommandEvent& event );
+	/**
+	**	This method is in charge of capturing the event when the button is clicked
+	**/
+	void onCreateContourCircle( wxCommandEvent& event );
+	/**
+	**	This method is in charge of capturing the event when the button is clicked
+	**/
+	void onCreateContourLine( wxCommandEvent& event );	
+	/**
+	**	This method is in charge of capturing the event when the button is clicked
+	**/
+	void onCreateContourPoints( wxCommandEvent& event );
+	/**
+	**	This method is in charge of capturing the event when the button is clicked
+	**  RaC - Creates a new Polygon contour
+	**/
+	void onCreateContourPolygon( wxCommandEvent& event );
 	
 };