X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fmodel%2FbuttonGroupFactory.cxx;h=57cbf9b544572f124519244a19b6a7d996d47d50;hb=8138ced89fa9f1cc6933ff739dfa28b1e3c3883b;hp=c06d5d4c56af4db5d89df101fdc3747430a801bf;hpb=4b092ee0b1bcda4d298e5ffc3b58b599e273db20;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx
index c06d5d4..57cbf9b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx
@@ -1,11 +1,9 @@
-/***************************************************************
- * Name:      ButtonGroupFactory
- * Purpose:   Implements ButtonGroupFactory
- * Author:    Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * Modified:  2011-05-09
- * Copyright: Diego CACERES (http://www.creatis.insa-lyon.fr/~caceres/)
- * License:
- **************************************************************/
+/*!
+ * @file buttonGroupFactory.cxx
+ * @brief Implements the ButtonGroupFactory class.
+ * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
+ * @date  2011-06-02
+ */
 
 #include "buttonGroupFactory.h"
 
@@ -13,41 +11,67 @@ namespace creaButtonContainer
 {
 	namespace model
 	{
+		// ----------------------------------------------------------------------------------
 		ButtonGroupFactory::ButtonGroupFactory( )
 		{
 		}
+		// ----------------------------------------------------------------------------------
 		ButtonGroupFactory::~ButtonGroupFactory( )
 		{
 		}
-		ButtonGroupContainer
+		// ----------------------------------------------------------------------------------
+		ButtonGroupFactory::ButtonGroupContainer
 		ButtonGroupFactory::CreateButtonGroupContainer( wxWindow* parent,
 		    ButtonGroupModel* settings )
 		{
 			ButtonGroupContainer groupView;
-			ButtonGroupMap map = settings->GetButtonGroupContainer( );
-			for( ButtonGroupMap::iterator it = map.begin( ); it != map.end( ); ++it )
+			try
 			{
-				wxString groupNameAux( ( *it ).first.c_str( ), wxConvUTF8 );
-				wxStaticText* wxGroupName = new wxStaticText( parent, -1, groupNameAux,
-				    wxDefaultPosition, wxDefaultSize, 0, _T("GroupText") );
-				ButtonGroup* group = new ButtonGroup( wxGroupName,
-				    this->GetButtons( parent, ( *it ).second ) );
-				groupView.push_back( group );
-			}
+				ButtonGroupMap map = settings->GetButtonGroupContainer( );
+				for( ButtonGroupMap::iterator it = map.begin( ); it != map.end( ); ++it )
+				{
+					wxString groupNameAux( ( *it ).first.c_str( ), wxConvUTF8 );
+					wxStaticText* wxGroupName = new wxStaticText( parent, -1,
+					    groupNameAux, wxDefaultPosition, wxDefaultSize, 0,
+					    _T("GroupText") );
+					ButtonGroup* group = new ButtonGroup( wxGroupName,
+					    this->GetButtons( parent, ( *it ).second ) );
+					groupView.push_back( group );
+				}//rof
+			}//yrt
+			catch ( const std::exception& e )
+			{
+				std::cerr
+				    << "ButtonGroupFactory::CreateButtonGroupContainer( wxWindow* parent,   ButtonGroupModel* settings )"
+				    << " exception: " << e.what( ) << std::endl;
+			}//chtac
 			return ( groupView );
 		}
-		ButtonContainer
+		// ----------------------------------------------------------------------------------
+		ButtonGroupFactory::ButtonContainer
 		ButtonGroupFactory::GetButtons( wxWindow* parent, ButtonList buttonModel )
 		{
 			ButtonContainer buttonList;
-			for( ButtonList::iterator it = buttonModel.begin( ); it
-			    != buttonModel.end( ); ++it )
+			try
+			{
+				ButtonContainer buttonList;
+				for( ButtonList::iterator it = buttonModel.begin( ); it
+				    != buttonModel.end( ); ++it )
+				{
+					long id = wxNewId( );
+					buttonList[ id ] = new Button( parent, id, *it );
+				}//rof
+				//return ( buttonList ); // JPR
+			}//yrt
+			catch ( const std::exception& e )
 			{
-				long id = wxNewId( );
-				buttonList[ id ] = new Button( parent, id, *it );
-			}
-			return ( buttonList );
+				std::cerr
+				    << "ButtonGroupFactory::GetButtons( wxWindow* parent, ButtonList buttonModel )"
+				    << "exception: " << e.what( ) << std::endl;
+			}//chtac
+		        return ( buttonList );	 // JPR
 		}
+	// ----------------------------------------------------------------------------------
 	}//ecapseman
 }//ecapseman