X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=0b4e7b3e568073f7ab18cdac043fc3093d7d392e;hb=096a2a291176e5d431dd8509737a9e23e6dcb81b;hp=9066cb8b034a89965847715807a9766d7eec20c0;hpb=5196156e0ab3bdf5ea8205d9cbccf558ca3004ad;p=bbtk.git

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 9066cb8..0b4e7b3 100644
--- a/packages/wx/src/bbwxSlider.cxx
+++ b/packages/wx/src/bbwxSlider.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSlider.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/02/10 14:56:50 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2009/10/05 22:44:52 $
+  Version:   $Revision: 1.25 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -74,21 +74,24 @@ namespace bbwx
     void OnResolutionOfSlider(wxScrollEvent& event);
 
     // Accessors
+    void SetValue(int v) { mwxSlider->SetValue(v); }
     int  GetValue() { return mwxSlider->GetValue(); }
+    int GetMin() {return min;}
+    int GetMax() {return max;}    
     void SetRange(int min, int max);
     // Update the texts which display the min/max/current values of the slider
     void RefreshLabels();
 	
   private:
-    Slider*    mBox;
-    wxSlider   *mwxSlider;
-    wxSlider   *mResolutionOfSlider;
-    int        min;
-    int        max;
-    bool       reactiveOnTrack;
-    wxStaticText	*label_vertical;
-    wxStaticText	*label_min;
-    wxStaticText	*label_max;
+    Slider*      mBox;
+    wxSlider     *mwxSlider;
+    wxSlider     *mResolutionOfSlider;
+    int          min;
+    int          max;
+    bool         reactiveOnTrack;
+    wxStaticText *label_vertical;
+    wxStaticText *label_min;
+    wxStaticText *label_max;
   };
   //------------------------------------------------------------------------
   //------------------------------------------------------------------------
@@ -125,9 +128,9 @@ namespace bbwx
     long wxorientation=0;
     if (orientation==0) 
       {
-	sizeX		= 2;
-	sizeY		= 40;
-	wxorientation	= wxSL_HORIZONTAL;
+	sizeX			= 2; 
+	sizeY			= 40;
+	wxorientation		= wxSL_HORIZONTAL;
 	if (labels==true)
 	  {
 	    wxlabels = wxSL_LABELS;
@@ -217,8 +220,8 @@ namespace bbwx
 	    sizer	= new wxFlexGridSizer(2);
 	    if (title!=_T(""))
 	      {
-		sizer	-> Add( new wxStaticText(panel,-1, title ) ); 
-		sizer	-> Add( new wxStaticText(panel,-1, _T("") ) ); 
+		sizer->Add( new wxStaticText(panel,-1, title ) ); 
+		sizer->Add( new wxStaticText(panel,-1, _T("") ) ); 
 	      }
 	  } 
 	else 
@@ -226,14 +229,14 @@ namespace bbwx
 	    sizer	= new wxFlexGridSizer(1);
 	    if (title!=_T(""))
 	      {
-		sizer	-> Add( new wxStaticText(panel,-1, title ) ); 
+		sizer->Add( new wxStaticText(panel,-1, title ) ); 
 	      }
 	  }
-	sizer	-> Add( mwxSlider,1,wxGROW ); 
-	sizer	-> AddGrowableCol(0);
+	sizer->Add( mwxSlider,1,wxGROW ); 
+	sizer->AddGrowableCol(0);
 	if (mResolutionOfSlider!=NULL) 
 	  {
-	    sizer	-> Add( mResolutionOfSlider ); 
+	    sizer->Add( mResolutionOfSlider ); 
 	  }
       } 
     else 
@@ -247,37 +250,37 @@ namespace bbwx
 	    label_max = new wxStaticText(panel,-1,_T(""));
 	    if (title!=_T(""))
 	      {
-		sizer	-> Add( new wxStaticText(panel,-1, title ) );
-		sizer	-> AddGrowableRow(3);
+		sizer->Add( new wxStaticText(panel,-1, title ) );
+		sizer->AddGrowableRow(3);
 	      } 
 	    else 
 	      {
-		sizer	-> AddGrowableRow(2);
+		sizer->AddGrowableRow(2);
 	      }
