X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=bbaa71351b195a8788ac6174f1c4a036ec3397c5;hb=0edcd2a545e9147a244167d1c336e06c4731216a;hp=7039139bfb0be22fedd0688e1708f4ae6b35a071;hpb=555854b9edeeb49fdd03fad2b1274e6d6db6d9f7;p=bbtk.git

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 7039139..bbaa713 100644
--- a/packages/wx/src/bbwxSlider.cxx
+++ b/packages/wx/src/bbwxSlider.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSlider.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:41:35 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/10/06 09:05:07 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,16 +24,11 @@
  *  
  */
 
-
 #ifdef _USE_WXWIDGETS_
 
-
-
 #include "bbwxSlider.h"
 #include "bbwxPackage.h"
-
-
-
+#include "bbtkUtilities.h"
 
 namespace bbwx
 {
@@ -47,7 +42,7 @@ namespace bbwx
 			     int vmin,
 			     int vmax,
 			     int value,
-              int reactiveontrack)
+                             int reactiveontrack)
     :  
     wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
     mBox(box),
@@ -56,12 +51,12 @@ namespace bbwx
     reactiveOnTrack(reactiveontrack)
   {
     wxPanel * panel = this;
-
+    
     label_min           = NULL;
     label_max           = NULL;
     label_vertical      = NULL;
     mResolutionOfSlider	= NULL;
-    
+
     int sizeX,sizeY;
     long wxlabels=0;
     long wxorientation=0;
@@ -115,7 +110,13 @@ namespace bbwx
 	     (void (wxPanel::*)(wxScrollEvent&))
 	      &SliderWidget::OnSliderTrack ); 
     
+    Connect( mwxSlider->GetId(),  
+	     wxEVT_SCROLL_CHANGED, 
 
+	     (wxObjectEventFunction) 
+	     (void (wxPanel::*)(wxScrollEvent&))
+	      &SliderWidget::OnSliderTrack );
+	       
     // If asked : creation of the other little slider which allows to change 
     // the resolution of the main slider
     if (changeresolution==true){
@@ -224,8 +225,6 @@ namespace bbwx
     RefreshLabels();  
     // Insert the sizer in the main panel and refresh the layout
     panel->SetSizer(sizer);
-    //   panel->SetAutoLayout(true);
-    //    panel->Layout();
   }
   //-------------------------------------------------------------------------
   
@@ -267,12 +266,13 @@ namespace bbwx
     {
     // When user releases the slider 
     // we update the output of the box
+    
     mBox->bbSetOutputOut( mwxSlider->GetValue() );
     mBox->bbSetInputIn( mwxSlider->GetValue() );
     // and signal that the output has changed
     mBox->bbSignalOutputModification("Out");    
     }
-    RefreshLabels();  
+    RefreshLabels();
   }
   //-------------------------------------------------------------------------
 
@@ -333,10 +333,9 @@ namespace bbwx
   //--------------------------------------------------------------------------
 
   //--------------------------------------------------------------------------
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(Slider,bbtk::WxBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(Slider,bbtk::WxBlackBox);
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,Slider);
-  //--------------------------------------------------------------------------
-
+  
   //--------------------------------------------------------------------------
   void Slider::bbUserConstructor() 
   { 
@@ -344,13 +343,12 @@ namespace bbwx
     bbSetInputMin(0);
     bbSetInputMax(500);
     bbSetOutputOut(0);
-    bbSetInputOrientation(0);
+    bbSetInputOrientation("HORIZONTAL");
     bbSetInputChangeResolution(false);
     bbSetInputLabel(true);
     bbSetInputReactiveOnTrack(0);    
   }
-  //--------------------------------------------------------------------------
-
+  
   //--------------------------------------------------------------------------
   void Slider::Process() 
   {
@@ -359,9 +357,16 @@ namespace bbwx
 
   void Slider::CreateWidget()
   {
-    bbSetOutputWidget( new SliderWidget(this, 
+
+    int orientation=0;
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|H|HORIZONTAL")==true)  { orientation=0; }
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true)    { orientation=1; }
+    
+    
+    //    std::cout << "bbGetWxParent = "<<bbGetWxParent()<<std::endl;
+    SliderWidget *w =  new SliderWidget(this, 
 					bbGetWxParent(),
-					bbGetInputOrientation() , 
+					orientation , 
 					bbGetInputChangeResolution(), 
 					bbGetInputLabel(), 
 					bbtk::std2wx( bbGetInputTitle() ),
@@ -369,21 +374,13 @@ namespace bbwx
 					bbGetInputMax(),
 					bbGetInputIn(),
 					bbGetInputReactiveOnTrack()
-					)
-		       );
+					); 
+    //    std::cout << "w = "<<w<<std::endl;
+    //	w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
+	  
+    bbSetOutputWidget( w );
   }
   
-  //--------------------------------------------------------------------------  
-  /*
-  //--------------------------------------------------------------------------
-  bbtk::WxBlackBoxWidget* Slider::bbUserCreateWidget(wxWindow *parent)
-  {
-   
-
-  }
-  //--------------------------------------------------------------------------
-  */
-
 
 } //namespace bbwx