X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxRadioButton.cxx;h=8ff7751aeeb00911f08b3e5c6e9077b154ea3f64;hb=ba3bbbeabbf48058d3453a402cca7b55d49c66cb;hp=6527cfa4719ad3da196593ce9af52fa639756750;hpb=d3ec778ab062261978fcaf393f33c41b20cdd275;p=bbtk.git diff --git a/packages/wx/src/bbwxRadioButton.cxx b/packages/wx/src/bbwxRadioButton.cxx index 6527cfa..8ff7751 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/11 14:47:12 $ - Version: $Revision: 1.1 $ - - 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,36 @@ 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 lstIn ); + + ~RadioButtonWidget(); + + 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; + }; + + //------------------------------------------------------------------------ + //------------------------------------------------------------------------ + //------------------------------------------------------------------------ + //------------------------------------------------------------------------- RadioButtonWidget::RadioButtonWidget( RadioButton* box, wxWindow *parent, @@ -40,11 +86,13 @@ namespace bbwx wxString title, std::vector lstIn ) : - wxPanel( parent, -1) + 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(), @@ -70,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 ) ); @@ -94,10 +142,11 @@ namespace bbwx } } sizer->AddGrowableCol(0); - panel->SetSizer(sizer); - panel->SetAutoLayout(true); - panel->Layout(); + +// panel->SetAutoLayout(true); +// panel->Layout(); +*/ } //------------------------------------------------------------------------- @@ -133,36 +182,131 @@ 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(); - 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(""); } - + + //-------------------------------------------------------------------------- + //------------------------------------------------------------------------- + //-------------------------------------------------------------------------- + //-------------------------------------------------------------------------- + + BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,RadioButton); + BBTK_BLACK_BOX_IMPLEMENTATION(RadioButton,bbtk::WxBlackBox); + + + //----------------------------------------------------------------- + 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()"< 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()) ); + + } /** @@ -170,7 +314,7 @@ namespace bbwx * * */ - void RadioButton::CreateWidget() + void RadioButton::CreateWidget(wxWindow* parent) { std::vector lstIn; @@ -187,11 +331,13 @@ namespace bbwx RadioButtonWidget *w = new RadioButtonWidget( this, - bbGetWxParent(), +// bbGetWxParent(), + parent, bbGetInputIn() , bbtk::std2wx(bbGetInputTitle()), lstIn ); + bbSetOutputOut( bbGetInputIn() ); bbSetOutputWidget( w ); }