From: Diego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Date: Mon, 9 May 2011 16:45:51 +0000 (+0000)
Subject: Diego Caceres: creaButtonContainer & creaPanelButtonContainer changes
X-Git-Tag: v1.0.4~125
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=79a4c48d9c84813a60df432d3c7eb8092b3a24af;p=creaMaracasVisu.git

Diego Caceres: creaButtonContainer & creaPanelButtonContainer changes
---

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 f03c746..7a7da40 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/containerSettings.cxx
@@ -45,6 +45,7 @@ namespace creaButtonContainer
 		{
 			this->m_GroupNameList = m_GroupNameList;
 		}
+
 		void
 		ContainerSettings::AddButton( const std::string & groupName,
 		    const std::string buttonName, const std::string iconpath,
@@ -53,7 +54,17 @@ namespace creaButtonContainer
 			ButtonPair* pair = new ButtonPair(
 			    new ButtonInfo( buttonName, iconpath ),
 			    new ActionButton( buttonDescription, event ) );
+			for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
+			    != this->m_GroupNameList.end( ); ++it )
+				if ( ( *it ).compare( groupName ) == 0 )
+				{
+					this->m_ButtonGroupContainer[ groupName ].push_back( pair );
+					return;
+				}//fi
+			//rof
+			this->m_GroupNameList.push_back( groupName );
 			this->m_ButtonGroupContainer[ groupName ].push_back( pair );
 		}
+
 	}
 }
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index c3a2461..044e6e0 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
@@ -86,6 +86,16 @@ namespace creaPanelButtonContainer
 		panel->Show( false );
 		ButtonPair* pair = new ButtonPair( new ButtonInfo( buttonName, iconpath ),
 		    new ActionButton( buttonDescription, panel ) );
+		for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
+		    != this->m_GroupNameList.end( ); ++it )
+		{
+			if ( ( *it ).compare( groupName ) == 0 )
+			{
+				this->m_ButtonGroupContainer[ groupName ].push_back( pair );
+				return;
+			}//fi
+		}//rof
+		this->m_GroupNameList.push_back( groupName );
 		this->m_ButtonGroupContainer[ groupName ].push_back( pair );
 	}
 
@@ -97,7 +107,18 @@ namespace creaPanelButtonContainer
 		ButtonPair* pair = new ButtonPair(
 		    new ButtonInfo( info.buttonName, info.iconpath ),
 		    new ActionButton( info.buttonDescription, info.panel ) );
+		for( KeyMapList::iterator it = this->m_GroupNameList.begin( ); it
+		    != this->m_GroupNameList.end( ); ++it )
+		{
+			if ( ( *it ).compare( info.groupName ) == 0 )
+			{
+				this->m_ButtonGroupContainer[ info.groupName ].push_back( pair );
+				return;
+			}//fi
+		}//rof
+		this->m_GroupNameList.push_back( info.groupName );
 		this->m_ButtonGroupContainer[ info.groupName ].push_back( pair );
 	}
+
 }//ecapseman