X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fmodel%2FcontainerSettings.cxx;h=45d2932a4cc9f2c5ee8a15f9aa69504c07cc7fcd;hb=e1c23d053ffe93035f13802efdb19dc116e4b46c;hp=18f769916826774a5ad0967ed790ec76294c1a1f;hpb=19866c24e0c00120d0a40da4d03d6eebc3e031b6;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
index 18f7699..45d2932 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
@@ -39,6 +39,7 @@ namespace creaButtonContainer
 		// ----------------------------------------------------------------------------------
 		ContainerSettings::ContainerSettings( )
 		{
+
 		}
 		// ----------------------------------------------------------------------------------
 		ContainerSettings::~ContainerSettings( )
@@ -49,12 +50,14 @@ namespace creaButtonContainer
 		ButtonGroupMap
 		ContainerSettings::GetButtonGroupContainer( )
 		{
+			std::cout<< "MLER | ContainerSettings::GetButtonGroupContainer( )" << std::endl;
 			return ( this->m_ButtonGroupContainer );
 		}
 		// ----------------------------------------------------------------------------------
 		KeyMapList
 		ContainerSettings::GetGroupNameList( )
 		{
+			std::cout<< "MLER | ContainerSettings::GetGroupNameList( )" << std::endl;
 			return ( this->m_GroupNameList );
 		}
 		
@@ -62,43 +65,27 @@ namespace creaButtonContainer
 		void
 		ContainerSettings::SetButtonGroupContainer(ButtonGroupMap bgContainer)
 		{
+			std::cout<< "MLER | ContainerSettings:: SetButtonGroupContainer(ButtonGroupMap bgContainer)" << std::endl;
 			this->m_ButtonGroupContainer = bgContainer;
 		}
 		// ----------------------------------------------------------------------------------
 		void
 		ContainerSettings::SetGroupNameList( KeyMapList gNameList )
 		{
+			std::cout<< "MLER | ContainerSettings::SetGroupNameList" << std::endl;
 			this->m_GroupNameList = gNameList;
 		}
 		
 		// ----------------------------------------------------------------------------------
-//EED-MLER
-/*
-
-		ListGroupMap
-		ContainerSettings::GetListGroupContainer( )
-		{
-			return ( this->m_ListGroupContainer );
-		}
 
-		void
-		ContainerSettings::SetListGroupContainer( ListGroupMap lstContainer )
-		{
-			this->m_ListGroupContainer = lstContainer;
-		}
-*/
 
-		// ----------------------------------------------------------------------------------
 
-		// ----------------------------------------------------------------------------------
 		void
 		ContainerSettings::AddButton( const StringType & groupName,
 		    const StringType &buttonName, const wxBitmap &icon,
 		    const StringType &buttonDescription, FunctionEventType event )
 		{
-			std::cout<< std::endl<<"MLER CLASS : ContainerSettings" << std::endl;
-			std::cout<< std::endl<<"MLER ContainerSettings // AddButton "<<std::endl;
-
+			std::cout<< "MLER | ContainerSettings::AddButton( const StringType & groupName," << std::endl;
 
 			ButtonPair* pair = new ButtonPair(
 			    new ButtonInfo( buttonName, icon ),
@@ -132,6 +119,7 @@ namespace creaButtonContainer
 		void
 		ContainerSettings::AddButton( BCSettingsStruct* info )
 		{
+			std::cout<< "MLER | ContainerSettings::AddButton( BCSettingsStruct* info )" << std::endl;
 			ButtonPair* pair = new ButtonPair(
 			    new ButtonInfo( info->buttonName, info->icon ),
 			    new ButtonAction( info->buttonDescription, info->eventFunction ) );
@@ -160,6 +148,7 @@ namespace creaButtonContainer
 		void
 		ContainerSettings::AddButtons( BCStructVectorType infoList )
 		{
+			std::cout<< "MLER | ContainerSettings::AddButtons( BCStructVectorType infoList )" << std::endl;
 			try
 			{
 				for( BCStructVectorType::iterator it = infoList.begin( ); it
@@ -176,105 +165,6 @@ namespace creaButtonContainer
 			}//hctac
 		}
 
-//EED-MLER
-/*
-		void
-		ContainerSettings::AddItems(BCStructVectorType infoList)
-		{
-			try
-			{
-				for( BCStructVectorType::iterator it = infoList.begin( ); it
-				    != infoList.end( ); ++it )
-				{
-					this->AddItem(*it);
-				}//rof
-			}//yrt
-			catch ( const std::exception& e )
-			{
-				std::cerr
-			    << "ContainerSettings::AddButtons( BCStructVectorType infoList ) "
-			    << "exception: " << e.what( ) << std::endl;
-			}//hctac
-		}
-
-
-		//-----------------------------------------------------------------------------------
-			void
-				ContainerSettings::AddItem(const StringType & groupName)
-				{
-
-				//Es importante hacer un test, recibiendo como parametro la info de un item.
-
-
-					wxListItem* item;
-					item->SetId(1);
-					item->SetText(wxT("monica"));
-
-					creaButtonContainer::view::ListWx l;
-					l.setItems(item);
-
-
-					try
-					{
-						for( KeyMapList::iterator it = this->m_GroupNameList.begin( );
-							 it!= this->m_GroupNameList.end( ); ++it )
-						{
-							if(( *it ).compare( groupName ) == 0 )
-							{
-								this->m_ListGroupContainer[ groupName ].push_back(l);
-								return;
-							}
-						}
-						this->m_GroupNameList.push_back( groupName );
-						this->m_ListGroupContainer[ groupName ].push_back( l );
-					}
-					catch ( const std::exception& e )
-					{
-						std::cerr
-						<< "ContainerSettings::AddButton( const std::string & groupName,"
-						<< "const std::string buttonName, const std::string iconpath,"
-						<< "const std::string buttonDescription, FunctionEventType event ) exception: "
-						<< e.what( ) << std::endl;
-					}//hctac
-				}
-
-
-				void
-				ContainerSettings::AddItem( BCSettingsStruct* info )
-				{
-					wxListItem* item;
-
-					wxString myString((info->buttonName).c_str(),wxConvUTF8);
-					item->SetText(myString);
-
-					creaButtonContainer::view::ListWx l;
-					l.setItems(item);
-
-					try
-					{
-						for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
-							!= this->m_GroupNameList.end( ); ++it )
-						{
-							if ( ( *it ).compare( info->groupName ) == 0 )
-							{
-								this->m_ListGroupContainer[ info->groupName ].push_back( l );
-								return;
-							}//fi
-						}//rof
-						this->m_GroupNameList.push_back( info->groupName );
-						this->m_ListGroupContainer[ info->groupName ].push_back( l );
-					}
-					catch (const std::exception& e)
-					{
-						std::cerr
-						<< "void ContainerSettings::AddItem( BCSettingsStruct* info ) "
-						<< "exception: " << e.what( ) << std::endl;
-					}
-
-				}
-
-*/
-
 	// ----------------------------------------------------------------------------------
 	}//ecapseman
 }//ecapseman