From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Fri, 17 Jun 2011 16:17:17 +0000 (+0000)
Subject: no message
X-Git-Tag: v1.0.4~98
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2ea436781de525e1ffa633997c9df9b938f170ff;p=creaMaracasVisu.git

no message
---

diff --git a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
index 2d771f9..5dd1aa2 100644
--- a/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
+++ b/bbtk/src/bbcreaMaracasVisuPanelButtonContainer.cxx
@@ -15,23 +15,27 @@ namespace bbcreaMaracasVisu
 void
 PanelButtonContainer::Process( )
 {
+	ButtonContainerSettings* settings = new ButtonContainerSettings( );
+	printf("EED PanelButtonContainer::Process %d\n", bbGetInputIn( ).size() );
+	settings->AddButtons( bbGetInputIn( ) );
+	
+	PBContainer* panel = new PBContainer( myPanel, settings );
+	wxBoxSizer* sizer = new wxBoxSizer( wxHORIZONTAL );
+	sizer->Add( panel, 1, wxEXPAND, 0 );
+	this->myPanel->SetSizer(sizer);
+	
+	this->myPanel->SetAutoLayout(true);
+	this->myPanel->Layout();
 
+	
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
-void
-PanelButtonContainer::CreateWidget( wxWindow* parent )
+void PanelButtonContainer::CreateWidget( wxWindow* parent )
 {
 	this->myPanel = new wxPanel( parent, -1 );
 	wxWindow* ww = bbCreateWidgetOfInput( "In", this->myPanel );
-		ButtonContainerSettings* settings = new ButtonContainerSettings( );
-		settings->AddButtons( bbGetInputIn( ) );
-		PBContainer* panel = new PBContainer( myPanel,
-		    settings );
-	wxBoxSizer* sizer = new wxBoxSizer( wxHORIZONTAL );
-	sizer->Add( panel, 1, wxEXPAND, 0 );
-	this->myPanel->SetSizer(sizer);
 	bbSetOutputWidget( myPanel);
 
 }
diff --git a/bbtk/src/bbcreaMaracasVisuPanelButtonContainerSettings.cxx b/bbtk/src/bbcreaMaracasVisuPanelButtonContainerSettings.cxx
index 1911c21..0934d08 100644
--- a/bbtk/src/bbcreaMaracasVisuPanelButtonContainerSettings.cxx
+++ b/bbtk/src/bbcreaMaracasVisuPanelButtonContainerSettings.cxx
@@ -16,26 +16,19 @@ void
 PanelButtonContainerSettings::Process( )
 {
 
-	//   std::string msg;
-	//    if (bbGetInputTitle()!="")
-	//      {
-	//	msg = bbGetInputTitle()+": " + bbGetInputIn();
-	//      }
-	//    else
-	//      {
-	//	msg = bbGetInputIn();
-	//      }
-	//   ((wxStaticText*)bbGetOutputWidget())->SetLabel( bbtk::std2wx( msg ) );
-
-	this->m_BSettings->groupName = bbGetInputGroupName( );
-	this->m_BSettings->buttonName = bbGetInputButtonName( );
-	this->m_BSettings->buttonDescription = bbGetInputButtonDescription( );
-	this->m_BSettings->iconpath = bbGetInputIconpath( );
-	this->m_BSettings->panel = this->myPanel;
-	this->m_BCSettingsVector = bbGetInputIn();
+	this->m_BSettings->groupName			= bbGetInputGroupName( );
+	this->m_BSettings->buttonName			= bbGetInputButtonName( );
+	this->m_BSettings->buttonDescription	= bbGetInputButtonDescription( );
+	this->m_BSettings->iconpath				= bbGetInputIconpath( );
+	this->m_BSettings->panel				= this->myPanel;
+	this->m_BCSettingsVector				= bbGetInputIn();
 	this->m_BCSettingsVector.push_back(  this->m_BSettings );
-	bbSetOutputOut( bbGetInputIn() );
-
+	bbSetOutputOut( this->m_BCSettingsVector );
+	
+	printf("EED PanelButtonContainerSettings::Process In  %d\n", bbGetInputIn( ).size() );
+	printf("EED PanelButtonContainerSettings::Process tmpVec  %d\n", this->m_BCSettingsVector.size() );
+	printf("EED PanelButtonContainerSettings::Process Out  %d\n", bbGetOutputOut( ).size() );
+	
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
@@ -51,6 +44,8 @@ PanelButtonContainerSettings::CreateWidget( wxWindow* parent )
   sizer->Add(w,1,wxEXPAND, 0);
   this->myPanel->SetSizer(sizer);
   bbSetOutputWidget( myPanel );
+
+	
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
index ce4ea2f..2c074ca 100644
--- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx
+++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
@@ -76,6 +76,13 @@ BBTK_BLACK_BOX_IMPLEMENTATION(SliderMinMax,bbtk::WxBlackBox);
 void SliderMinMax::Process()
 {
 	if (mwxwidget!=NULL){
+		if (firsttime==true)
+		{
+			firsttime=false;
+			mwxwidget -> setRepresentedValues( bbGetInputInMin(), bbGetInputInMax() );
+			mwxwidget -> SetStart(bbGetInputInMinShow());
+			mwxwidget -> SetEnd(bbGetInputInMaxShow());  
+		}
 		bbSetOutputOutStart(mwxwidget->GetStart());
 		bbSetOutputOutEnd(mwxwidget->GetEnd());
 		bbSetOutputOutActual(mwxwidget->GetActual());
@@ -93,11 +100,11 @@ void SliderMinMax::CreateWidget(wxWindow* parent)
 		mwxwidget -> setActiveStateTo(true);
 		mwxwidget -> setVisibleLabels( bbGetInputShowLabels()==1 );
 		mwxwidget -> setDeviceEndMargin(10);
-   	    mwxwidget -> setRepresentedValues(bbGetInputInMin(), bbGetInputInMax());
+//   	    mwxwidget -> setRepresentedValues(bbGetInputInMin(), bbGetInputInMax());
 		mwxwidget -> setDeviceBlitStart(10,10); 
 		mwxwidget -> setIfWithActualDrawed(bbGetInputShowActual());
-		mwxwidget -> SetStart(bbGetInputInMinShow());
-		mwxwidget -> SetEnd(bbGetInputInMaxShow());  
+//		mwxwidget -> SetStart(bbGetInputInMinShow());
+//		mwxwidget -> SetEnd(bbGetInputInMaxShow());  
 		//wxWidgetSliderMinMax * eventHandler = new wxWidgetSliderMinMax(this, mwxwidget); //JPRx
 		bbtkDebugDecTab("Core",9);
 
@@ -109,7 +116,8 @@ void SliderMinMax::CreateWidget(wxWindow* parent)
 //------------------------------------------------------
 void SliderMinMax::bbUserSetDefaultValues()
 {
-		mwxwidget = NULL;
+		firsttime	=	true;
+		mwxwidget	=	NULL;
 		bbSetInputOrientation(1);
 		bbSetInputInW(200);
 		bbSetInputInH(65);
diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.h b/bbtk/src/bbmaracasvisuSliderMinMax.h
index d62496a..eaab032 100644
--- a/bbtk/src/bbmaracasvisuSliderMinMax.h
+++ b/bbtk/src/bbmaracasvisuSliderMinMax.h
@@ -40,8 +40,8 @@ namespace bbcreaMaracasVisu
 	  //--------------------------------------------------------------------------------------------------------------------------------
 	  // Attributes
 	  //--------------------------------------------------------------------------------------------------------------------------------
-	  SliderMinMax * mbbtkSliderMinMax;
-	  mBarRange * modBarRange;
+	  SliderMinMax	*mbbtkSliderMinMax;
+	  mBarRange		*modBarRange;
   };
 
 
@@ -75,7 +75,8 @@ class /*BBTK_EXPORT*/ SliderMinMax
   void CreateWidget(wxWindow*);
 
   private:
-	mBarRange* mwxwidget;
+	bool			firsttime;
+	mBarRange		*mwxwidget;
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(SliderMinMax,bbtk::WxBlackBox);