-	    sizer	-> Add( label_vertical );
-	    sizer	-> Add( label_min );
-	    sizer	-> Add( mwxSlider,1,wxGROW );
-	    sizer	-> Add( label_max );
+	    sizer->Add( label_vertical );
+	    sizer->Add( label_min );
+	    sizer->Add( mwxSlider,1,wxGROW );
+	    sizer->Add( label_max );
 	    if (mResolutionOfSlider!=NULL) 
 	      {
-		sizer	-> Add( mResolutionOfSlider ); 
+		sizer->Add( mResolutionOfSlider ); 
 	      }
 	  } 
 	else 
 	  {
 	    if (title!=_T(""))
 	      {
-		sizer	-> Add( new wxStaticText(panel,-1, title ) );
-		sizer	-> AddGrowableRow(1);
+		sizer->Add( new wxStaticText(panel,-1, title ) );
+		sizer->AddGrowableRow(1);
 	      } 
 	    else 
 	      {
-		sizer	-> AddGrowableRow(0);
+		sizer->AddGrowableRow(0);
 	      }
-	    sizer	-> Add( mwxSlider,1,wxGROW );
+	    sizer->Add( mwxSlider,1,wxGROW );
 	    if (mResolutionOfSlider!=NULL) 
 	      {
-		sizer	-> Add( mResolutionOfSlider ); 
+		sizer->Add( mResolutionOfSlider ); 
 	      }
 	  }
       }
@@ -299,10 +302,10 @@ namespace bbwx
   //-------------------------------------------------------------------------
   void SliderWidget::OnResolutionOfSlider(wxScrollEvent& event)
   {
-    int value = mwxSlider->GetValue();
-    int delta = (int) (pow( 4 , mResolutionOfSlider->GetValue() ));
-    int minTmp   = value - delta/2;
-    int maxTmp   = value + delta/2;
+    int value  = mwxSlider->GetValue();
+    int delta  = (int) (pow((double) 4 ,(double) mResolutionOfSlider->GetValue() ));
+    int minTmp = value - delta/2;
+    int maxTmp = value + delta/2;
     if (minTmp<min)
       {
 	minTmp = min;
@@ -330,7 +333,7 @@ namespace bbwx
     mBox->bbSetOutputOut( mwxSlider->GetValue() );
     mBox->bbSetInputIn( mwxSlider->GetValue() );
     // and signal that the output has changed
-	mBox->bbSignalOutputModification(std::string("Out"));    
+    mBox->bbSignalOutputModification(std::string("Out"));    
     }
     RefreshLabels();
   }
@@ -345,7 +348,7 @@ namespace bbwx
     mBox->bbSetOutputOut( mwxSlider->GetValue() );
     mBox->bbSetInputIn( mwxSlider->GetValue() );
     // and signal that the output has changed
-	mBox->bbSignalOutputModification(std::string("Out"));
+    mBox->bbSignalOutputModification(std::string("Out"));
   }
   //-------------------------------------------------------------------------
   
@@ -396,23 +399,47 @@ namespace bbwx
   BBTK_BLACK_BOX_IMPLEMENTATION(Slider,bbtk::WxBlackBox);
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,Slider);
   
-  //--------------------------------------------------------------------------
-  void Slider::bbUserConstructor() 
-  { 
-    bbSetInputIn(0);
-    bbSetInputMin(0);
-    bbSetInputMax(500);
-    bbSetOutputOut(0);
-    bbSetInputOrientation("HORIZONTAL");
-    bbSetInputChangeResolution(false);
-    bbSetInputLabel(true);
-    bbSetInputReactiveOnTrack(false);    
-  }
+	//-----------------------------------------------------------------	
+	void Slider::bbUserSetDefaultValues()
+	{
+		bbSetInputIn(0);
+		bbSetInputMin(0);
+		bbSetInputMax(500);
+		bbSetOutputOut(0);
+		bbSetInputOrientation("HORIZONTAL");
+		bbSetInputChangeResolution(false);
+		bbSetInputLabel(true);
+		bbSetInputReactiveOnTrack(false);    
+	}
+	
+	//-----------------------------------------------------------------	
+	void Slider::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void Slider::bbUserFinalizeProcessing()
+	{
+	}	
   
   //--------------------------------------------------------------------------
   void Slider::Process() 
   {
+    bbtkDebugMessage("process",3,
+		     "Slider "<<bbGetName()<<" input="
+		     <<bbGetInputIn()<<std::endl);
+
+// desperate try // JPR
+      if ( bbGetInputMin() != ((SliderWidget*)bbGetOutputWidget())->GetMin() ||  bbGetInputMax() != ((SliderWidget*)bbGetOutputWidget())->GetMax() )       
+      {    
+	((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ;
+      }
+      
     bbSetOutputOut( bbGetInputIn() );
+    if (bbGetOutputWidget()!=0)
+      {
+	((SliderWidget*)bbGetOutputWidget())->SetValue(bbGetInputIn());
+      }
   }
 
   void Slider::CreateWidget(wxWindow* parent)