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

diff --git a/packages/wx/src/bbwxSlider.h b/packages/wx/src/bbwxSlider.h
index a0a090f..f061465 100644
--- a/packages/wx/src/bbwxSlider.h
+++ b/packages/wx/src/bbwxSlider.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSlider.h,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
@@ -31,10 +31,8 @@
  * \brief 
  */
 
-
 #ifdef _USE_WXWIDGETS_
 
-
 // Prevents multiple inclusions : use symbols of the form
 // __FILENAME_INCLUDED__ 
 // where FILENAME must be replaced by the actual file name
@@ -52,24 +50,13 @@
 namespace bbwx
 {
   
-  
-  
-
-
-
   //--------------------------------------------------------------------------
   // Forward declaration of the box
   class Slider;
-  //--------------------------------------------------------------------------
-
-
-
   
   //--------------------------------------------------------------------------
   // The widget created by the box 
-  // Its name should be : BOXNAMEWidget
-  // It should inherit WxBlackBoxWidget or a descendant such as WxBlackBoxWidgetPanel
-  class SliderWidget : public wxPanel //public bbtk::WxBlackBoxWidgetPanel
+  class SliderWidget : public wxPanel 
   {
   public:
     /// Ctor with the two first params the parent window and the creator box
@@ -124,24 +111,23 @@ namespace bbwx
   class /*BBTK_EXPORT*/ Slider : public bbtk::WxBlackBox
   {
     
-    BBTK_USER_BLACK_BOX_INTERFACE(Slider,bbtk::WxBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(Slider,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In,int);
     BBTK_DECLARE_INPUT(Min,int);
     BBTK_DECLARE_INPUT(Max,int);
     BBTK_DECLARE_INPUT(Label,bool);
     BBTK_DECLARE_INPUT(Title,std::string);
-    BBTK_DECLARE_INPUT(Orientation,int);
+    BBTK_DECLARE_INPUT(Orientation,std::string);
     BBTK_DECLARE_INPUT(ChangeResolution,bool);
     BBTK_DECLARE_INPUT(ReactiveOnTrack,int);    
     BBTK_DECLARE_OUTPUT(Out,int);
     BBTK_PROCESS(Process);
+    BBTK_CREATE_WIDGET(CreateWidget);
     void Process();
+    void CreateWidget();
 
   protected:
     virtual void bbUserConstructor();
-    
-    //  private:
-    //  virtual bbtk::WxBlackBoxWidget* bbUserCreateWidget(wxWindow *parent);
   };
   //=================================================================
  
@@ -150,20 +136,17 @@ namespace bbwx
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(Slider,bbtk::WxBlackBox);
   BBTK_NAME("Slider");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
+  // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
   BBTK_DESCRIPTION("Slider widget (wxSlider)");
-  BBTK_INPUT(Slider,In,"Initial position of the slider (default 0)",int);
-  BBTK_INPUT(Slider,Min,"Minimum value of the slider (default 0)",int);
-  BBTK_INPUT(Slider,Max,"Maximum value of the slider (default 500)",int);
-  BBTK_INPUT(Slider,Label,"Show slider labels ? (default FALSE) ",bool);
-  BBTK_INPUT(Slider,Title,"Title shown above the slider (default '') ",
-	     std::string);
-  BBTK_INPUT(Slider,Orientation,
-	     "Orientation : 0=Horizontal / 1=Vertical (default 0)",int);
-  BBTK_INPUT(Slider,ChangeResolution,
-	     "Can the user change the resolution of the slider ? (default FALSE) ",bool);
-  BBTK_INPUT(Slider,ReactiveOnTrack,
-	     "Slider sends info when track moves (default 0 = no)",int);  
-  BBTK_OUTPUT(Slider,Out,"Current position of the slider",int);
+  BBTK_INPUT(Slider,In,"Initial position of the slider (default 0)",int,"");
+  BBTK_INPUT(Slider,Min,"Minimum value of the slider (default 0)",int,"");
+  BBTK_INPUT(Slider,Max,"Maximum value of the slider (default 500)",int,"");
+  BBTK_INPUT(Slider,Label,"Show slider labels ? (default FALSE) ",bool,"");
+  BBTK_INPUT(Slider,Title,"Title shown above the slider (default '') ", std::string,"");
+  BBTK_INPUT(Slider,Orientation, "Orientation : (default H)  0=H=HORIZONTAL, 1=V=VERTICAL ",std::string,"");
+  BBTK_INPUT(Slider,ChangeResolution, "Can the user change the resolution of the slider ? (default FALSE) ",bool,"");
+  BBTK_INPUT(Slider,ReactiveOnTrack, "Slider sends info when track moves (default 0 = no)",int,"");  
+  BBTK_OUTPUT(Slider,Out,"Current position of the slider",int,"");
   BBTK_END_DESCRIBE_BLACK_BOX(Slider);
   //=================================================================