Added display sort feature to PsppireDictView

[pspp] / src / ui / gui / dialog-common.c

diff --git a/src/ui/gui/dialog-common.c b/src/ui/gui/dialog-common.c
index 7472b5708fa99294de1a102ae541572b1669f2c2..0d32904d141434e55488b5c9ee1c59e6a79adf5a 100644 (file)
--- a/src/ui/gui/dialog-common.c
+++ b/src/ui/gui/dialog-common.c
@@ -18,11 +18,46 @@
 
 #include <libpspp/i18n.h>
 #include "dialog-common.h"
+#include "dict-display.h"
 
 #include "psppire-var-ptr.h"
 
 #include "helper.h"
 
+/* 
+   If m is not a base TreeModel type (ie, is a filter or sorter) then 
+   convert OP to a TreePath for the base and return it.
+   The return value must be freed by the caller.
+*/
+static GtkTreePath *
+get_base_tree_path (GtkTreeModel *m, GtkTreePath *op)
+{
+  GtkTreePath *p = gtk_tree_path_copy (op);
+  while ( ! PSPPIRE_IS_DICT (m))
+    {
+      GtkTreePath *oldp = p;
+      
+      if (GTK_IS_TREE_MODEL_FILTER (m))
+       {
+         p = gtk_tree_model_filter_convert_path_to_child_path (GTK_TREE_MODEL_FILTER (m), oldp);
+         m = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (m));
+       }
+      else if (GTK_IS_TREE_MODEL_SORT (m))
+       {
+         p = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (m), oldp);
+         m = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (m));
+       }
+      else
+       {
+         g_error ("Unexpected model type: %s", G_OBJECT_TYPE_NAME (m));
+       }
+      
+      gtk_tree_path_free (oldp);
+    }
+
+  return p;
+}
+
 
 /* Returns FALSE if the variables represented by the union of the rows
    currently selected by SOURCE widget, and contents of the DEST
@@ -39,7 +74,8 @@ homogeneous_types (GtkWidget *source, GtkWidget *dest)
   GtkTreeIter iter;
   gboolean retval = TRUE;
 
-  GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (source));
+  GtkTreeModel *top_model = gtk_tree_view_get_model (GTK_TREE_VIEW (source));
+  GtkTreeModel *model;
 
   PsppireDict *dict;
   GtkTreeSelection *selection;
@@ -47,10 +83,8 @@ homogeneous_types (GtkWidget *source, GtkWidget *dest)
   GList *list, *l;
   bool have_type;
 
-  while (GTK_IS_TREE_MODEL_FILTER (model))
-    {
-      model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
-    }
+
+  get_base_model (top_model, NULL, &model, NULL);
 
   dict = PSPPIRE_DICT (model);
 
@@ -62,16 +96,11 @@ homogeneous_types (GtkWidget *source, GtkWidget *dest)
   have_type = false;
   for (l = list; l ; l = l->next)
     {
-      GtkTreePath *path = l->data;
-
-      GtkTreePath *fpath =
-       gtk_tree_model_filter_convert_path_to_child_path (GTK_TREE_MODEL_FILTER (model), path);
-
-      gint *idx = gtk_tree_path_get_indices (fpath);
-
+      GtkTreePath *p = get_base_tree_path (top_model, l->data);
+      gint *idx = gtk_tree_path_get_indices (p);
       const struct variable *v = psppire_dict_get_variable (dict, idx[0]);
 
-      gtk_tree_path_free (fpath);
+      gtk_tree_path_free (p);
 
       if (have_type && var_get_type (v) != type)
         {
@@ -120,35 +149,28 @@ numeric_only (GtkWidget *source, GtkWidget *dest)
 {
   gboolean retval = TRUE;
 
-  GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (source));
+  GtkTreeModel *top_model = gtk_tree_view_get_model (GTK_TREE_VIEW (source));
+  GtkTreeModel *model = NULL;
 
   PsppireDict *dict;
   GtkTreeSelection *selection;
   GList *list, *l;
 
-  while (GTK_IS_TREE_MODEL_FILTER (model))
-    {
-      model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
-    }
+  get_base_model (top_model, NULL, &model, NULL);
 
   dict = PSPPIRE_DICT (model);
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (source));
 
-  list = gtk_tree_selection_get_selected_rows (selection, &model);
+  list = gtk_tree_selection_get_selected_rows (selection, &top_model);
 
   /* Iterate through the selection of the source treeview */
   for (l = list; l ; l = l->next)
     {
-      GtkTreePath *path = l->data;
-      GtkTreePath *fpath = gtk_tree_model_filter_convert_path_to_child_path
-       (GTK_TREE_MODEL_FILTER (model), path);
-
-      gint *idx = gtk_tree_path_get_indices (fpath);
-
+      GtkTreePath *p = get_base_tree_path (top_model, l->data);
+      gint *idx = gtk_tree_path_get_indices (p);
       const struct variable *v = psppire_dict_get_variable (dict, idx[0]);
-
-      gtk_tree_path_free (fpath);
+      gtk_tree_path_free (p);
 
       if ( var_is_alpha (v))
        {