X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaPanelButtonContainer%2FbuttonContainerSettings.cxx;h=e6c991b182b48972a1536be652a43b746b68b073;hb=4518d93a0a51221812cfb6d783f8e7f4fd77b498;hp=2ca8d8dab6bc79dd51f47306f28d5b0c77238e20;hpb=c1742e6eca1299979dbacc1f609bc14c3494bc7a;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index 2ca8d8d..e6c991b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
@@ -99,15 +99,19 @@ namespace creaPanelButtonContainer
 			std::cout<< std::endl<<"MLER ButtonContainerSettings // GetButtonGroupSettings "<<std::endl;
 
 			settings = new ButtonGroupSettings( );
+
 			for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
 			    != this->m_GroupNameList.end( ); ++it )
 			{
-				ButtonList list = this->m_ButtonGroupContainer[ ( *it ) ];
+				ButtonList list = this->m_ButtonGroupContainer[ ( *it ) ]; //MLER : Hacer cambio de contenedor
 
 				std::cout<<"MLER ButtonContainerSettings // GetButtonGroupSettings :: it "<< *it<<std::endl;
 
 				for( ButtonList::iterator it1 = list.begin( ); it1 != list.end( ); ++it1 )
 				{
+					std::cout<<"MLER ButtonContainerSettings // GetButtonGroupSettings :: groupName "<< *it<<std::endl;
+					std::cout<<"MLER ButtonContainerSettings // GetButtonGroupSettings :: buttonName "<< ( *it1 )->first->first <<std::endl;
+
 					settings->AddButton( ( *it ), ( *it1 )->first->first, ( *it1 )->first->second, ( *it1 )->second->first, functor );
 				}//rof
 			}//rof
@@ -142,7 +146,7 @@ namespace creaPanelButtonContainer
 	{
 		try
 		{
-			std::cout<< std::endl<<"MLER ButtonContainerSettings // AddButton"<<std::endl;
+			std::cout<< std::endl<<"MLER ButtonContainerSettings / AddButton(groupname...)"<<std::endl;
 
 			//builds the button information
 			//I don't know the try catch doesn't work!!
@@ -152,10 +156,13 @@ namespace creaPanelButtonContainer
 				    << "exception: NULL Pointer in panel " << std::endl;
 				exit( 1 );
 			}
+
 			panel->Show( false );
+
 			ButtonPair* pair = new ButtonPair(
 			    new ButtonInfo( buttonName, icon ),
 			    new ActionButton( buttonDescription, panel ) );
+
 			for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
 			    != this->m_GroupNameList.end( ); ++it )
 			{
@@ -237,63 +244,6 @@ namespace creaPanelButtonContainer
 		}//hctac
 	}
 
-	void
-		ButtonContainerSettings::AddItem(BCPSettingsStruct* info)
-		{
-			if(info->panel == NULL)
-			{
-				std::cerr
-				<< "ButtonContainerSettings::AddItem"
-				<< "exception: NULL Pointer in panel" << std::endl;
-				exit(1);
-			}
-
-			wxListItem item;
-			wxString myString((info->buttonName).c_str(),wxConvUTF8);
-			item.SetText(myString);
-
-			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(item);
-							return;
-						}
-					}//rof
-					this->m_GroupNameList.push_back(info->groupName);
-					this->m_ListGroupContainer[info->groupName].push_back(item);
-
-				}//yrt
-				catch ( const std::exception& e )
-				{
-					std::cerr
-				    << "ContainerSettings::AddButtons( BCStructVectorType infoList ) "
-				    << "exception: " << e.what( ) << std::endl;
-				}//hctac
-			}
-
-	void
-		ButtonContainerSettings::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
-		}
-
 
 // ----------------------------------------------------------------------------------
 }//ecapseman