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=eda556b8096b410295705ddbd7debcaaf44886eb;hpb=ab19f727dc01a9995b16b2a3c82783050728233e;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 eda556b..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,19 +1,14 @@
-/************************************************************************************//*!
- * Name:      @file buttonGroupFactory.cxx
- * Purpose:   @brief This contains the ButtonGroupFactory class implementation
- * Author:    @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * Modified:  2011-05-18
- * Copyright:
- * 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"
 #include "buttonGroupFactory.h"
 
-//!	@namespace<creaButtonContainer>
 namespace creaButtonContainer
 {
-	//!	@namespace<model>
 	namespace model
 	{
 		// ----------------------------------------------------------------------------------
@@ -35,23 +30,20 @@ namespace creaButtonContainer
 				ButtonGroupMap map = settings->GetButtonGroupContainer( );
 				for( ButtonGroupMap::iterator it = map.begin( ); it != map.end( ); ++it )
 				{
-					//using wxWidgets.
 					wxString groupNameAux( ( *it ).first.c_str( ), wxConvUTF8 );
 					wxStaticText* wxGroupName = new wxStaticText( parent, -1,
 					    groupNameAux, wxDefaultPosition, wxDefaultSize, 0,
-					    _T( "GroupText" ) );
-					//creating a wxButtonGroup.
+					    _T("GroupText") );
 					ButtonGroup* group = new ButtonGroup( wxGroupName,
 					    this->GetButtons( parent, ( *it ).second ) );
-					//adding the group to the container.
 					groupView.push_back( group );
 				}//rof
 			}//yrt
-			catch ( std::exception& e )
+			catch ( const std::exception& e )
 			{
 				std::cerr
-				    << "ButtonContainerController::ButtonExpEvent( wxCommandEvent& event ) exception: "
-				    << e.what( ) << std::endl;
+				    << "ButtonGroupFactory::CreateButtonGroupContainer( wxWindow* parent,   ButtonGroupModel* settings )"
+				    << " exception: " << e.what( ) << std::endl;
 			}//chtac
 			return ( groupView );
 		}
@@ -62,20 +54,22 @@ namespace creaButtonContainer
 			ButtonContainer buttonList;
 			try
 			{
+				ButtonContainer buttonList;
 				for( ButtonList::iterator it = buttonModel.begin( ); it
 				    != buttonModel.end( ); ++it )
 				{
 					long id = wxNewId( );
 					buttonList[ id ] = new Button( parent, id, *it );
-				}
-				return ( buttonList );
+				}//rof
+				//return ( buttonList ); // JPR
 			}//yrt
-			catch ( std::exception& e )
+			catch ( const std::exception& e )
 			{
 				std::cerr
-				    << "ButtonContainerController::ButtonExpEvent( wxCommandEvent& event ) exception: "
-				    << e.what( ) << std::endl;
+				    << "ButtonGroupFactory::GetButtons( wxWindow* parent, ButtonList buttonModel )"
+				    << "exception: " << e.what( ) << std::endl;
 			}//chtac
+		        return ( buttonList );	 // JPR
 		}
 	// ----------------------------------------------------------------------------------
 	}//ecapseman