From: Diego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Date: Fri, 13 May 2011 13:04:48 +0000 (+0000)
Subject: Last updates
X-Git-Tag: v1.0.4~122
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e7d20ba9cf53e6da12e5118a7d616248ea48f168;p=creaMaracasVisu.git

Last updates
---

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
index 4ba8406..9eb3a56 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
@@ -64,6 +64,8 @@ namespace creaButtonContainer
 		{
 			this->m_Sizer->Fit( this );
 			this->m_Sizer->FitInside(this);
+			this->SetScrollRate(20,20);
+			this->m_Sizer->SetSizeHints(this);
 		}
 
 	}//ecapseman
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index 044e6e0..4a685f4 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
@@ -100,24 +100,35 @@ namespace creaPanelButtonContainer
 	}
 
 	void
-	ButtonContainerSettings::AddButton( const BCSettingsStruct &info )
+	ButtonContainerSettings::AddButton( BCSettingsStruct* info )
 	{
 		//builds the button information
-		info.panel->Show( false );
+		info->panel->Show( false );
 		ButtonPair* pair = new ButtonPair(
-		    new ButtonInfo( info.buttonName, info.iconpath ),
-		    new ActionButton( info.buttonDescription, info.panel ) );
+		    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 )
+			if ( ( *it ).compare( info->groupName ) == 0 )
 			{
-				this->m_ButtonGroupContainer[ info.groupName ].push_back( pair );
+				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 );
+		this->m_GroupNameList.push_back( info->groupName );
+		this->m_ButtonGroupContainer[ info->groupName ].push_back( pair );
+	}
+
+	void
+	ButtonContainerSettings::AddButtons( BCSetListType infoList )
+	{
+		for( BCSetListType::iterator it = infoList.begin( ); it
+				    != infoList.end( ); ++it )
+		{
+			BCSettingsStruct* info = *it;
+			this->AddButton( info );
+		}//rof
 	}
 
 }//ecapseman
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
index 81f96d3..e568683 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
@@ -31,6 +31,7 @@ namespace creaPanelButtonContainer
 	typedef std::list< std::string > KeyMapList;
 	typedef std::list< ButtonPair* > ButtonList;
 	typedef std::map< std::string, ButtonList > ButtonGroupMap;
+	typedef std::list< BCSettingsStruct* > BCSetListType;
 	class ButtonContainerSettings
 	{
 		public:
@@ -54,7 +55,10 @@ namespace creaPanelButtonContainer
 			    const std::string &iconpath, const std::string &buttonDescription,
 			    PanelButton panel );
 			void
-			AddButton( const BCSettingsStruct &info );
+			AddButton( BCSettingsStruct* info );
+
+			void
+			AddButtons( BCSetListType infoList );
 
 		private:
 			ButtonGroupMap m_ButtonGroupContainer;