X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2Fbutton.cxx;h=69d72c1ee7cc0ac58382387f2179478db0ecf993;hb=05c4abbebf824bbbbaaab135acf6c888662dff69;hp=1edce543114a036304ba1c9d9d8c057a455b9e4e;hpb=f6c7b458a17b67950d1844d6a600683a99cb2b6d;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.cxx
index 1edce54..69d72c1 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/button.cxx
@@ -1,8 +1,33 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 /*!
  * @file button.cxx
- * @brief This contains the Button class implementation.
+ * @brief Implements the Button class implementation.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-19
+ * @date  2011-06-02
  */
 
 #include "button.h"
@@ -12,53 +37,69 @@ namespace creaButtonContainer
 	namespace view
 	{
 		// ----------------------------------------------------------------------------------
-		Button::Button( wxWindow* parent, long id, ButtonPair* pair )
+		Button::Button( wxWindow* parent, long id, ButtonPair* pair ) 		
 		{
-			this->m_ButtonPair = pair;
-			std::string wXbuttonName = this->m_ButtonPair->first->first;
-			std::string wXiconPath = this->m_ButtonPair->first->second;
-			std::string wXdescription = this->m_ButtonPair->second->first;
+			this->m_ButtonPair			= pair;
+			StringType wXbuttonName		= this->m_ButtonPair->first->first;
+			BitmapType wXicon		= this->m_ButtonPair->first->second;
+			StringType wXdescription	= this->m_ButtonPair->second->first;
 			wxString buttonName( wXbuttonName.c_str( ), wxConvUTF8 );
-			wxString imageIcon( wXiconPath.c_str( ), wxConvUTF8 );
 			wxString description( wXdescription.c_str( ), wxConvUTF8 );
 			//creating the button.
-			this->Create( parent, id,
-			    wxBitmap( wxImage( imageIcon, wxBITMAP_TYPE_ANY, -1 ) ),
-			    wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator,
+			this->Create( parent, id,wXicon,
+			    wxDefaultPosition, wxDefaultSize,wxBU_AUTODRAW, wxDefaultValidator,
 			    buttonName );
 			this->SetToolTip( description );
 		}
+
 		// ----------------------------------------------------------------------------------
 		Button::~Button( )
 		{
 		}
+		
 		// ----------------------------------------------------------------------------------
-		std::string
+		StringType
 		Button::GetButtonName( )
 		{
 			return ( this->m_ButtonPair->first->first );
 		}
+
 		// ----------------------------------------------------------------------------------
-		std::string
+		BitmapType
+		Button::GetIcon( )
+		{
+			return ( this->m_ButtonPair->first->second );
+		}		
+
+		// ----------------------------------------------------------------------------------
+		/*StringType
 		Button::GetIconPath( )
 		{
 			return ( this->m_ButtonPair->first->second );
-		}
+		}*/
+		
 		// ----------------------------------------------------------------------------------
-		std::string
+		StringType
 		Button::GetDescription( )
 		{
 			return ( this->m_ButtonPair->second->first );
 		}
+		
 		// ----------------------------------------------------------------------------------
 		void
 		Button::Execute( )
 		{
-			std::cout << "ButtonAction: " << this->m_ButtonPair->first->first
-			    << std::endl;
-			TFunctor* vTable[ ] =
-			{ this->m_ButtonPair->second->second };
-			vTable[ 0 ]->Call( this->m_ButtonPair->first->first );
+			try
+			{
+				TFunctor* vTable[ ] =
+				{ this->m_ButtonPair->second->second };
+
+				vTable[ 0 ]->Call( this->m_ButtonPair->first->first );
+			}//yrt
+			catch ( const std::exception& e )
+			{
+				std::cerr << "Button::Execute( ) exception: " << e.what( ) << std::endl;
+			}//hctac
 		}
 	// ----------------------------------------------------------------------------------
 	}//ecapseman