X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxRadioButton.cxx;h=ce0f36b5c84c03f1a3c158b202b19b3f44d06c11;hb=f9574f4d8fb212474d38c304002a493051c7b579;hp=f415c665bc522f22a75c161593b20f0e6637da60;hpb=0d9c3f691b5889816aea4d7e813f58e1950f81ed;p=bbtk.git

diff --git a/packages/wx/src/bbwxRadioButton.cxx b/packages/wx/src/bbwxRadioButton.cxx
index f415c66..ce0f36b 100644
--- a/packages/wx/src/bbwxRadioButton.cxx
+++ b/packages/wx/src/bbwxRadioButton.cxx
@@ -1,20 +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: bbwxRadioButton.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/14 20:26:54 $
-  Version:   $Revision: 1.3 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
+
 /**
  *  \file 
  *  \brief 
@@ -31,8 +49,33 @@
 
 namespace bbwx
 {
-  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,RadioButton);
+    
+  
+  //--------------------------------------------------------------------------
+  // The widget created by the box 
+  class RadioButtonWidget : public wxPanel
+  {
+  public:
+    RadioButtonWidget( RadioButton* box, wxWindow *parent, 
+                      int In, 
+                      wxString title, 
+                      std::vector<wxString> lstIn );
+
+    ~RadioButtonWidget();
+
+    int GetValue();
+    void OnRadioButton(wxEvent& event);
+
+  private:
+    RadioButton      *mBox;
+    int	             MAX_RADIOBUTTON;
+    wxRadioButton    *mwxRadioButton[10];
+  };
   
+  //------------------------------------------------------------------------
+  //------------------------------------------------------------------------
+  //------------------------------------------------------------------------
+
   //-------------------------------------------------------------------------
   RadioButtonWidget::RadioButtonWidget( RadioButton* box,
                wxWindow *parent,
@@ -138,27 +181,37 @@ namespace bbwx
   //--------------------------------------------------------------------------
   //--------------------------------------------------------------------------
 
+  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,RadioButton);
+  BBTK_BLACK_BOX_IMPLEMENTATION(RadioButton,bbtk::WxBlackBox);
 
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(RadioButton,bbtk::WxBlackBox);
-
-
-  void RadioButton::bbUserConstructor() 
-  { 
-    bbSetInputIn(0);
-    bbSetOutputOut( bbGetInputIn() );
-    bbSetInputIn0("");
-    bbSetInputIn1("");
-    bbSetInputIn2("");
-    bbSetInputIn3("");
-    bbSetInputIn4("");
-    bbSetInputIn5("");
-    bbSetInputIn6("");
-    bbSetInputIn7("");
-    bbSetInputIn8("");
-    bbSetInputIn9("");
-  }
   
-
+	//-----------------------------------------------------------------	
+	void RadioButton::bbUserSetDefaultValues()
+	{
+		bbSetInputIn(0);
+		bbSetOutputOut( bbGetInputIn() );
+		bbSetInputIn0("");
+		bbSetInputIn1("");
+		bbSetInputIn2("");
+		bbSetInputIn3("");
+		bbSetInputIn4("");
+		bbSetInputIn5("");
+		bbSetInputIn6("");
+		bbSetInputIn7("");
+		bbSetInputIn8("");
+		bbSetInputIn9("");		
+	}
+	
+	//-----------------------------------------------------------------	
+	void RadioButton::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void RadioButton::bbUserFinalizeProcessing()
+	{
+	}
+	
   void RadioButton::Process() 
   { 
     bbtkDebugMessageInc("Core",9,"RadioButton::Process()"<<std::endl);
@@ -170,7 +223,7 @@ namespace bbwx
    *
    *
    */ 
- void RadioButton::CreateWidget()
+ void RadioButton::CreateWidget(wxWindow* parent)
   {
 
     std::vector<wxString> lstIn;
@@ -187,11 +240,13 @@ namespace bbwx
 
     RadioButtonWidget *w = new RadioButtonWidget(
                          this,
-                         bbGetWxParent(),
+//                         bbGetWxParent(),
+							parent,	
                          bbGetInputIn() ,
                          bbtk::std2wx(bbGetInputTitle()),
                          lstIn );
 
+   bbSetOutputOut( bbGetInputIn() );
    bbSetOutputWidget( w );
 
   }