Clean Code

[bbtk.git] / packages / wx / src / bbwxSlider.cxx

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 43f6516c53125aac3199d9fb3c1943c06a281913..b0022b214bbb7ac2ef71d008525ab1fcadb28727 100644 (file)
--- a/packages/wx/src/bbwxSlider.cxx
+++ b/packages/wx/src/bbwxSlider.cxx
@@ -1,33 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbwxSlider.cxx,v $
   Language:  C++
-  Date:      $Date: 2012/10/24 15:04:30 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.27 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
-
 /**
  * \file 
  * \brief Short description in one line
@@ -146,6 +151,10 @@ namespace bbwx
        wxorientation   = wxSL_VERTICAL;
       }
     
+      
+    wxSize  sizeSliderWidget(25,25);
+//  int  widthSliderWidget = wxDefaultSize;
+      
     //---------------------------------------------------------------------
     // 1) Creation of the components of the widget
     // Any top level sub-widget must have the panel returned by panel
@@ -153,8 +162,8 @@ namespace bbwx
     mwxSlider = new wxSlider( panel, 
                              -1, 0 , 0, 500 , 
                              wxDefaultPosition, 
-                             wxSize(sizeX,sizeY), 
-                             wxorientation  | wxlabels );
+                  sizeSliderWidget, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
+
 
     //    mwxSlider->SetInitialSize(wxSize(sizeX,sizeY));
 
@@ -440,31 +449,28 @@ namespace bbwx
     bbtkDebugMessage("process",3,
                     "Slider "<<bbGetName()<<" input="
                     <<bbGetInputIn()<<std::endl);
-
+    
+    if (bbGetOutputWidget()!=NULL)
+       {
 // desperate try // JPR
-      if ( bbGetInputMin() != ((SliderWidget*)bbGetOutputWidget())->GetMin() ||  bbGetInputMax() != ((SliderWidget*)bbGetOutputWidget())->GetMax() )       
-      {    
-                 ((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ;
-      }
+       if ( bbGetInputMin() != ((SliderWidget*)bbGetOutputWidget())->GetMin() ||  bbGetInputMax() != ((SliderWidget*)bbGetOutputWidget())->GetMax() )       
+       {    
+                       ((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ;
+       }
 
-         ((SliderWidget*)bbGetOutputWidget())->SetReactiveOnTrack( bbGetInputReactiveOnTrack() ) ;
+               ((SliderWidget*)bbGetOutputWidget())->SetReactiveOnTrack( bbGetInputReactiveOnTrack() ) ;
          
-    bbSetOutputOut( bbGetInputIn() );
-    if (bbGetOutputWidget()!=0)
-      {
-       ((SliderWidget*)bbGetOutputWidget())->SetValue(bbGetInputIn());
-      }
+       bbSetOutputOut( bbGetInputIn() );
+               ((SliderWidget*)bbGetOutputWidget())->SetValue(bbGetInputIn());
+       } // if bbGetOutputWidget
   }
 
 //--------------------------------------------------------------------------
   void Slider::CreateWidget(wxWindow* parent)
   {
-
     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, 
                                        parent, //bbGetWxParent(),
@@ -478,8 +484,8 @@ namespace bbwx
                                        bbGetInputReactiveOnTrack()
                                        ); 
     //    std::cout << "w = "<<w<<std::endl;
-    // w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
-         
+    // w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );       
+       bbSetOutputOut( bbGetInputIn() );
     bbSetOutputWidget( w );
   }