From bf19b714f0efa3f49333746e03f320681924c9e6 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Wed, 4 Mar 2009 17:21:40 +0000 Subject: [PATCH] reorganize the sample splitting it in two source files and an additional header; most important: don't tile all the controls into the main frame: it becomes too big; rather use a notebook control to properly layout them git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/dataview/Makefile.in | 4 + samples/dataview/dataview.bkl | 3 +- samples/dataview/dataview.cpp | 930 +++++++-------------------- samples/dataview/dataview.dsp | 12 + samples/dataview/dataview_vc7.vcproj | 11 + samples/dataview/dataview_vc8.vcproj | 14 + samples/dataview/dataview_vc9.vcproj | 14 + samples/dataview/makefile.bcc | 6 +- samples/dataview/makefile.gcc | 4 + samples/dataview/makefile.unx | 8 +- samples/dataview/makefile.vc | 4 + samples/dataview/makefile.wat | 6 +- samples/dataview/mymodels.cpp | 382 +++++++++++ samples/dataview/mymodels.h | 199 ++++++ samples/dataview/wx_small.xpm | 28 + 15 files changed, 934 insertions(+), 691 deletions(-) create mode 100644 samples/dataview/mymodels.cpp create mode 100644 samples/dataview/mymodels.h create mode 100644 samples/dataview/wx_small.xpm diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index 959504a903..0536730a20 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -51,6 +51,7 @@ DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ DATAVIEW_OBJECTS = \ $(__dataview_os2_lib_res) \ dataview_dataview.o \ + dataview_mymodels.o \ $(__dataview___win32rc) ### Conditionally set variables: ### @@ -183,6 +184,9 @@ dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc) dataview_dataview.o: $(srcdir)/dataview.cpp $(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/dataview.cpp +dataview_mymodels.o: $(srcdir)/mymodels.cpp + $(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/mymodels.cpp + dataview_sample_rc.o: $(srcdir)/../sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include diff --git a/samples/dataview/dataview.bkl b/samples/dataview/dataview.bkl index 917f86d400..3bfd55a8a9 100644 --- a/samples/dataview/dataview.bkl +++ b/samples/dataview/dataview.bkl @@ -4,7 +4,8 @@ - dataview.cpp + dataview.cpp mymodels.cpp + mymodels.h adv core base diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index fda3662599..3b5774ba7d 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -9,6 +9,10 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -28,540 +32,107 @@ #include "wx/numdlg.h" #include "wx/spinctrl.h" #include "wx/imaglist.h" +#include "wx/notebook.h" + +#include "mymodels.h" + +// ---------------------------------------------------------------------------- +// resources +// ---------------------------------------------------------------------------- #ifndef __WXMSW__ #include "../sample.xpm" #endif -#include "null.xpm" - -/* XPM */ -static const char *small1_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 6 1", -". c Black", -"o c #FFFFFF", -"X c #000080", -"O c #FFFF00", -" c None", -"+ c #FF0000", -/* pixels */ -" ", -" ", -" ", -" ....... ", -" .XXXXX. ", -" .oXXXX. ", -" .oXXX.......", -".....oXXX.OOOOO.", -".+++.XXXX.oOOOO.", -".o++......oOOOO.", -".o++++. .oOOOO.", -".o++++. .OOOOO.", -".+++++. .......", -"....... ", -" ", -" " -}; - - -// ------------------------------------- -// MyMusicModel -// ------------------------------------- - -/* -Implement this data model - Title Artist Year Judgement --------------------------------------------------------------------------- -1: My Music: - 2: Pop music - 3: You are not alone Michael Jackson 1995 good - 4: Take a bow Madonna 1994 good - 5: Classical music - 6: Ninth Symphony Ludwig v. Beethoven 1824 good - 7: German Requiem Johannes Brahms 1868 good -*/ - - +#include "wx_small.xpm" -class MyMusicModelNode; -WX_DEFINE_ARRAY_PTR( MyMusicModelNode*, MyMusicModelNodes ); +// ---------------------------------------------------------------------------- +// MyApp +// ---------------------------------------------------------------------------- -class MyMusicModelNode +class MyApp: public wxApp { public: - MyMusicModelNode( MyMusicModelNode* parent, - const wxString &title, const wxString &artist, int year ) - { - m_parent = parent; - m_title = title; - m_artist = artist; - m_year = year; - m_quality = "good"; - m_isContainer = false; - } - - MyMusicModelNode( MyMusicModelNode* parent, - const wxString &branch ) - { - m_parent = parent; - m_title = branch; - m_year = -1; - m_isContainer = true; - } - - ~MyMusicModelNode() - { - size_t count = m_children.GetCount(); - size_t i; - for (i = 0; i < count; i++) - { - MyMusicModelNode *child = m_children[i]; - delete child; - } - } - - bool IsContainer() { return m_isContainer; } - - MyMusicModelNode* GetParent() { return m_parent; } - MyMusicModelNodes &GetChildren() { return m_children; } - MyMusicModelNode* GetNthChild( unsigned int n ) { return m_children.Item( n ); } - void Insert( MyMusicModelNode* child, unsigned int n) { m_children.Insert( child, n); } - void Append( MyMusicModelNode* child ) { m_children.Add( child ); } - unsigned int GetChildCount() { return m_children.GetCount(); } - -public: - wxString m_title; - wxString m_artist; - int m_year; - wxString m_quality; - -private: - MyMusicModelNode *m_parent; - MyMusicModelNodes m_children; - bool m_isContainer; + virtual bool OnInit(); }; +// ---------------------------------------------------------------------------- +// MyFrame +// ---------------------------------------------------------------------------- -class MyMusicModel: public wxDataViewModel +class MyFrame : public wxFrame { public: + MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h); + ~MyFrame(); - // constructor - - MyMusicModel() - { - m_root = new MyMusicModelNode( NULL, wxT("My Music" )); - m_pop = new MyMusicModelNode( m_root, wxT("Pop music") ); - m_root->Append( m_pop ); - m_pop->Append( new MyMusicModelNode( m_pop, - wxT("You are not alone"), wxT("Michael Jackson"), 1995 ) ); - m_pop->Append( new MyMusicModelNode( m_pop, - wxT("Take a bow"), wxT("Madonna"), 1994 ) ); - m_classical = new MyMusicModelNode( m_root, wxT("Classical music") ); - m_root->Append( m_classical ); - m_ninth = new MyMusicModelNode( m_classical, - wxT("Ninth symphony"), wxT("Ludwig van Beethoven"), 1824 ); - m_classical->Append( m_ninth ); - m_classical->Append( new MyMusicModelNode( m_classical, - wxT("German Requiem"), wxT("Johannes Brahms"), 1868 ) ); - m_classicalMusicIsKnownToControl = false; - } - - ~MyMusicModel() - { - delete m_root; - } - - // helper method for wxLog - - wxString GetTitle( const wxDataViewItem &item ) const - { - MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); - if (!node) - return wxEmptyString; - - return node->m_title; - } - - int GetYear( const wxDataViewItem &item ) const - { - MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); - if (!node) - return 2000; - - return node->m_year; - } - - // helper methods to change the model - - void AddToClassical( const wxString &title, const wxString &artist, int year ) - { - // add to data - MyMusicModelNode *child_node = - new MyMusicModelNode( m_classical, title, artist, year ); - - m_classical->Append( child_node ); - - if (m_classicalMusicIsKnownToControl) - { - // notify control - wxDataViewItem child( (void*) child_node ); - wxDataViewItem parent( (void*) m_classical ); - ItemAdded( parent, child ); - } - } - - void Delete( const wxDataViewItem &item ) - { - MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); - wxDataViewItem parent( node->GetParent() ); - - node->GetParent()->GetChildren().Remove( node ); - delete node; - - // notify control - ItemDeleted( parent, item ); - } - - // override sorting to always sort branches ascendingly - - int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) - { - if (IsContainer(item1) && IsContainer(item2)) - { - wxVariant value1,value2; - GetValue( value1, item1, 0 ); - GetValue( value2, item2, 0 ); - - wxString str1 = value1.GetString(); - wxString str2 = value2.GetString(); - int res = str1.Cmp( str2 ); - if (res) return res; +public: + void OnQuit(wxCommandEvent& event); + void OnAbout(wxCommandEvent& event); - // items must be different - wxUIntPtr litem1 = (wxUIntPtr) item1.GetID(); - wxUIntPtr litem2 = (wxUIntPtr) item2.GetID(); + void OnAddMozart(wxCommandEvent& event); + void OnDeleteMusic(wxCommandEvent& event); + void OnDeleteYear(wxCommandEvent& event); + void OnSelectNinth(wxCommandEvent& event); - return litem1-litem2; - } + void OnPrependList(wxCommandEvent& event); + void OnDeleteList(wxCommandEvent& event); - return wxDataViewModel::Compare( item1, item2, column, ascending ); - } + void OnValueChanged( wxDataViewEvent &event ); - // implementation of base class virtuals to define model + void OnActivated( wxDataViewEvent &event ); + void OnExpanding( wxDataViewEvent &event ); + void OnExpanded( wxDataViewEvent &event ); + void OnCollapsing( wxDataViewEvent &event ); + void OnCollapsed( wxDataViewEvent &event ); + void OnSelectionChanged( wxDataViewEvent &event ); - virtual unsigned int GetColumnCount() const - { - return 6; - } + void OnEditingStarted( wxDataViewEvent &event ); + void OnEditingDone( wxDataViewEvent &event ); - virtual wxString GetColumnType( unsigned int col ) const - { - if (col == 2) - return wxT("long"); + void OnHeaderClick( wxDataViewEvent &event ); + void OnHeaderRightClick( wxDataViewEvent &event ); + void OnSorted( wxDataViewEvent &event ); - return wxT("string"); - } + void OnContextMenu( wxDataViewEvent &event ); - virtual void GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const - { - MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); - switch (col) - { - case 0: variant = node->m_title; break; - case 1: variant = node->m_artist; break; - case 2: variant = (long) node->m_year; break; - case 3: variant = node->m_quality; break; - case 4: - // wxMac doesn't conceal the popularity progress renderer, return 0 for containers - if (IsContainer(item)) - variant = (long) 0; - else - variant = (long) 80; // all music is very 80% popular - break; - case 5: - // Make size of red square depend on year - if (GetYear(item) < 1900) - variant = (long) 35; - else - variant = (long) 25; - break; - default: - { - wxLogError( wxT("MyMusicModel::GetValue: wrong column %d"), col ); - - // provoke a crash when mouse button down - wxMouseState state = wxGetMouseState(); - if (state.ShiftDown()) - { - char *crash = 0; - *crash = 0; - } - } - } - } + void OnRightClick( wxMouseEvent &event ); + void OnGoto( wxCommandEvent &event); + void OnAddMany( wxCommandEvent &event); - virtual bool SetValue( const wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) - { - MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); - switch (col) - { - case 0: node->m_title = variant.GetString(); return true; - case 1: node->m_artist = variant.GetString(); return true; - case 2: node->m_year = variant.GetLong(); return true; - case 3: node->m_quality = variant.GetString(); return true; - default: wxLogError( wxT("MyMusicModel::SetValue: wrong column") ); - } - return false; - } + void OnBeginDrag( wxDataViewEvent &event ); + void OnDropPossible( wxDataViewEvent &event ); + void OnDrop( wxDataViewEvent &event ); - virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const - { - // the invisble root node has no parent - if (!item.IsOk()) - return wxDataViewItem(0); +private: + wxNotebook* m_notebook; - MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); + // the controls stored in the various tabs of the main notebook: - // "MyMusic" also has no parent - if (node == m_root) - return wxDataViewItem(0); + wxDataViewCtrl* m_myMusicModelViewCtrl; + wxObjectDataPtr m_music_model; - return wxDataViewItem( (void*) node->GetParent() ); - } + wxDataViewCtrl* m_myListModelViewCtrl; + wxObjectDataPtr m_list_model; - virtual bool IsContainer( const wxDataViewItem &item ) const - { - // the invisble root node can have children (in - // our model always "MyMusic") - if (!item.IsOk()) - return true; + wxDataViewListCtrl* m_listctrl; + wxDataViewTreeCtrl* m_treectrl; - MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); - return node->IsContainer(); - } + // other data: - virtual unsigned int GetChildren( const wxDataViewItem &parent, wxDataViewItemArray &array ) const - { - MyMusicModelNode *node = (MyMusicModelNode*) parent.GetID(); - if (!node) - { - array.Add( wxDataViewItem( (void*) m_root ) ); - return 1; - } - - if (node == m_classical) - { - MyMusicModel *model = (MyMusicModel*)(const MyMusicModel*) this; - model->m_classicalMusicIsKnownToControl = true; - } - - if (node->GetChildCount() == 0) - { - return 0; - } - - unsigned int count = node->GetChildren().GetCount(); - unsigned int pos; - for (pos = 0; pos < count; pos++) - { - MyMusicModelNode *child = node->GetChildren().Item( pos ); - array.Add( wxDataViewItem( (void*) child ) ); - } - return count; - } + wxDataViewColumn* m_col; - wxDataViewItem GetNinthItem() - { - return wxDataViewItem( m_ninth ); - } + wxTextCtrl* m_log; + wxLog *m_logOld; private: - MyMusicModelNode* m_root; - MyMusicModelNode* m_pop; - MyMusicModelNode* m_classical; - MyMusicModelNode* m_ninth; - bool m_classicalMusicIsKnownToControl; + DECLARE_EVENT_TABLE() }; -static int my_sort_reverse( int *v1, int *v2 ) -{ - return *v2-*v1; -} - -static int my_sort( int *v1, int *v2 ) -{ - return *v1-*v2; -} - -class MyListModel: public wxDataViewVirtualListModel -{ -public: - MyListModel() : -#ifdef __WXMAC__ - wxDataViewVirtualListModel( 1000 + 100 ) -#else - wxDataViewVirtualListModel( 100000 + 100 ) -#endif - { -#ifdef __WXMAC__ - m_virtualItems = 1000; -#else - m_virtualItems = 100000; -#endif - - unsigned int i; - for (i = 0; i < 100; i++) - { - wxString str; - str.Printf( wxT("row number %d"), i ); - m_array.Add( str ); - } - - m_icon = wxIcon( null_xpm ); - } - - // helper methods to change the model - - void Prepend( const wxString &text ) - { - m_array.Insert( text, 0 ); - RowPrepended(); - } - - void DeleteItem( const wxDataViewItem &item ) - { - unsigned int row = GetRow( item ); - if (row >= m_array.GetCount()) - return; - - m_array.RemoveAt( row ); - RowDeleted( row ); - } - - void DeleteItems( const wxDataViewItemArray &items ) - { - wxArrayInt rows; - unsigned int i; - for (i = 0; i < items.GetCount(); i++) - { - unsigned int row = GetRow( items[i] ); - if (row < m_array.GetCount()) - rows.Add( row ); - } - - // Sort in descending order so that the last - // row will be deleted first. Otherwise the - // remaining indeces would all be wrong. - rows.Sort( my_sort_reverse ); - for (i = 0; i < rows.GetCount(); i++) - m_array.RemoveAt( rows[i] ); - - // This is just to test if wxDataViewCtrl can - // cope with removing rows not sorted in - // descending order - rows.Sort( my_sort ); - RowsDeleted( rows ); - } - - void AddMany() - { - m_virtualItems += 1000; - Reset( m_array.GetCount() + m_virtualItems ); - } - - // implementation of base class virtuals to define model - - virtual unsigned int GetColumnCount() const - { - return 3; - } - - virtual wxString GetColumnType( unsigned int col ) const - { - if (col == 1) - return wxT("wxDataViewIconText"); - - return wxT("string"); - } - - virtual unsigned int GetRowCount() - { - return m_array.GetCount(); - } - - virtual void GetValueByRow( wxVariant &variant, - unsigned int row, unsigned int col ) const - { - if (col==0) - { - if (row >= m_array.GetCount()) - { - wxString str; - str.Printf(wxT("row %d"), row - m_array.GetCount() ); - variant = str; - } - else - { - variant = m_array[ row ]; - } - } else - if (col==1) - { - wxDataViewIconText data( wxT("test"), m_icon ); - variant << data; - } else - if (col==2) - { - if (row >= m_array.GetCount()) - variant = wxT("plain"); - else - variant = wxT("blue"); - } - } - - virtual bool GetAttrByRow( unsigned int row, unsigned int col, wxDataViewItemAttr &attr ) - { - if (col != 2) - return false; - - if (row < m_array.GetCount()) - { - attr.SetColour( *wxBLUE ); - attr.SetItalic( true ); - } - - return true; - } - - virtual bool SetValueByRow( const wxVariant &variant, - unsigned int row, unsigned int col ) - { - if (col == 0) - { - if (row >= m_array.GetCount()) - return false; - - m_array[row] = variant.GetString(); - return true; - } - - return false; - } - - wxArrayString m_array; - wxIcon m_icon; - int m_virtualItems; -}; - -// ------------------------------------- +// ---------------------------------------------------------------------------- // MyCustomRenderer -// ------------------------------------- +// ---------------------------------------------------------------------------- class MyCustomRenderer: public wxDataViewCustomRenderer { @@ -580,14 +151,18 @@ public: virtual bool Activate( wxRect WXUNUSED(cell), - wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) ) + wxDataViewModel *WXUNUSED(model), + const wxDataViewItem &WXUNUSED(item), + unsigned int WXUNUSED(col) ) { wxLogMessage( wxT("MyCustomRenderer Activate()") ); return false; } virtual bool LeftClick( wxPoint cursor, wxRect WXUNUSED(cell), - wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) ) + wxDataViewModel *WXUNUSED(model), + const wxDataViewItem &WXUNUSED(item), + unsigned int WXUNUSED(col) ) { wxLogMessage( wxT("MyCustomRenderer LeftClick( %d, %d )"), cursor.x, cursor.y ); return false; @@ -611,110 +186,34 @@ private: long m_height; }; -// ------------------------------------- -// MyApp -// ------------------------------------- - -class MyApp: public wxApp -{ -public: - bool OnInit(void); - int OnExit(); -}; - -// ------------------------------------- -// MyFrame -// ------------------------------------- - -class MyFrame : public wxFrame -{ -public: - MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h); - ~MyFrame(); - -public: - void OnQuit(wxCommandEvent& event); - void OnAbout(wxCommandEvent& event); - - void OnAddMozart(wxCommandEvent& event); - void OnDeleteMusic(wxCommandEvent& event); - void OnDeleteYear(wxCommandEvent& event); - void OnSelectNinth(wxCommandEvent& event); - - void OnPrependList(wxCommandEvent& event); - void OnDeleteList(wxCommandEvent& event); - - void OnValueChanged( wxDataViewEvent &event ); - - void OnActivated( wxDataViewEvent &event ); - void OnExpanding( wxDataViewEvent &event ); - void OnExpanded( wxDataViewEvent &event ); - void OnCollapsing( wxDataViewEvent &event ); - void OnCollapsed( wxDataViewEvent &event ); - void OnSelectionChanged( wxDataViewEvent &event ); - - void OnEditingStarted( wxDataViewEvent &event ); - void OnEditingDone( wxDataViewEvent &event ); - void OnHeaderClick( wxDataViewEvent &event ); - void OnHeaderRightClick( wxDataViewEvent &event ); - void OnSorted( wxDataViewEvent &event ); - - void OnContextMenu( wxDataViewEvent &event ); - - void OnRightClick( wxMouseEvent &event ); - void OnGoto( wxCommandEvent &event); - void OnAddMany( wxCommandEvent &event); +// ============================================================================ +// implementation +// ============================================================================ - void OnBeginDrag( wxDataViewEvent &event ); - void OnDropPossible( wxDataViewEvent &event ); - void OnDrop( wxDataViewEvent &event ); - -private: - wxDataViewCtrl* m_musicCtrl; - wxObjectDataPtr m_music_model; - - wxDataViewCtrl* m_listCtrl; - wxObjectDataPtr m_list_model; - - wxDataViewColumn * m_col; - - wxTextCtrl * m_log; - wxLog *m_logOld; - -private: - DECLARE_EVENT_TABLE() -}; - -// ------------------------------------- +// ---------------------------------------------------------------------------- // MyApp -// ------------------------------------- +// ---------------------------------------------------------------------------- IMPLEMENT_APP(MyApp) -bool MyApp::OnInit(void) +bool MyApp::OnInit() { if ( !wxApp::OnInit() ) return false; - // build the first frame MyFrame *frame = - new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 40, 40, 1000, 540); - frame->Show(true); - + new MyFrame(NULL, wxT("wxDataViewCtrl sample"), 40, 40, 1000, 540); SetTopWindow(frame); - return true; -} -int MyApp::OnExit() -{ - return 0; + frame->Show(true); + return true; } -// ------------------------------------- +// ---------------------------------------------------------------------------- // MyFrame -// ------------------------------------- +// ---------------------------------------------------------------------------- enum { @@ -780,7 +279,9 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int SetIcon(wxICON(sample)); - // build the menus: + + // build the menus + // ---------------- wxMenu *file_menu = new wxMenu; file_menu->Append(ID_ABOUT, wxT("&About")); @@ -793,151 +294,203 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int SetMenuBar(menu_bar); CreateStatusBar(); - wxPanel *panel = new wxPanel( this, -1 ); - - wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer *data_sizer = new wxBoxSizer( wxHORIZONTAL ); + // first page of the notebook + // -------------------------- + + m_notebook = new wxNotebook( this, wxID_ANY ); - // MyMusic + wxPanel *firstPanel = new wxPanel( m_notebook, wxID_ANY ); + m_myMusicModelViewCtrl = + new wxDataViewCtrl( firstPanel, ID_MUSIC_CTRL, wxDefaultPosition, + wxDefaultSize, wxDV_MULTIPLE|wxDV_VARIABLE_LINE_HEIGHT ); - m_musicCtrl = new wxDataViewCtrl( panel, ID_MUSIC_CTRL, wxDefaultPosition, - wxSize(400,200), wxDV_MULTIPLE|wxDV_VARIABLE_LINE_HEIGHT ); + m_music_model = new MyMusicTreeModel; + m_myMusicModelViewCtrl->AssociateModel( m_music_model.get() ); - m_music_model = new MyMusicModel; - m_musicCtrl->AssociateModel( m_music_model.get() ); + m_myMusicModelViewCtrl->EnableDragSource( wxDF_UNICODETEXT ); + m_myMusicModelViewCtrl->EnableDropTarget( wxDF_UNICODETEXT ); - m_musicCtrl->EnableDragSource( wxDF_UNICODETEXT ); - m_musicCtrl->EnableDropTarget( wxDF_UNICODETEXT ); + // column 0 of the view control: - wxDataViewTextRenderer *tr = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_INERT ); - wxDataViewColumn *column0 = new wxDataViewColumn( wxT("title"), tr, 0, 200, wxALIGN_LEFT, - wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_RESIZABLE ); - m_musicCtrl->AppendColumn( column0 ); + wxDataViewTextRenderer *tr = + new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_INERT ); + wxDataViewColumn *column0 = + new wxDataViewColumn( wxT("title"), tr, 0, 200, wxALIGN_LEFT, + wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_RESIZABLE ); + m_myMusicModelViewCtrl->AppendColumn( column0 ); #if 0 // Call this and sorting is enabled // immediatly upon start up. column0->SetAsSortKey(); #endif + // column 1 of the view control: + tr = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE ); - wxDataViewColumn *column1 = new wxDataViewColumn( wxT("artist"), tr, 1, 150, wxALIGN_LEFT, - wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE ); + wxDataViewColumn *column1 = + new wxDataViewColumn( wxT("artist"), tr, 1, 150, wxALIGN_LEFT, + wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE | + wxDATAVIEW_COL_RESIZABLE ); column1->SetMinWidth(150); // this column can't be resized to be smaller - m_musicCtrl->AppendColumn( column1 ); + m_myMusicModelViewCtrl->AppendColumn( column1 ); + + // column 2 of the view control: - wxDataViewSpinRenderer *sr = new wxDataViewSpinRenderer( 0, 2010, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT ); - wxDataViewColumn *column2 = new wxDataViewColumn( wxT("year"), sr, 2, 60, wxALIGN_LEFT, - wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE ); - m_musicCtrl->AppendColumn( column2 ); + wxDataViewSpinRenderer *sr = + new wxDataViewSpinRenderer( 0, 2010, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT ); + wxDataViewColumn *column2 = + new wxDataViewColumn( wxT("year"), sr, 2, 60, wxALIGN_LEFT, + wxDATAVIEW_COL_SORTABLE | wxDATAVIEW_COL_REORDERABLE ); + m_myMusicModelViewCtrl->AppendColumn( column2 ); + + // column 3 of the view control: wxArrayString choices; choices.Add( "good" ); choices.Add( "bad" ); choices.Add( "lousy" ); - wxDataViewChoiceRenderer *c = new wxDataViewChoiceRenderer( choices, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT ); - wxDataViewColumn *column3 = new wxDataViewColumn( wxT("rating"), c, 3, 100, wxALIGN_LEFT, - wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE ); - m_musicCtrl->AppendColumn( column3 ); + wxDataViewChoiceRenderer *c = + new wxDataViewChoiceRenderer( choices, wxDATAVIEW_CELL_EDITABLE, wxALIGN_RIGHT ); + wxDataViewColumn *column3 = + new wxDataViewColumn( wxT("rating"), c, 3, 100, wxALIGN_LEFT, + wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE ); + m_myMusicModelViewCtrl->AppendColumn( column3 ); + + // column 4 of the view control: - m_musicCtrl->AppendProgressColumn( wxT("popularity"), 4, wxDATAVIEW_CELL_INERT, 80 ); + m_myMusicModelViewCtrl->AppendProgressColumn( wxT("popularity"), 4, wxDATAVIEW_CELL_INERT, 80 ); + + // column 5 of the view control: MyCustomRenderer *cr = new MyCustomRenderer( wxDATAVIEW_CELL_ACTIVATABLE, wxALIGN_RIGHT ); - wxDataViewColumn *column4 = new wxDataViewColumn( wxT("custom"), cr, 5, -1, wxALIGN_LEFT, - wxDATAVIEW_COL_RESIZABLE ); - m_musicCtrl->AppendColumn( column4 ); + wxDataViewColumn *column5 = + new wxDataViewColumn( wxT("custom"), cr, 5, -1, wxALIGN_LEFT, + wxDATAVIEW_COL_RESIZABLE ); + m_myMusicModelViewCtrl->AppendColumn( column5 ); - data_sizer->Add( m_musicCtrl, 3, wxGROW ); + // complete this page: - // MyList + wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL ); + button_sizer->Add( new wxButton( firstPanel, ID_ADD_MOZART, _("Add Mozart")), 0, wxALL, 10 ); + button_sizer->Add( new wxButton( firstPanel, ID_DELETE_MUSIC,_("Delete selected")), 0, wxALL, 10 ); + button_sizer->Add( new wxButton( firstPanel, ID_DELETE_YEAR, _("Delete \"Year\" column")), 0, wxALL, 10 ); + button_sizer->Add( new wxButton( firstPanel, ID_SELECT_NINTH,_("Select Ninth")), 0, wxALL, 10 ); - m_listCtrl = new wxDataViewCtrl( panel, wxID_ANY, wxDefaultPosition, - wxSize(400,200), wxDV_MULTIPLE | wxDV_ROW_LINES); + wxSizer *firstPanelSz = new wxBoxSizer( wxVERTICAL ); + m_myMusicModelViewCtrl->SetMinSize(wxSize(-1, 200)); + firstPanelSz->Add(m_myMusicModelViewCtrl, 1, wxGROW|wxALL, 5); + firstPanelSz->Add(button_sizer); + firstPanel->SetSizerAndFit(firstPanelSz); - m_list_model = new MyListModel; - m_listCtrl->AssociateModel( m_list_model.get() ); -#if 1 - m_listCtrl->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE, 120 ); - m_listCtrl->AppendIconTextColumn(wxIcon(small1_xpm), 1, wxDATAVIEW_CELL_INERT )->SetTitle( wxT("icon") ); -#else - m_listCtrl->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE ); - m_listCtrl->AppendIconTextColumn(wxT("icon"), 1, wxDATAVIEW_CELL_INERT ); -#endif + // second page of the notebook + // --------------------------- - wxDataViewTextRendererAttr *ra = new wxDataViewTextRendererAttr; - wxDataViewColumn *column5 = new wxDataViewColumn(wxT("attributes"), ra, 2 ); - m_listCtrl->AppendColumn( column5 ); + wxPanel *secondPanel = new wxPanel( m_notebook, wxID_ANY ); - data_sizer->Add( m_listCtrl, 2, wxGROW ); + m_myListModelViewCtrl = new wxDataViewCtrl( secondPanel, wxID_ANY, wxDefaultPosition, + wxDefaultSize, wxDV_MULTIPLE | wxDV_ROW_LINES); - main_sizer->Add( data_sizer, 2, wxGROW ); + m_list_model = new MyListModel; + m_myListModelViewCtrl->AssociateModel( m_list_model.get() ); - wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL ); + // the various columns +#if 1 + m_myListModelViewCtrl->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE, 120 ); + m_myListModelViewCtrl->AppendIconTextColumn(wxIcon(wx_small_xpm), 1, wxDATAVIEW_CELL_INERT )->SetTitle( wxT("icon") ); +#else + m_myListModelViewCtrl->AppendTextColumn (wxT("editable string"), 0, wxDATAVIEW_CELL_EDITABLE ); + m_myListModelViewCtrl->AppendIconTextColumn(wxT("icon"), 1, wxDATAVIEW_CELL_INERT ); +#endif + m_myListModelViewCtrl->AppendColumn( + new wxDataViewColumn(wxT("attributes"), new wxDataViewTextRendererAttr, 2 )); - button_sizer->Add( new wxButton( panel, ID_ADD_MOZART, _("Add Mozart")), 0, wxALL, 10 ); - button_sizer->Add( new wxButton( panel, ID_DELETE_MUSIC,_("Delete selected")), 0, wxALL, 10 ); - button_sizer->Add( new wxButton( panel, ID_DELETE_YEAR, _("Delete \"Year\" column")), 0, wxALL, 10 ); - button_sizer->Add( new wxButton( panel, ID_SELECT_NINTH, _("Select Ninth")), 0, wxALL, 10 ); - button_sizer->Add( 10, 10, 1 ); - wxFlexGridSizer *grid_sizer = new wxFlexGridSizer( 2, 2 ); - grid_sizer->Add( new wxButton( panel, ID_PREPEND_LIST,_("Prepend")), 0, wxALL, 2 ); - grid_sizer->Add( new wxButton( panel, ID_DELETE_LIST, _("Delete selected")), 0, wxALL, 2 ); - grid_sizer->Add( new wxButton( panel, ID_GOTO, _("Goto 50")), 0, wxALL, 2 ); - grid_sizer->Add( new wxButton( panel, ID_ADD_MANY, _("Add 1000")), 0, wxALL, 2 ); - button_sizer->Add( grid_sizer, 0, wxALL, 10 ); + // complete this page: - main_sizer->Add( button_sizer, 0, wxGROW, 0 ); + wxBoxSizer *button_sizer2 = new wxBoxSizer( wxHORIZONTAL ); + button_sizer2->Add( new wxButton( secondPanel, ID_PREPEND_LIST,_("Prepend")), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_DELETE_LIST, _("Delete selected")), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_GOTO, _("Goto 50")), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_ADD_MANY, _("Add 1000")), 0, wxALL, 10 ); - wxBoxSizer *bottom_sizer = new wxBoxSizer( wxHORIZONTAL ); + wxSizer *secondPanelSz = new wxBoxSizer( wxVERTICAL ); + secondPanelSz->Add(m_myListModelViewCtrl, 1, wxGROW|wxALL, 5); + secondPanelSz->Add(button_sizer2); + secondPanel->SetSizerAndFit(secondPanelSz); - m_log = new wxTextCtrl( panel, -1, wxString(), wxDefaultPosition, wxSize(100,200), wxTE_MULTILINE ); - m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log)); - wxLogMessage(_("This is the log window")); - bottom_sizer->Add( m_log, 1, wxGROW ); - // wxDataViewListCtrl + // third page of the notebook + // --------------------------- - wxDataViewListCtrl *listctrl = new wxDataViewListCtrl( panel, -1, - wxDefaultPosition, wxSize(100,200) ); + wxPanel *thirdPanel = new wxPanel( m_notebook, wxID_ANY ); - listctrl->AppendToggleColumn( wxT("Toggle") ); - listctrl->AppendTextColumn( wxT("Text") ); + m_listctrl = new wxDataViewListCtrl( thirdPanel, wxID_ANY ); + m_listctrl->AppendToggleColumn( wxT("Toggle") ); + m_listctrl->AppendTextColumn( wxT("Text") ); wxVector data; data.push_back( true ); data.push_back( "row 1" ); - listctrl->AppendItem( data ); + m_listctrl->AppendItem( data ); data.clear(); data.push_back( false ); data.push_back( "row 3" ); - listctrl->AppendItem( data ); + m_listctrl->AppendItem( data ); + + // complete this page: - bottom_sizer->Add( listctrl, 1 ); + wxSizer *thirdPanelSz = new wxBoxSizer( wxVERTICAL ); + thirdPanelSz->Add(m_listctrl, 1, wxGROW|wxALL, 5); + thirdPanel->SetSizerAndFit(thirdPanelSz); - // wxDataViewTreeCtrl + // fourth page of the notebook + // --------------------------- + + wxPanel *fourthPanel = new wxPanel( m_notebook, wxID_ANY ); - wxDataViewTreeCtrl *treectrl2 = new wxDataViewTreeCtrl( panel, -1, wxDefaultPosition, wxSize(100,200) ); + m_treectrl = new wxDataViewTreeCtrl( fourthPanel, wxID_ANY ); wxImageList *ilist = new wxImageList( 16, 16 ); - ilist->Add( wxIcon(small1_xpm) ); - treectrl2->SetImageList( ilist ); + ilist->Add( wxIcon(wx_small_xpm) ); + m_treectrl->SetImageList( ilist ); + + wxDataViewItem parent2 = m_treectrl->AppendContainer( wxDataViewItem(0),wxT("Root 1"), 0 ); + m_treectrl->AppendItem( parent2, wxT("Child 1"), 0 ); + m_treectrl->AppendItem( parent2, wxT("Child 2"), 0 ); + m_treectrl->AppendItem( parent2, wxT("Child 3, very long, long, long, long"), 0 ); + + // complete this page: - wxDataViewItem parent2 = treectrl2->AppendContainer( wxDataViewItem(0),wxT("Root 1"), 0 ); - treectrl2->AppendItem( parent2, wxT("Child 1"), 0 ); - treectrl2->AppendItem( parent2, wxT("Child 2"), 0 ); - treectrl2->AppendItem( parent2, wxT("Child 3, very long, long, long, long"), 0 ); + wxSizer *fourthPanelSz = new wxBoxSizer( wxVERTICAL ); + fourthPanelSz->Add(m_treectrl, 1, wxGROW|wxALL, 5); + fourthPanel->SetSizerAndFit(fourthPanelSz); - bottom_sizer->Add( treectrl2, 1 ); - // main sizer + + // complete GUI + // ------------ + + m_notebook->AddPage(firstPanel, "MyMusicTreeModel"); + m_notebook->AddPage(secondPanel, "MyListModel"); + m_notebook->AddPage(thirdPanel, "wxDataViewListCtrl"); + m_notebook->AddPage(fourthPanel, "wxDataViewTreeCtrl"); + + wxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); + + m_log = new wxTextCtrl( this, wxID_ANY, wxString(), wxDefaultPosition, + wxDefaultSize, wxTE_MULTILINE ); + m_log->SetMinSize(wxSize(-1, 100)); + m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_log)); + wxLogMessage(_("This is the log window")); - main_sizer->Add( bottom_sizer, 0, wxGROW ); + mainSizer->Add( m_notebook, 1, wxGROW ); + mainSizer->Add( m_log, 0, wxGROW ); - panel->SetSizer( main_sizer ); + SetSizerAndFit(mainSizer); } MyFrame::~MyFrame() @@ -958,7 +511,7 @@ void MyFrame::OnAddMozart(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) ) { wxDataViewItemArray items; - int len = m_musicCtrl->GetSelections( items ); + int len = m_myMusicModelViewCtrl->GetSelections( items ); for( int i = 0; i < len; i ++ ) if (items[i].IsOk()) m_music_model->Delete( items[i] ); @@ -966,13 +519,13 @@ void MyFrame::OnDeleteMusic(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnDeleteYear( wxCommandEvent& WXUNUSED(event) ) { - m_musicCtrl->DeleteColumn( m_musicCtrl->GetColumn( 2 ) ); + m_myMusicModelViewCtrl->DeleteColumn( m_myMusicModelViewCtrl->GetColumn( 2 ) ); FindWindow( ID_DELETE_YEAR )->Disable(); } void MyFrame::OnSelectNinth( wxCommandEvent& WXUNUSED(event) ) { - m_musicCtrl->Select( m_music_model->GetNinthItem() ); + m_myMusicModelViewCtrl->Select( m_music_model->GetNinthItem() ); } void MyFrame::OnPrependList( wxCommandEvent& WXUNUSED(event) ) @@ -983,7 +536,7 @@ void MyFrame::OnPrependList( wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnDeleteList( wxCommandEvent& WXUNUSED(event) ) { wxDataViewItemArray items; - int len = m_listCtrl->GetSelections( items ); + int len = m_myListModelViewCtrl->GetSelections( items ); if (len > 0) m_list_model->DeleteItems( items ); } @@ -993,7 +546,8 @@ void MyFrame::OnValueChanged( wxDataViewEvent &event ) if (!m_log) return; - wxLogMessage( wxT("EVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %d; Column: %d"), event.GetItem().GetID(), event.GetColumn() ); + wxLogMessage( wxT("EVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %d; Column: %d"), + event.GetItem().GetID(), event.GetColumn() ); } void MyFrame::OnActivated( wxDataViewEvent &event ) @@ -1004,7 +558,7 @@ void MyFrame::OnActivated( wxDataViewEvent &event ) wxString title = m_music_model->GetTitle( event.GetItem() ); wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, Item: %s"), title ); - if (m_musicCtrl->IsExpanded( event.GetItem() )) + if (m_myMusicModelViewCtrl->IsExpanded( event.GetItem() )) wxLogMessage(wxT("Item: %s is expanded"), title ); } @@ -1088,9 +642,10 @@ void MyFrame::OnContextMenu( wxDataViewEvent &event ) menu.Append( 2, wxT("entry 2") ); menu.Append( 3, wxT("entry 3") ); - m_musicCtrl->PopupMenu(&menu); + m_myMusicModelViewCtrl->PopupMenu(&menu); -// wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s Value: %s"),title.GetData(), event.GetValue().GetString()); +// wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, Item: %s Value: %s"), +// title.GetData(), event.GetValue().GetString()); } void MyFrame::OnHeaderClick( wxDataViewEvent &event ) @@ -1102,7 +657,7 @@ void MyFrame::OnHeaderClick( wxDataViewEvent &event ) if(!m_log) return; - int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() ); + int pos = m_myMusicModelViewCtrl->GetColumnPosition( event.GetDataViewColumn() ); wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d"), pos ); } @@ -1112,7 +667,7 @@ void MyFrame::OnHeaderRightClick( wxDataViewEvent &event ) if(!m_log) return; - int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() ); + int pos = m_myMusicModelViewCtrl->GetColumnPosition( event.GetDataViewColumn() ); wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d"), pos ); } @@ -1122,7 +677,7 @@ void MyFrame::OnSorted( wxDataViewEvent &event ) if(!m_log) return; - int pos = m_musicCtrl->GetColumnPosition( event.GetDataViewColumn() ); + int pos = m_myMusicModelViewCtrl->GetColumnPosition( event.GetDataViewColumn() ); wxLogMessage(wxT("wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, Column position: %d"), pos ); } @@ -1132,13 +687,14 @@ void MyFrame::OnRightClick( wxMouseEvent &event ) if(!m_log) return; - wxLogMessage(wxT("wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d"), event.GetX(), event.GetY()); + wxLogMessage(wxT("wxEVT_MOUSE_RIGHT_UP, Click Point is X: %d, Y: %d"), + event.GetX(), event.GetY()); } void MyFrame::OnGoto(wxCommandEvent& WXUNUSED(event)) { wxDataViewItem item = m_list_model->GetItem( 50 ); - m_listCtrl->EnsureVisible(item,m_col); + m_myListModelViewCtrl->EnsureVisible(item,m_col); } void MyFrame::OnAddMany(wxCommandEvent& WXUNUSED(event)) @@ -1153,6 +709,8 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) info.SetName(_("DataView sample")); info.SetDescription(_("This sample demonstrates wxDataViewCtrl")); info.SetCopyright(_T("(C) 2007-2009 Robert Roebling")); + info.AddDeveloper("Robert Roebling"); + info.AddDeveloper("Francesco Montorsi"); wxAboutBox(info); } @@ -1168,7 +726,7 @@ void MyFrame::OnBeginDrag( wxDataViewEvent &event ) return; } - MyMusicModelNode *node = (MyMusicModelNode*) item.GetID(); + MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) item.GetID(); wxTextDataObject *obj = new wxTextDataObject; obj->SetText( node->m_title ); event.SetDataObject( obj ); diff --git a/samples/dataview/dataview.dsp b/samples/dataview/dataview.dsp index 039e9e4843..afa902e0a5 100644 --- a/samples/dataview/dataview.dsp +++ b/samples/dataview/dataview.dsp @@ -256,9 +256,21 @@ SOURCE=.\dataview.cpp # End Source File # Begin Source File +SOURCE=.\mymodels.cpp +# End Source File +# Begin Source File + SOURCE=.\..\sample.rc # End Source File # End Group +# Begin Group "Header Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\mymodels.h +# End Source File +# End Group # End Target # End Project diff --git a/samples/dataview/dataview_vc7.vcproj b/samples/dataview/dataview_vc7.vcproj index e0db13f603..d43bce48da 100644 --- a/samples/dataview/dataview_vc7.vcproj +++ b/samples/dataview/dataview_vc7.vcproj @@ -528,6 +528,17 @@ + + + + + + + + + + + + + + + + + + Append( m_pop ); + m_pop->Append( new MyMusicTreeModelNode( m_pop, + wxT("You are not alone"), wxT("Michael Jackson"), 1995 ) ); + m_pop->Append( new MyMusicTreeModelNode( m_pop, + wxT("Take a bow"), wxT("Madonna"), 1994 ) ); + m_classical = new MyMusicTreeModelNode( m_root, wxT("Classical music") ); + m_root->Append( m_classical ); + m_ninth = new MyMusicTreeModelNode( m_classical, + wxT("Ninth symphony"), wxT("Ludwig van Beethoven"), 1824 ); + m_classical->Append( m_ninth ); + m_classical->Append( new MyMusicTreeModelNode( m_classical, + wxT("German Requiem"), wxT("Johannes Brahms"), 1868 ) ); + m_classicalMusicIsKnownToControl = false; +} + +wxString MyMusicTreeModel::GetTitle( const wxDataViewItem &item ) const +{ + MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) item.GetID(); + if (!node) + return wxEmptyString; + + return node->m_title; +} + +int MyMusicTreeModel::GetYear( const wxDataViewItem &item ) const +{ + MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) item.GetID(); + if (!node) + return 2000; + + return node->m_year; +} + +void MyMusicTreeModel::AddToClassical( const wxString &title, const wxString &artist, int year ) +{ + // add to data + MyMusicTreeModelNode *child_node = + new MyMusicTreeModelNode( m_classical, title, artist, year ); + + m_classical->Append( child_node ); + + if (m_classicalMusicIsKnownToControl) + { + // notify control + wxDataViewItem child( (void*) child_node ); + wxDataViewItem parent( (void*) m_classical ); + ItemAdded( parent, child ); + } +} + +void MyMusicTreeModel::Delete( const wxDataViewItem &item ) +{ + MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) item.GetID(); + wxDataViewItem parent( node->GetParent() ); + + node->GetParent()->GetChildren().Remove( node ); + delete node; + + // notify control + ItemDeleted( parent, item ); +} + +int MyMusicTreeModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, + unsigned int column, bool ascending ) +{ + if (IsContainer(item1) && IsContainer(item2)) + { + wxVariant value1,value2; + GetValue( value1, item1, 0 ); + GetValue( value2, item2, 0 ); + + wxString str1 = value1.GetString(); + wxString str2 = value2.GetString(); + int res = str1.Cmp( str2 ); + if (res) return res; + + // items must be different + wxUIntPtr litem1 = (wxUIntPtr) item1.GetID(); + wxUIntPtr litem2 = (wxUIntPtr) item2.GetID(); + + return litem1-litem2; + } + + return wxDataViewModel::Compare( item1, item2, column, ascending ); +} + +void MyMusicTreeModel::GetValue( wxVariant &variant, + const wxDataViewItem &item, unsigned int col ) const +{ + MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) item.GetID(); + switch (col) + { + case 0: variant = node->m_title; break; + case 1: variant = node->m_artist; break; + case 2: variant = (long) node->m_year; break; + case 3: variant = node->m_quality; break; + case 4: + // wxMac doesn't conceal the popularity progress renderer, return 0 for containers + if (IsContainer(item)) + variant = (long) 0; + else + variant = (long) 80; // all music is very 80% popular + break; + case 5: + // Make size of red square depend on year + if (GetYear(item) < 1900) + variant = (long) 35; + else + variant = (long) 25; + break; + default: + { + wxLogError( wxT("MyMusicTreeModel::GetValue: wrong column %d"), col ); + + // provoke a crash when mouse button down + wxMouseState state = wxGetMouseState(); + if (state.ShiftDown()) + { + char *crash = 0; + *crash = 0; + } + } + } +} + +bool MyMusicTreeModel::SetValue( const wxVariant &variant, + const wxDataViewItem &item, unsigned int col ) +{ + MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) item.GetID(); + switch (col) + { + case 0: node->m_title = variant.GetString(); return true; + case 1: node->m_artist = variant.GetString(); return true; + case 2: node->m_year = variant.GetLong(); return true; + case 3: node->m_quality = variant.GetString(); return true; + default: wxLogError( wxT("MyMusicTreeModel::SetValue: wrong column") ); + } + return false; +} + +wxDataViewItem MyMusicTreeModel::GetParent( const wxDataViewItem &item ) const +{ + // the invisble root node has no parent + if (!item.IsOk()) + return wxDataViewItem(0); + + MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) item.GetID(); + + // "MyMusic" also has no parent + if (node == m_root) + return wxDataViewItem(0); + + return wxDataViewItem( (void*) node->GetParent() ); +} + +bool MyMusicTreeModel::IsContainer( const wxDataViewItem &item ) const +{ + // the invisble root node can have children (in + // our model always "MyMusic") + if (!item.IsOk()) + return true; + + MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) item.GetID(); + return node->IsContainer(); +} + +unsigned int MyMusicTreeModel::GetChildren( const wxDataViewItem &parent, wxDataViewItemArray &array ) const +{ + MyMusicTreeModelNode *node = (MyMusicTreeModelNode*) parent.GetID(); + if (!node) + { + array.Add( wxDataViewItem( (void*) m_root ) ); + return 1; + } + + if (node == m_classical) + { + MyMusicTreeModel *model = (MyMusicTreeModel*)(const MyMusicTreeModel*) this; + model->m_classicalMusicIsKnownToControl = true; + } + + if (node->GetChildCount() == 0) + { + return 0; + } + + unsigned int count = node->GetChildren().GetCount(); + unsigned int pos; + for (pos = 0; pos < count; pos++) + { + MyMusicTreeModelNode *child = node->GetChildren().Item( pos ); + array.Add( wxDataViewItem( (void*) child ) ); + } + return count; +} + + + +// ---------------------------------------------------------------------------- +// MyListModel +// ---------------------------------------------------------------------------- + +static int my_sort_reverse( int *v1, int *v2 ) +{ + return *v2-*v1; +} + +static int my_sort( int *v1, int *v2 ) +{ + return *v1-*v2; +} + +MyListModel::MyListModel() : +#ifdef __WXMAC__ + wxDataViewVirtualListModel( 1000 + 100 ) +#else + wxDataViewVirtualListModel( 100000 + 100 ) +#endif +{ +#ifdef __WXMAC__ + m_virtualItems = 1000; +#else + m_virtualItems = 100000; +#endif + + unsigned int i; + for (i = 0; i < 100; i++) + { + wxString str; + str.Printf( wxT("row number %d"), i ); + m_array.Add( str ); + } + + m_icon = wxIcon( null_xpm ); +} + +void MyListModel::Prepend( const wxString &text ) +{ + m_array.Insert( text, 0 ); + RowPrepended(); +} + +void MyListModel::DeleteItem( const wxDataViewItem &item ) +{ + unsigned int row = GetRow( item ); + if (row >= m_array.GetCount()) + return; + + m_array.RemoveAt( row ); + RowDeleted( row ); +} + +void MyListModel::DeleteItems( const wxDataViewItemArray &items ) +{ + wxArrayInt rows; + unsigned int i; + for (i = 0; i < items.GetCount(); i++) + { + unsigned int row = GetRow( items[i] ); + if (row < m_array.GetCount()) + rows.Add( row ); + } + + // Sort in descending order so that the last + // row will be deleted first. Otherwise the + // remaining indeces would all be wrong. + rows.Sort( my_sort_reverse ); + for (i = 0; i < rows.GetCount(); i++) + m_array.RemoveAt( rows[i] ); + + // This is just to test if wxDataViewCtrl can + // cope with removing rows not sorted in + // descending order + rows.Sort( my_sort ); + RowsDeleted( rows ); +} + +void MyListModel::AddMany() +{ + m_virtualItems += 1000; + Reset( m_array.GetCount() + m_virtualItems ); +} + +void MyListModel::GetValueByRow( wxVariant &variant, + unsigned int row, unsigned int col ) const +{ + if (col==0) + { + if (row >= m_array.GetCount()) + { + wxString str; + str.Printf(wxT("row %d"), row - m_array.GetCount() ); + variant = str; + } + else + { + variant = m_array[ row ]; + } + } else + if (col==1) + { + wxDataViewIconText data( wxT("test"), m_icon ); + variant << data; + } else + if (col==2) + { + if (row >= m_array.GetCount()) + variant = wxT("plain"); + else + variant = wxT("blue"); + } +} + +bool MyListModel::GetAttrByRow( unsigned int row, unsigned int col, wxDataViewItemAttr &attr ) +{ + if (col != 2) + return false; + + if (row < m_array.GetCount()) + { + attr.SetColour( *wxBLUE ); + attr.SetItalic( true ); + } + + return true; +} + +bool MyListModel::SetValueByRow( const wxVariant &variant, + unsigned int row, unsigned int col ) +{ + if (col == 0) + { + if (row >= m_array.GetCount()) + return false; + + m_array[row] = variant.GetString(); + return true; + } + + return false; +} diff --git a/samples/dataview/mymodels.h b/samples/dataview/mymodels.h new file mode 100644 index 0000000000..2591c86e71 --- /dev/null +++ b/samples/dataview/mymodels.h @@ -0,0 +1,199 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: mymodels.h +// Purpose: wxDataViewCtrl wxWidgets sample +// Author: Robert Roebling +// Modified by: Francesco Montorsi, Bo Yang +// Created: 06/01/06 +// RCS-ID: $Id$ +// Copyright: (c) Robert Roebling +// Licence: wxWindows license +///////////////////////////////////////////////////////////////////////////// + + +// ---------------------------------------------------------------------------- +// MyMusicTreeModel +// ---------------------------------------------------------------------------- + +/* +Implement this data model + Title Artist Year Judgement +-------------------------------------------------------------------------- +1: My Music: + 2: Pop music + 3: You are not alone Michael Jackson 1995 good + 4: Take a bow Madonna 1994 good + 5: Classical music + 6: Ninth Symphony Ludwig v. Beethoven 1824 good + 7: German Requiem Johannes Brahms 1868 good +*/ + +class MyMusicTreeModelNode; +WX_DEFINE_ARRAY_PTR( MyMusicTreeModelNode*, MyMusicTreeModelNodes ); + +class MyMusicTreeModelNode +{ +public: + MyMusicTreeModelNode( MyMusicTreeModelNode* parent, + const wxString &title, const wxString &artist, int year ) + { + m_parent = parent; + m_title = title; + m_artist = artist; + m_year = year; + m_quality = "good"; + m_isContainer = false; + } + + MyMusicTreeModelNode( MyMusicTreeModelNode* parent, + const wxString &branch ) + { + m_parent = parent; + m_title = branch; + m_year = -1; + m_isContainer = true; + } + + ~MyMusicTreeModelNode() + { + size_t count = m_children.GetCount(); + size_t i; + for (i = 0; i < count; i++) + { + MyMusicTreeModelNode *child = m_children[i]; + delete child; + } + } + + bool IsContainer() { return m_isContainer; } + + MyMusicTreeModelNode* GetParent() { return m_parent; } + MyMusicTreeModelNodes &GetChildren() { return m_children; } + MyMusicTreeModelNode* GetNthChild( unsigned int n ) { return m_children.Item( n ); } + void Insert( MyMusicTreeModelNode* child, unsigned int n) { m_children.Insert( child, n); } + void Append( MyMusicTreeModelNode* child ) { m_children.Add( child ); } + unsigned int GetChildCount() { return m_children.GetCount(); } + +public: + wxString m_title; + wxString m_artist; + int m_year; + wxString m_quality; + +private: + MyMusicTreeModelNode *m_parent; + MyMusicTreeModelNodes m_children; + bool m_isContainer; +}; + +class MyMusicTreeModel: public wxDataViewModel +{ +public: + MyMusicTreeModel(); + ~MyMusicTreeModel() + { + delete m_root; + } + + // helper method for wxLog + + wxString GetTitle( const wxDataViewItem &item ) const; + int GetYear( const wxDataViewItem &item ) const; + + // helper methods to change the model + + void AddToClassical( const wxString &title, const wxString &artist, int year ); + void Delete( const wxDataViewItem &item ); + + // override sorting to always sort branches ascendingly + + int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, + unsigned int column, bool ascending ); + + // implementation of base class virtuals to define model + + virtual unsigned int GetColumnCount() const + { + return 6; + } + + virtual wxString GetColumnType( unsigned int col ) const + { + if (col == 2) + return wxT("long"); + + return wxT("string"); + } + + virtual void GetValue( wxVariant &variant, + const wxDataViewItem &item, unsigned int col ) const; + virtual bool SetValue( const wxVariant &variant, + const wxDataViewItem &item, unsigned int col ); + + virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const; + virtual bool IsContainer( const wxDataViewItem &item ) const; + virtual unsigned int GetChildren( const wxDataViewItem &parent, + wxDataViewItemArray &array ) const; + + wxDataViewItem GetNinthItem() const + { + return wxDataViewItem( m_ninth ); + } + +private: + MyMusicTreeModelNode* m_root; + MyMusicTreeModelNode* m_pop; + MyMusicTreeModelNode* m_classical; + MyMusicTreeModelNode* m_ninth; + bool m_classicalMusicIsKnownToControl; +}; + + +// ---------------------------------------------------------------------------- +// MyListModel +// ---------------------------------------------------------------------------- + +class MyListModel: public wxDataViewVirtualListModel +{ +public: + MyListModel(); + + // helper methods to change the model + + void Prepend( const wxString &text ); + void DeleteItem( const wxDataViewItem &item ); + void DeleteItems( const wxDataViewItemArray &items ); + void AddMany(); + + + // implementation of base class virtuals to define model + + virtual unsigned int GetColumnCount() const + { + return 3; + } + + virtual wxString GetColumnType( unsigned int col ) const + { + if (col == 1) + return wxT("wxDataViewIconText"); + + return wxT("string"); + } + + virtual unsigned int GetRowCount() + { + return m_array.GetCount(); + } + + virtual void GetValueByRow( wxVariant &variant, + unsigned int row, unsigned int col ) const; + virtual bool GetAttrByRow( unsigned int row, unsigned int col, wxDataViewItemAttr &attr ); + virtual bool SetValueByRow( const wxVariant &variant, + unsigned int row, unsigned int col ); + +private: + wxArrayString m_array; + wxIcon m_icon; + int m_virtualItems; +}; + diff --git a/samples/dataview/wx_small.xpm b/samples/dataview/wx_small.xpm new file mode 100644 index 0000000000..0a8f5f25f1 --- /dev/null +++ b/samples/dataview/wx_small.xpm @@ -0,0 +1,28 @@ +/* XPM */ +static const char *wx_small_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 6 1", +". c Black", +"o c #FFFFFF", +"X c #000080", +"O c #FFFF00", +" c None", +"+ c #FF0000", +/* pixels */ +" ", +" ", +" ", +" ....... ", +" .XXXXX. ", +" .oXXXX. ", +" .oXXX.......", +".....oXXX.OOOOO.", +".+++.XXXX.oOOOO.", +".o++......oOOOO.", +".o++++. .oOOOO.", +".o++++. .OOOOO.", +".+++++. .......", +"....... ", +" ", +" " +}; \ No newline at end of file -- 2.47.2