Further sorting work using the sorting data model.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 84fe95f1752636f86ad459bf6e24411fbb85fe35..5d5544922823583f583ac10032a783d1e0e1ffa4 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -68,6 +68,7 @@ public:
     virtual bool RowDeleted( size_t row ) = 0;
     virtual bool RowChanged( size_t row ) = 0;
     virtual bool ValueChanged( size_t col, size_t row ) = 0;
     virtual bool RowDeleted( size_t row ) = 0;
     virtual bool RowChanged( size_t row ) = 0;
     virtual bool ValueChanged( size_t col, size_t row ) = 0;

+    virtual bool RowsReordered( size_t *new_order ) = 0;

     virtual bool Cleared() = 0;
     
     void SetOwner( wxDataViewListModel *owner ) { m_owner = owner; }
     virtual bool Cleared() = 0;
     
     void SetOwner( wxDataViewListModel *owner ) { m_owner = owner; }


@@ -116,6 +117,7 @@ public:
     virtual bool RowDeleted( size_t row );
     virtual bool RowChanged( size_t row );
     virtual bool ValueChanged( size_t col, size_t row );
     virtual bool RowDeleted( size_t row );
     virtual bool RowChanged( size_t row );
     virtual bool ValueChanged( size_t col, size_t row );

+    virtual bool RowsReordered( size_t *new_order );

     virtual bool Cleared();
 
     // Used internally    
     virtual bool Cleared();
 
     // Used internally    


@@ -163,13 +165,17 @@ public:
     virtual bool RowDeleted( size_t row );
     virtual bool RowChanged( size_t row );
     virtual bool ValueChanged( size_t col, size_t row );
     virtual bool RowDeleted( size_t row );
     virtual bool RowChanged( size_t row );
     virtual bool ValueChanged( size_t col, size_t row );

+    virtual bool RowsReordered( size_t *new_order );

     virtual bool Cleared();
 
     virtual bool Cleared();
 

+    bool ChildValueChanged( size_t col, size_t row );
+

     virtual void Resort();
 
 private:
     wxDataViewListModel             *m_child;
     wxDataViewSortedIndexArray       m_array;
     virtual void Resort();
 
 private:
     wxDataViewListModel             *m_child;
     wxDataViewSortedIndexArray       m_array;

+    wxDataViewListModelNotifier     *m_notifierOnChild;

 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewSortedListModel)
 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewSortedListModel)

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 28191f678901be2736afec817d8ffbad7a9fc8e6..ec05414d7e3d9227d2ca5732083023037f34be65 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -142,6 +142,22 @@ bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
     return ret;
 }
 
     return ret;
 }
 

+bool wxDataViewListModel::RowsReordered( size_t *new_order )
+{
+    bool ret = true;
+
+    wxNode *node = m_notifiers.GetFirst();
+    while (node)
+    {
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        if (!notifier->RowsReordered( new_order ))
+            ret = false;
+        node = node->GetNext();
+    }
+        
+    return ret;
+}
+

 bool wxDataViewListModel::Cleared()
 {
     bool ret = true;
 bool wxDataViewListModel::Cleared()
 {
     bool ret = true;


@@ -192,7 +208,30 @@ void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier
 }
 
 // --------------------------------------------------------- 
 }
 
 // --------------------------------------------------------- 

-// wxDataViewSortedListModel
+// wxDataViewSortedListModelNotifier
+// --------------------------------------------------------- 
+
+class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
+{
+public:
+    wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
+    { m_model = model; }
+    
+    virtual bool RowAppended() { return true; }
+    virtual bool RowPrepended()  { return true; }
+    virtual bool RowInserted( size_t before )  { return true; }
+    virtual bool RowDeleted( size_t row ) { return true; }
+    virtual bool RowChanged( size_t row ) { return true; }
+    virtual bool ValueChanged( size_t col, size_t row )
+         { return m_model->ChildValueChanged( col, row); }
+    virtual bool RowsReordered( size_t *new_order ) { return true; }
+    virtual bool Cleared() { return true; }
+    
+    wxDataViewSortedListModel *m_model;
+};
+
+// --------------------------------------------------------- 
+// wxDataViewSortedListModel compare function

 // --------------------------------------------------------- 
 
 int wxCALLBACK wxDataViewListModelSortedDefaultCompare
 // --------------------------------------------------------- 
 
 int wxCALLBACK wxDataViewListModelSortedDefaultCompare


