added find performance test (see #9870) and the possibility to set the number of items (for list and report views only)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -43,6 +43,7 @@
|
||||
#include "wx/colordlg.h" // for wxGetColourFromUser
|
||||
#include "wx/settings.h"
|
||||
#include "wx/sysopt.h"
|
||||
#include "wx/numdlg.h"
|
||||
|
||||
#include "listtest.h"
|
||||
|
||||
@@ -65,9 +66,6 @@ const wxChar *SMALL_VIRTUAL_VIEW_ITEMS[][2] =
|
||||
{ _T("Sheep"), _T("baaah") },
|
||||
};
|
||||
|
||||
// number of items in list/report view
|
||||
static const int NUM_ITEMS = 10;
|
||||
|
||||
// number of items in icon/small icon view
|
||||
static const int NUM_ICONS = 9;
|
||||
|
||||
@@ -127,6 +125,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
EVT_MENU(LIST_VIRTUAL_VIEW, MyFrame::OnVirtualView)
|
||||
EVT_MENU(LIST_SMALL_VIRTUAL_VIEW, MyFrame::OnSmallVirtualView)
|
||||
|
||||
EVT_MENU(LIST_SET_ITEMS_COUNT, MyFrame::OnSetItemsCount)
|
||||
|
||||
EVT_MENU(LIST_GOTO, MyFrame::OnGoTo)
|
||||
EVT_MENU(LIST_FOCUS_LAST, MyFrame::OnFocusLast)
|
||||
EVT_MENU(LIST_TOGGLE_FIRST, MyFrame::OnToggleFirstSel)
|
||||
@@ -153,6 +153,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
#ifdef __WXOSX__
|
||||
EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric)
|
||||
#endif // __WXOSX__
|
||||
EVT_MENU(LIST_FIND, MyFrame::OnFind)
|
||||
|
||||
EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo)
|
||||
EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel)
|
||||
@@ -165,6 +166,7 @@ MyFrame::MyFrame(const wxChar *title)
|
||||
m_listCtrl = NULL;
|
||||
m_logWindow = NULL;
|
||||
m_smallVirtual = false;
|
||||
m_numListItems = 10;
|
||||
|
||||
// Give it an icon
|
||||
SetIcon( wxICON(mondrian) );
|
||||
@@ -215,7 +217,10 @@ MyFrame::MyFrame(const wxChar *title)
|
||||
menuView->Append(LIST_SMALL_ICON_TEXT_VIEW, _T("Small icon &view with text\tF6"));
|
||||
menuView->Append(LIST_VIRTUAL_VIEW, _T("&Virtual view\tF7"));
|
||||
menuView->Append(LIST_SMALL_VIRTUAL_VIEW, _T("Small virtual vie&w\tF8"));
|
||||
#ifdef __WXMAC__
|
||||
menuView->AppendSeparator();
|
||||
menuView->Append(LIST_SET_ITEMS_COUNT, "Set &number of items");
|
||||
#ifdef __WXOSX__
|
||||
menuView->AppendSeparator();
|
||||
menuView->AppendCheckItem(LIST_MAC_USE_GENERIC, _T("Mac: Use Generic Control"));
|
||||
#endif
|
||||
|
||||
@@ -235,6 +240,7 @@ MyFrame::MyFrame(const wxChar *title)
|
||||
#endif // wxHAS_LISTCTRL_COLUMN_ORDER
|
||||
menuList->AppendSeparator();
|
||||
menuList->Append(LIST_SORT, _T("Sor&t\tCtrl-T"));
|
||||
menuList->Append(LIST_FIND, "Test Find() performance");
|
||||
menuList->AppendSeparator();
|
||||
menuList->Append(LIST_ADD, _T("&Append an item\tCtrl-P"));
|
||||
menuList->Append(LIST_EDIT, _T("&Edit the item\tCtrl-E"));
|
||||
@@ -464,7 +470,7 @@ void MyFrame::OnListView(wxCommandEvent& WXUNUSED(event))
|
||||
|
||||
void MyFrame::InitWithListItems()
|
||||
{
|
||||
for ( int i = 0; i < NUM_ITEMS; i++ )
|
||||
for ( int i = 0; i < m_numListItems; i++ )
|
||||
{
|
||||
m_listCtrl->InsertItem(i, wxString::Format(_T("Item %d"), i));
|
||||
}
|
||||
@@ -499,13 +505,13 @@ void MyFrame::InitWithReportItems()
|
||||
|
||||
wxStopWatch sw;
|
||||
|
||||
for ( int i = 0; i < NUM_ITEMS; i++ )
|
||||
for ( int i = 0; i < m_numListItems; i++ )
|
||||
{
|
||||
m_listCtrl->InsertItemInReportView(i);
|
||||
}
|
||||
|
||||
m_logWindow->WriteText(wxString::Format(_T("%d items inserted in %ldms\n"),
|
||||
NUM_ITEMS, sw.Time()));
|
||||
m_numListItems, sw.Time()));
|
||||
m_listCtrl->Show();
|
||||
|
||||
// we leave all mask fields to 0 and only change the colour
|
||||
@@ -595,6 +601,31 @@ void MyFrame::OnSmallVirtualView(wxCommandEvent& WXUNUSED(event))
|
||||
RecreateList(wxLC_REPORT | wxLC_VIRTUAL);
|
||||
}
|
||||
|
||||
void MyFrame::OnSetItemsCount(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
int numItems = wxGetNumberFromUser
|
||||
(
|
||||
"Enter the initial number of items for "
|
||||
"the list and report views",
|
||||
"Number of items:",
|
||||
"wxWidgets wxListCtrl sample",
|
||||
m_numListItems,
|
||||
0,
|
||||
10000,
|
||||
this
|
||||
);
|
||||
if ( numItems == -1 || numItems == m_numListItems )
|
||||
return;
|
||||
|
||||
m_numListItems = numItems;
|
||||
|
||||
if ( m_listCtrl->HasFlag(wxLC_REPORT) &&
|
||||
!m_listCtrl->HasFlag(wxLC_VIRTUAL) )
|
||||
RecreateList(wxLC_REPORT);
|
||||
else if ( m_listCtrl->HasFlag(wxLC_LIST) )
|
||||
RecreateList(wxLC_LIST);
|
||||
}
|
||||
|
||||
void MyFrame::InitWithVirtualItems()
|
||||
{
|
||||
m_listCtrl->SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
|
||||
@@ -626,6 +657,18 @@ void MyFrame::OnSort(wxCommandEvent& WXUNUSED(event))
|
||||
sw.Time()));
|
||||
}
|
||||
|
||||
void MyFrame::OnFind(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
wxStopWatch sw;
|
||||
|
||||
const int itemCount = m_listCtrl->GetItemCount();
|
||||
for ( int i = 0; i < itemCount; i++ )
|
||||
m_listCtrl->FindItem(-1, i);
|
||||
|
||||
wxLogMessage("Calling Find() for all %d items took %ld ms",
|
||||
itemCount, sw.Time());
|
||||
}
|
||||
|
||||
void MyFrame::OnShowSelInfo(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
int selCount = m_listCtrl->GetSelectedItemCount();
|
||||
|
Reference in New Issue
Block a user