X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxRadioButton.cxx;h=8ff7751aeeb00911f08b3e5c6e9077b154ea3f64;hb=ba3bbbeabbf48058d3453a402cca7b55d49c66cb;hp=904d9828d5675fb1c55285fda76c04b6278d2c21;hpb=17ac9460f5ea5600d1065fbe3ee4ad826d7bb4fc;p=bbtk.git diff --git a/packages/wx/src/bbwxRadioButton.cxx b/packages/wx/src/bbwxRadioButton.cxx index 904d982..8ff7751 100644 --- a/packages/wx/src/bbwxRadioButton.cxx +++ b/packages/wx/src/bbwxRadioButton.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: bbwxRadioButton.cxx,v $ Language: C++ - Date: $Date: 2009/05/15 14:58:03 $ - Version: $Revision: 1.9 $ + Date: $Date: 2012/11/16 08:52:14 $ + Version: $Revision: 1.10 $ =========================================================================*/ -/* --------------------------------------------------------------------- - -* 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 @@ -60,11 +65,14 @@ namespace bbwx int GetValue(); void OnRadioButton(wxEvent& event); + void AddElements(std::vector lstIn, int In, wxString title); private: RadioButton *mBox; int MAX_RADIOBUTTON; wxRadioButton *mwxRadioButton[10]; + + wxFlexGridSizer *sizer; }; //------------------------------------------------------------------------ @@ -81,8 +89,10 @@ namespace bbwx wxPanel( parent, -1) , mBox(box) { - wxPanel *panel = this; + +/* MAX_RADIOBUTTON = lstIn.size(); + wxPanel *panel = this; int i; long style=wxRB_GROUP; for (i=0;iSetValue(true); - } - else - { + } else { mwxRadioButton[i]->SetValue(false); } Connect( mwxRadioButton[i]->GetId(), @@ -108,18 +116,20 @@ namespace bbwx (wxObjectEventFunction) (void (wxPanel::*)(wxEvent&)) &RadioButtonWidget::OnRadioButton ); - } - else - { + } else { mwxRadioButton[i]=NULL; - } - } + } // if + } // for //--------------------------------------------------------------------- // 2) Insertion of the components in the window // We use a FlexGridSizer - wxFlexGridSizer *sizer = new wxFlexGridSizer(1); + +//EED 2018-04-18 +// wxFlexGridSizer *sizer = new wxFlexGridSizer(1); + sizer = new wxFlexGridSizer(1); + if (title!=_T("")) { sizer->Add( new wxStaticText(panel,-1, title ) ); @@ -136,6 +146,7 @@ namespace bbwx // panel->SetAutoLayout(true); // panel->Layout(); +*/ } //------------------------------------------------------------------------- @@ -171,6 +182,73 @@ namespace bbwx mBox->bbSignalOutputModification("Out"); } + + //-------------------------------------------------------------------------- + void RadioButtonWidget::AddElements( std::vector lstIn ,int In, wxString title) + { + DestroyChildren(); + + MAX_RADIOBUTTON = lstIn.size(); + wxPanel *panel = this; + int i; + long style=wxRB_GROUP; + for (i=0;iSetValue(true); + } else { + mwxRadioButton[i]->SetValue(false); + } + Connect( mwxRadioButton[i]->GetId(), + wxEVT_COMMAND_RADIOBUTTON_SELECTED, + (wxObjectEventFunction) + (void (wxPanel::*)(wxEvent&)) + &RadioButtonWidget::OnRadioButton ); + } else { + mwxRadioButton[i]=NULL; + } // if + } // for + + //--------------------------------------------------------------------- + // 2) Insertion of the components in the window + + // We use a FlexGridSizer + +//EED 2018-04-18 +// wxFlexGridSizer *sizer = new wxFlexGridSizer(1); + sizer = new wxFlexGridSizer(1); + + if (title!=_T("")) + { + sizer->Add( new wxStaticText(panel,-1, title ) ); + } + for (i=0;iAdd( mwxRadioButton[i],1,wxGROW ); + } + } + sizer->AddGrowableCol(0); + panel->SetSizer(sizer); + +// panel->SetAutoLayout(true); +// panel->Layout(); + + + + } + + //-------------------------------------------------------------------------- //------------------------------------------------------------------------- //-------------------------------------------------------------------------- @@ -211,6 +289,24 @@ namespace bbwx { bbtkDebugMessageInc("Core",9,"RadioButton::Process()"< lstIn; + lstIn.push_back( bbtk::std2wx(bbGetInputIn0()) ); + lstIn.push_back( bbtk::std2wx(bbGetInputIn1()) ); + lstIn.push_back( bbtk::std2wx(bbGetInputIn2()) ); + lstIn.push_back( bbtk::std2wx(bbGetInputIn3()) ); + lstIn.push_back( bbtk::std2wx(bbGetInputIn4()) ); + lstIn.push_back( bbtk::std2wx(bbGetInputIn5()) ); + lstIn.push_back( bbtk::std2wx(bbGetInputIn6()) ); + lstIn.push_back( bbtk::std2wx(bbGetInputIn7()) ); + lstIn.push_back( bbtk::std2wx(bbGetInputIn8()) ); + lstIn.push_back( bbtk::std2wx(bbGetInputIn9()) ); + + + ( (RadioButtonWidget*)bbGetOutputWidget() )->AddElements(lstIn, bbGetInputIn() , bbtk::std2wx(bbGetInputTitle()) ); + + } /** @@ -236,7 +332,7 @@ namespace bbwx RadioButtonWidget *w = new RadioButtonWidget( this, // bbGetWxParent(), - parent, + parent, bbGetInputIn() , bbtk::std2wx(bbGetInputTitle()), lstIn );