@@ -241,6 +280,9 @@ int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 )
     return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
 }
 
     return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
 }
 

+// --------------------------------------------------------- 
+// wxDataViewSortedListModel
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
 


@@ -252,11 +294,15 @@ wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child
     s_CmpModel = child;
     s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
     
     s_CmpModel = child;
     s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
     

+    m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
+    m_child->AddNotifier( m_notifierOnChild );
+    

     Resort();    
 }
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()
 {
     Resort();    
 }
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()
 {

+    m_child->RemoveNotifier( m_notifierOnChild );

 }
 
 void wxDataViewSortedListModel::Resort()
 }
 
 void wxDataViewSortedListModel::Resort()


@@ -268,6 +314,59 @@ void wxDataViewSortedListModel::Resort()
         m_array.Add( i );
 }
 
         m_array.Add( i );
 }
 

+bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
+{
+    size_t i;
+    size_t len = m_array.GetCount();
+    
+    // Remove and readd sorted. Find out at which
+    // position it was and where it ended.
+    size_t start_pos = 0,end_pos = 0;
+    for (i = 0; i < len; i++)
+        if (m_array[i] == row)
+        {
+            start_pos = i;
+            break;
+        }
+    m_array.Remove( row );
+    m_array.Add( row );
+    for (i = 0; i < len; i++)
+        if (m_array[i] == row)
+        {
+            end_pos = i;
+            break;
+        }
+        
+    if (end_pos == start_pos)
+        return wxDataViewListModel::ValueChanged( col, start_pos );
+    
+    // Create an array where order[old] -> new_pos, so that
+    // if nothing changed order[0] -> 0 etc.
+    size_t *order = new size_t[ len ];
+    // Fill up initial values.
+    for (i = 0; i < len; i++)
+        order[i] = i;
+
+    if (start_pos < end_pos)
+    {
+        for (i = start_pos; i < end_pos; i++)
+            order[i] = order[i+1];
+        order[end_pos] = start_pos;
+    }
+    else
+    {
+        for (i = end_pos; i > start_pos; i--)
+            order[i] = order[i-1];
+        order[start_pos] = end_pos;
+    }   
+    
+    RowsReordered( order );
+    
+    delete [] order;
+    
+    return true;
+}
+

 size_t wxDataViewSortedListModel::GetNumberOfRows()
 {
     return m_child->GetNumberOfRows();
 size_t wxDataViewSortedListModel::GetNumberOfRows()
 {
     return m_child->GetNumberOfRows();


@@ -293,7 +392,9 @@ bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t
 {
     size_t child_row = m_array[row];
     bool ret = m_child->SetValue( variant, col, child_row );
 {
     size_t child_row = m_array[row];
     bool ret = m_child->SetValue( variant, col, child_row );

-    // resort in ::ValueChanged()
+    
+    // Resort in ::ChildValueChanged() which gets reported back.
+    

     return ret;
 }
 
     return ret;
 }
 


@@ -333,7 +434,8 @@ bool wxDataViewSortedListModel::RowDeleted( size_t row )
     
     bool ret = m_child->RowDeleted( child_row );
     
     
     bool ret = m_child->RowDeleted( child_row );
     

-    wxDataViewListModel::RowDeleted( row );
+    // Do nothing here as the change in the
+    // child model will be reported back.

     
     return ret;
 }
     
     return ret;
 }


@@ -343,7 +445,8 @@ bool wxDataViewSortedListModel::RowChanged( size_t row )
     size_t child_row = m_array[row];
     bool ret = m_child->RowChanged( child_row );
     
     size_t child_row = m_array[row];
     bool ret = m_child->RowChanged( child_row );
     

-    // report delete old pos, inserted new pos
+    // Do nothing here as the change in the
+    // child model will be reported back.

     
     return ret;
 }
     
     return ret;
 }


@@ -353,12 +456,19 @@ bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row )
     size_t child_row = m_array[row];
     bool ret = m_child->ValueChanged( col, child_row );
     
     size_t child_row = m_array[row];
     bool ret = m_child->ValueChanged( col, child_row );
     

-    // Do nothing if not the sorted col..
-    // report delete old pos, inserted new pos
+    // Do nothing here as the change in the
+    // child model will be reported back.

     
     return ret;
 }
 
     
     return ret;
 }
 

+bool wxDataViewSortedListModel::RowsReordered( size_t *new_order )
+{
+    // We sort them ourselves.
+
+    return false;
+}
+

 bool wxDataViewSortedListModel::Cleared()
 {
     bool ret = m_child->Cleared();
 bool wxDataViewSortedListModel::Cleared()
 {
     bool ret = m_child->Cleared();

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 72552c768c48316c7302fae112e50ad1dde9f040..6de67bf4933855ddfc150adc68b9718dcf113213 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -735,6 +735,7 @@ public:
     virtual bool RowDeleted( size_t row );
     virtual bool RowChanged( size_t row );
     virtual bool ValueChanged( size_t col, size_t row );
     virtual bool RowDeleted( size_t row );
     virtual bool RowChanged( size_t row );
     virtual bool ValueChanged( size_t col, size_t row );

+    virtual bool RowsReordered( size_t *new_order );

     virtual bool Cleared();
     
     GtkWxListStore      *m_gtk_store;
     virtual bool Cleared();
     
     GtkWxListStore      *m_gtk_store;


@@ -806,7 +807,7 @@ bool wxGtkDataViewListModelNotifier::RowChanged( size_t row )
 
 bool wxGtkDataViewListModelNotifier::ValueChanged( size_t model_col, size_t model_row )
 {
 
 bool wxGtkDataViewListModelNotifier::ValueChanged( size_t model_col, size_t model_row )
 {

-    // This adds GTK+'s missing MVC logic for SetValue
+    // This adds GTK+'s missing MVC logic for ValueChanged

     wxNode *node = GetOwner()->m_viewingColumns.GetFirst();
     while (node)
     {
     wxNode *node = GetOwner()->m_viewingColumns.GetFirst();
     while (node)
     {


@@ -835,6 +836,30 @@ bool wxGtkDataViewListModelNotifier::ValueChanged( size_t model_col, size_t mode
     return true;
 }
 
     return true;
 }
 

+bool wxGtkDataViewListModelNotifier::RowsReordered( size_t *new_order )
+{
+    // Assume sizeof(size_t)= == sizeof(gint)
+
+    GtkTreePath *path = gtk_tree_path_new ();
+    gtk_tree_model_rows_reordered (GTK_TREE_MODEL (m_gtk_store), path, NULL, (gint*)new_order);
+    gtk_tree_path_free (path);
+
+    // This adds GTK+'s missing MVC logic for RowsReordered
+    wxNode *node = GetOwner()->m_viewingColumns.GetFirst();
+    while (node)
+    {
+        wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData();
+        GtkTreeView *widget = GTK_TREE_VIEW(viewing_column->m_viewColumn->GetOwner()->m_treeview);
+        // Doesn't work yet...
+        gtk_widget_queue_draw( GTK_WIDGET(widget) ); 
+
+        node = node->GetNext();
+    }
+
+    
+    return true;
+}
+

 bool wxGtkDataViewListModelNotifier::Cleared()
 {
     return false;
 bool wxGtkDataViewListModelNotifier::Cleared()
 {
     return false;