X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=5345a005150e3292de99bd7f5ff2ed35fba62cd7;hb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;hp=557e7b2a7459bfde9625f5d45f8898576339f76d;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 557e7b2..5345a00 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:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/18 12:59:53 $
+  Version:   $Revision: 1.11 $
                                                                                 
   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
 {
@@ -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;
@@ -224,8 +219,6 @@ namespace bbwx
     RefreshLabels();  
     // Insert the sizer in the main panel and refresh the layout
     panel->SetSizer(sizer);
-    //   panel->SetAutoLayout(true);
-    //    panel->Layout();
   }
   //-------------------------------------------------------------------------
   
@@ -333,10 +326,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,46 +336,44 @@ namespace bbwx
     bbSetInputMin(0);
     bbSetInputMax(500);
     bbSetOutputOut(0);
-    bbSetInputOrientation(0);
+    bbSetInputOrientation("HORIZONTAL");
     bbSetInputChangeResolution(false);
     bbSetInputLabel(true);
     bbSetInputReactiveOnTrack(0);    
   }
-  //--------------------------------------------------------------------------
-
+  
   //--------------------------------------------------------------------------
   void Slider::Process() 
   {
-    int val = bbGetInputIn();
     bbSetOutputOut( bbGetInputIn() );
-
-    if (bbGetOutputWidget()==0) 
-      {
-	bbSetOutputWidget( new SliderWidget(this, 
-					    bbGetWxParent(),
-					    bbGetInputOrientation() , 
-					    bbGetInputChangeResolution(), 
-					    bbGetInputLabel(), 
-					    bbtk::std2wx( bbGetInputTitle() ),
-					    bbGetInputMin(), 
-					    bbGetInputMax(),
-					    val,
-					    bbGetInputReactiveOnTrack()
-					    )
-			   );
-      }
   }
-  //--------------------------------------------------------------------------  
-  /*
-  //--------------------------------------------------------------------------
-  bbtk::WxBlackBoxWidget* Slider::bbUserCreateWidget(wxWindow *parent)
+
+  void Slider::CreateWidget()
   {
-   
 
+    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(),
+					orientation , 
+					bbGetInputChangeResolution(), 
+					bbGetInputLabel(), 
+					bbtk::std2wx( bbGetInputTitle() ),
+					bbGetInputMin(), 
+					bbGetInputMax(),
+					bbGetInputIn(),
+					bbGetInputReactiveOnTrack()
+					); 
+    //    std::cout << "w = "<<w<<std::endl;
+    //	w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
+	  
+    bbSetOutputWidget( w );
   }
-  //--------------------------------------------------------------------------
-  */
-
+  
 
 } //namespace bbwx