#include "bbwxComboBox.h"
#include "bbwxPackage.h"
-
#include <vector>
#include <string>
#include <wx/control.h>
#include <wx/listbox.h>
+#include <wx/spinbutt.h>
+
namespace bbwx
{
//--------------------------------------------------------------------------
void FillItems( int iSelection, std::vector< std::string > lstIn);
void VerifyDeselect(int iSelection);
+ void OnSpinCtrlClick(wxCommandEvent& event);
+
+
private:
int mTypeForm;
ComboBox *mBox;
- wxItemContainer* itemcontainer;
+ wxItemContainer *itemcontainer;
+ wxSpinButton *mwxspinbutton;
};
int typeForm,
int sizeX,
int sizeY
- )
- :
+ ) :
wxPanel( parent, -1,wxDefaultPosition ) ,
mBox(box),
mTypeForm(typeForm)
{
- wxPanel *panel = this;
+ mwxspinbutton = NULL;
itemcontainer = NULL;
- int i;
-
+ wxPanel *panel = this;
+ int i;
//---------------------------------------------------------------------
// 2) Insertion of the components in the window
// We use a FlexGridSizer
- wxFlexGridSizer *sizer = new wxFlexGridSizer(1);
+// wxFlexGridSizer *sizerV = new wxFlexGridSizer(1);
+// wxFlexGridSizer *sizerH1 = new wxFlexGridSizer(0);
+// wxFlexGridSizer *sizerH2 = new wxFlexGridSizer(2);
+ wxFlexGridSizer *sizer = new wxFlexGridSizer(2);
+
if (title!="")
{
sizer->Add( new wxStaticText(panel,-1, bbtk::std2wx(title) ) );
+ sizer->Add( new wxStaticText(panel,-1, _T("") ) );
}
//---------------------------------------------------------------------
+
if (mTypeForm==1)
{
wxListBox *wxlistbox = new wxListBox ( panel , -1 , wxDefaultPosition,wxSize(sizeX,sizeY),0, NULL, wxLB_SINGLE );
itemcontainer=wxlistbox;
sizer->Add( wxlistbox,1,wxEXPAND );
Connect( wxlistbox->GetId(),
- wxEVT_COMMAND_LISTBOX_SELECTED, (wxObjectEventFunction) (void (wxPanel::*)(wxEvent&))&ComboBoxWidget::OnComboBox );
+ wxEVT_COMMAND_LISTBOX_SELECTED, (wxObjectEventFunction) (void (wxPanel::*)(wxEvent&))&ComboBoxWidget::OnComboBox );
} else if (mTypeForm==0) {
- wxChoice *wxchoice = new wxChoice ( panel , -1);
+ wxChoice *wxchoice = new wxChoice ( panel , -1, wxDefaultPosition,wxSize(sizeX,sizeY));
itemcontainer=wxchoice;
sizer->Add( wxchoice,1,wxGROW );
-
Connect( wxchoice->GetId(),
wxEVT_COMMAND_CHOICE_SELECTED, (wxObjectEventFunction) (void (wxPanel::*)(wxEvent&))&ComboBoxWidget::OnComboBox );
}
- sizer->AddGrowableCol(0);
- panel->SetSizer(sizer);
- for (i=0;i<lstIn.size(); i++)
+ if (mBox->bbGetInputWithSpinButton()==true)
{
- itemcontainer->Append( bbtk::std2wx( lstIn[i] ) );
- } // for i
-// itemcontainer->SetSelection(iSelection);
+ mwxspinbutton = new wxSpinButton( panel, -1 );
+ Connect( mwxspinbutton->GetId(),
+ wxEVT_SPIN,
+ (wxObjectEventFunction)
+ (void (wxPanel::*)(wxScrollEvent&))
+ &ComboBoxWidget::OnSpinCtrlClick);
+ sizer->Add( mwxspinbutton,1,wxEXPAND );
+ }
+ sizer->AddGrowableCol(0);
+
+ panel->SetSizer(sizer);
+ FillItems( iSelection,lstIn );
}
//-------------------------------------------------------------------------
{
mBox->bbSetInputSelection( iSelection );
mBox->bbSetOutputOut( iSelection );
- mBox->bbSetOutputOutString( bbtk::wx2std( itemcontainer->GetString(iSelection) ) );
- mBox->bbSignalOutputModification();
+// Patch to clean the spaces at the begining
+ std::string tmpStr = bbtk::wx2std( itemcontainer->GetString(iSelection) );
+ if (tmpStr.length()>0) { while(tmpStr[0]==' ') tmpStr.erase(0,1); }
+ mBox->bbSetOutputOutString( tmpStr );
+// mBox->bbSetOutputOutString( bbtk::wx2std( itemcontainer->GetString(iSelection) ) );
+
+ mBox->bbSignalOutputModification();
VerifyDeselect(iSelection);
+ if (mTypeForm==0)
+ {
+ wxChoice *wxchoise=(wxChoice *)itemcontainer;
+ wxchoise->SetToolTip( itemcontainer->GetString(iSelection) );
+ } // if mTypeForm
+
// mBox->bbSignalOutputModification("Out");
// mBox->bbSignalOutputModification("OutString");
} // if iSelection
}
- //--------------------------------------------------------------------------
- void ComboBoxWidget::OnComboBox(wxEvent& event)
- {
- OnComboBoxSelection( itemcontainer->GetSelection() );
- }
//--------------------------------------------------------------------------
- void ComboBoxWidget::FillItems( int iSelection, std::vector< std::string > lstIn )
+void ComboBoxWidget::OnComboBox(wxEvent& event)
+{
+ int iSelection = itemcontainer->GetSelection();
+ OnComboBoxSelection( iSelection );
+ if (mBox->bbGetInputWithSpinButton()==true)
{
- int i;
- itemcontainer->Clear();
- for (i=0;i<lstIn.size(); i++)
- {
- itemcontainer->Append( bbtk::std2wx( lstIn[i] ) );
- } // for i
- if (iSelection>=0) itemcontainer->SetSelection(iSelection);
- }
+ mwxspinbutton->SetValue( iSelection );
+ }
+
+}
+
+//--------------------------------------------------------------------------
+void ComboBoxWidget::OnSpinCtrlClick(wxCommandEvent& event)
+{
+ int iSelection = mwxspinbutton->GetValue();
+ itemcontainer->SetSelection(iSelection);
+ OnComboBoxSelection( iSelection );
+}
+
+
+//--------------------------------------------------------------------------
+void ComboBoxWidget::FillItems( int iSelection, std::vector< std::string > lstIn )
+{
+ int i,size = lstIn.size();
+
+
+#if defined(_WIN32)
+ // Patch to put spaces at the beginin
+#else
+ /*
+ // Patch to put spaces at the beginin
+ int strLength=-1;
+ // Looking for the longest string
+ for (i=0 ;i<size; i++)
+ {
+ if ( strLength < (int) lstIn[i].length() ) { strLength=lstIn[i].length(); }
+ } // for
+ // Adding spaces at the bigining to the others strings in the list to have the same size
+ int ii,len2;
+ for (i=0 ;i<size; i++)
+ {
+ len2 = strLength - lstIn[i].length();
+ for (ii=0;ii<len2;ii++)
+ {
+ lstIn[i]=" "+lstIn[i]; // spaces characters
+ } // for ii
+ } // for i
+ */
+#endif // defined(_WIN32)
+
+ itemcontainer->Clear();
+ for (i=0;i<size; i++)
+ {
+ itemcontainer->Append( bbtk::std2wx( lstIn[i] ) );
+ } // for i
+ if (iSelection>=0)
+ {
+ itemcontainer->SetSelection(iSelection);
+ if (mBox->bbGetInputWithSpinButton()==true)
+ {
+ mwxspinbutton->SetRange( 0,size-1 );
+ mwxspinbutton->SetValue( iSelection );
+ }
+
+ } // iSelection
+
+ if (mTypeForm==0)
+ {
+ ((wxChoice*)itemcontainer)->SetAutoLayout( true );
+ ((wxChoice*)itemcontainer)->Layout( );
+ } // if mTypeForm
+}
BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,ComboBox)
BBTK_BLACK_BOX_IMPLEMENTATION(ComboBox,bbtk::WxBlackBox);
+
//=====
// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
//=====
void ComboBox::Process()
{
int iSelection = bbGetInputSelection();
- if (bbGetInputSelection() >= bbGetInputIn().size()) { iSelection=bbGetInputIn().size()-1; }
+// if (bbGetInputSelection() >= bbGetInputIn().size()) { iSelection=bbGetInputIn().size()-1; }
+ if (bbGetInputSelection() >= bbGetInputIn().size()) { iSelection=0; }
ComboBoxWidget *w = (ComboBoxWidget*)bbGetOutputWidget();
- w->FillItems( iSelection, bbGetInputIn() );
- bbSetInputSelection( iSelection );
- bbSetOutputOut( iSelection );
- int size = bbGetInputIn().size();
- if ( (iSelection>0) && ( (size-1)<=iSelection) )
- {
- bbSetOutputOutString( bbGetInputIn()[ iSelection ] );
- } // if iSelection
-
- w->VerifyDeselect(iSelection);
+ if (w!=NULL) {
+ w->FillItems( iSelection, bbGetInputIn() );
+ bbSetInputSelection( iSelection );
+ bbSetOutputOut( iSelection );
+ int size = bbGetInputIn().size();
+ if ( (iSelection>=0) && ( iSelection<size) )
+ {
+ bbSetOutputOutString( bbGetInputIn()[ iSelection ] );
+ } // if iSelection
+ w->VerifyDeselect(iSelection);
+ } // if w
}
//=====
// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
bbGetInputForm(),
bbGetInputWinWidth(), bbGetInputWinHeight() );
bbSetOutputOut( bbGetInputSelection() );
- bbSetOutputOutString( bbGetInputIn()[ bbGetInputSelection() ] );
+ if (bbGetInputIn().size()> bbGetInputSelection() )
+ {
+ bbSetOutputOutString( bbGetInputIn()[ bbGetInputSelection() ] );
+ } // if InputIn size
bbSetOutputWidget( w );
+
}
//=====
// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
bbSetInputSelection(0);
bbSetInputTitle("");
bbSetInputForm(0);
- bbSetInputWinWidth(100);
- bbSetInputWinHeight(200);
+ bbSetInputWinWidth(10);
+ bbSetInputWinHeight(45);
bbSetInputDeselect(false);
+ bbSetInputWithSpinButton(false);
}
//=====
// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
//=====
void ComboBox::bbUserFinalizeProcessing()
{
-
}
-}
-// EO namespace bbwx
+
+}// EO namespace bbwx
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff