Added dialog box for the aggregate command
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 29 Jul 2010 14:35:56 +0000 (16:35 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 29 Jul 2010 14:35:56 +0000 (16:35 +0200)
src/ui/gui/aggregate-dialog.c [new file with mode: 0644]
src/ui/gui/aggregate-dialog.h [new file with mode: 0644]
src/ui/gui/aggregate.ui [new file with mode: 0644]
src/ui/gui/automake.mk
src/ui/gui/data-editor.ui
src/ui/gui/dict-display.c
src/ui/gui/dict-display.h
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-selector.c

diff --git a/src/ui/gui/aggregate-dialog.c b/src/ui/gui/aggregate-dialog.c
new file mode 100644 (file)
index 0000000..744e9cf
--- /dev/null
@@ -0,0 +1,736 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2010  Free Software Foundation
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+
+#include "dialog-common.h"
+#include <language/syntax-string-source.h>
+
+#include <language/stats/aggregate.h>
+
+#include <ui/syntax-gen.h>
+#include <libpspp/str.h>
+
+#include "aggregate-dialog.h"
+#include "psppire-selector.h"
+#include "psppire-dictview.h"
+#include "psppire-dialog.h"
+
+#include "psppire-data-window.h"
+#include "psppire-var-view.h"
+#include "psppire-acr.h"
+
+#include "dict-display.h"
+
+#include "executor.h"
+#include "helper.h"
+
+#include <gtk/gtk.h>
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+
+enum
+  {
+    COMBO_MODEL_COL_DESC = 0,
+    COMBO_MODEL_COL_SYNTAX,
+    COMBO_MODEL_COL_SRC_VARS,
+    COMBO_MODEL_COL_ARITY
+  };
+
+
+struct aggregate
+{
+  GtkBuilder *xml;
+  PsppireDataWindow *de ;
+  PsppireDict *dict;
+  GtkWidget *break_variables;
+
+  GtkWidget *replace_radiobutton;
+  GtkWidget *add_radiobutton;
+  GtkWidget *filename_radiobutton;
+  GtkWidget *filename_button;
+  GtkWidget *filename_box;
+  GtkWidget *filename_label;
+
+  GtkWidget *function_combo;
+
+  GtkWidget *summary_acr;
+  GtkWidget *summary_var_name_entry;
+  GtkWidget *summary_var_label_entry;
+
+  GtkWidget *summary_sv;
+  GtkWidget *summary_sv_entry;
+
+  GtkWidget *summary_arg1;
+  GtkWidget *summary_arg2;
+
+  GtkWidget *summary_arg1_entry;
+  GtkWidget *summary_arg2_entry;
+
+  GtkWidget *sorted_button;
+  GtkWidget *needs_sort_button;
+};
+
+
+static char * generate_syntax (const struct aggregate *rd);
+
+
+/* Makes widget W's sensitivity follow the active state of TOGGLE */
+static void
+sensitive_if_active (GtkToggleButton *toggle, GtkWidget *w)
+{
+  gboolean active = gtk_toggle_button_get_active (toggle);
+
+  gtk_widget_set_sensitive (w, active);
+}
+
+static void update_arguments (struct aggregate *agg);
+
+
+static void
+refresh (struct aggregate *agg)
+{
+  GtkTreeModel *liststore =
+    gtk_tree_view_get_model (GTK_TREE_VIEW (agg->break_variables));
+  gtk_list_store_clear (GTK_LIST_STORE (liststore));
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (agg->add_radiobutton), TRUE);
+  gtk_label_set_text (GTK_LABEL (agg->filename_label), "");
+
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (agg->needs_sort_button), TRUE);
+
+  gtk_entry_set_text (GTK_ENTRY (agg->summary_sv_entry), "");
+  gtk_entry_set_text (GTK_ENTRY (agg->summary_arg1_entry), "");
+  gtk_entry_set_text (GTK_ENTRY (agg->summary_arg2_entry), "");
+  gtk_entry_set_text (GTK_ENTRY (agg->summary_var_label_entry), "");
+  gtk_entry_set_text (GTK_ENTRY (agg->summary_var_name_entry), "");
+
+  gtk_combo_box_set_active (GTK_COMBO_BOX (agg->function_combo), -1);
+
+  gtk_list_store_clear (PSPPIRE_ACR (agg->summary_acr)->list_store);
+
+  update_arguments (agg);
+}
+
+
+static gboolean
+dialog_state_valid (gpointer data)
+{
+  GtkTreeIter iter;
+  const struct aggregate *agg = data;
+
+  GtkTreeModel *liststore =
+    gtk_tree_view_get_model (GTK_TREE_VIEW (agg->break_variables));
+
+  if ( ! gtk_tree_model_get_iter_first  (liststore, &iter))
+    return FALSE;
+
+  liststore = GTK_TREE_MODEL (PSPPIRE_ACR (agg->summary_acr)->list_store);
+  
+  if ( ! gtk_tree_model_get_iter_first (liststore, &iter))
+    return FALSE;
+
+  return TRUE;
+}
+
+
+static void
+choose_filename (struct aggregate *fd)
+{
+  GtkFileFilter *filter;
+
+  GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Aggregate destination file"),
+                                                          GTK_WINDOW (fd->de),
+                                                          GTK_FILE_CHOOSER_ACTION_SAVE,
+                                                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                                          GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+                                                          NULL);
+
+  gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
+  gtk_file_filter_add_pattern (filter, "*.sav");
+  gtk_file_filter_add_pattern (filter, "*.SAV");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("Portable Files (*.por) "));
+  gtk_file_filter_add_pattern (filter, "*.por");
+  gtk_file_filter_add_pattern (filter, "*.POR");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+    {
+      char *filename;
+
+      filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+
+      gtk_label_set_text (GTK_LABEL (fd->filename_label), filename);
+
+      g_free (filename);
+    }
+
+
+  gtk_widget_destroy (dialog);
+}
+
+
+static void
+populate_combo_model (GtkComboBox *cb)
+{
+  GtkListStore *list =  gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
+  GtkTreeIter iter;
+  const struct agr_func *af = agr_func_tab;
+  GtkCellRenderer *renderer ;
+
+  for (af = agr_func_tab; af->name; ++af)
+    {
+      const gchar *s = af->description;
+      if (s == NULL)
+       continue;
+
+      gtk_list_store_append (list, &iter);
+      gtk_list_store_set (list, &iter,
+                          COMBO_MODEL_COL_DESC, s,
+                         COMBO_MODEL_COL_SYNTAX, af->name,
+                         COMBO_MODEL_COL_SRC_VARS, af->src_vars,
+                         COMBO_MODEL_COL_ARITY, af->n_args,
+                          -1);
+    }
+
+  renderer = gtk_cell_renderer_text_new ();
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cb), renderer, FALSE);
+
+  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (cb), renderer, "text", 0);
+
+  gtk_combo_box_set_model (GTK_COMBO_BOX (cb), GTK_TREE_MODEL (list));
+}
+
+
+
+/* Returns TRUE iff all the necessary controls have been set to
+   completely specify a summary function */
+static gboolean
+summary_complete (const struct aggregate *agg)
+{
+  GtkTreeIter iter;
+  int n_args;
+  enum agr_src_vars src_vars;
+  gboolean ok;
+  GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (agg->function_combo));
+
+  if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (agg->summary_var_name_entry))))
+    return FALSE;
+
+  ok = gtk_combo_box_get_active_iter (GTK_COMBO_BOX (agg->function_combo), &iter);
+
+  if (! ok)
+    return FALSE;
+
+
+
+  gtk_tree_model_get  (model,
+                      &iter,
+                      COMBO_MODEL_COL_ARITY,   &n_args,
+                      COMBO_MODEL_COL_SRC_VARS, &src_vars,
+                      -1);
+
+  if ( src_vars == AGR_SV_YES )
+    {
+      if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (agg->summary_sv_entry))))
+       return FALSE;
+    }
+
+  if ( n_args >= 2)
+    {
+      if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (agg->summary_arg2_entry))))
+       return FALSE;
+    }
+
+  if ( n_args >= 1)
+    {
+      if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (agg->summary_arg1_entry))))
+       return FALSE;
+    }
+
+
+  return TRUE;
+}
+
+
+static void
+append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *string);
+
+
+static void
+render_summary   (GtkTreeViewColumn *tree_column,
+                 GtkCellRenderer *cell,
+                 GtkTreeModel *tree_model,
+                 GtkTreeIter *iter,
+                 gpointer data)
+{
+  struct aggregate *agg = data;
+  
+  GString *string = g_string_new ("");
+
+  append_summary_spec (agg, iter, string);
+
+  
+  g_object_set (cell, "text", string->str, NULL);
+
+  g_string_free (string, TRUE);
+}
+
+
+/* Enable/Disable the summary variable ACR */
+static void
+update_acr (struct aggregate *agg)
+{
+  gboolean ready = summary_complete (agg);
+
+  psppire_acr_set_enabled (PSPPIRE_ACR (agg->summary_acr), ready);
+}
+
+
+/* Update the sensitivity of the summary variable argument fields */
+static void
+update_arguments (struct aggregate *agg)
+{
+  GtkTreeIter iter;
+
+  gboolean ok = gtk_combo_box_get_active_iter (GTK_COMBO_BOX (agg->function_combo), &iter);
+
+  if ( ok)
+    {
+      GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (agg->function_combo));
+      int n_args;
+      enum agr_src_vars src_vars;
+      gtk_tree_model_get  (model,
+                          &iter,
+                          COMBO_MODEL_COL_ARITY,   &n_args,
+                          COMBO_MODEL_COL_SRC_VARS, &src_vars,
+                          -1);
+
+      gtk_widget_set_sensitive (agg->summary_sv, src_vars != AGR_SV_NO);
+      gtk_widget_set_sensitive (agg->summary_arg2, n_args >= 2);
+      gtk_widget_set_sensitive (agg->summary_arg1, n_args >= 1);
+    }
+  else
+    {
+      gtk_widget_set_sensitive (agg->summary_sv,   FALSE);
+      gtk_widget_set_sensitive (agg->summary_arg2, FALSE);
+      gtk_widget_set_sensitive (agg->summary_arg1, FALSE);
+    }
+}
+
+enum 
+  {
+    SUMMARY_COL_VARNAME = 0,
+    SUMMARY_COL_VARLABEL,
+    SUMMARY_COL_FUNCIDX,
+    SUMMARY_COL_SRCVAR,
+    SUMMARY_COL_ARG1,
+    SUMMARY_COL_ARG2
+  };
+
+/* Set VAL to the value appropriate for COL according to the
+   current state of the dialog */
+static gboolean
+get_summary_spec (gint col, GValue *val,
+                 const struct aggregate *agg)
+{
+  switch (col)
+    {
+    case SUMMARY_COL_VARNAME:
+      g_value_init (val, G_TYPE_STRING);
+      g_value_set_string (val, gtk_entry_get_text (GTK_ENTRY (agg->summary_var_name_entry)));
+      break;
+    case SUMMARY_COL_VARLABEL:
+      g_value_init (val, G_TYPE_STRING);
+      g_value_set_string (val, gtk_entry_get_text (GTK_ENTRY (agg->summary_var_label_entry)));
+      break;
+    case SUMMARY_COL_SRCVAR:
+      g_value_init (val, G_TYPE_STRING);
+      g_value_set_string (val, gtk_entry_get_text (GTK_ENTRY (agg->summary_sv_entry)));
+      break;
+    case SUMMARY_COL_FUNCIDX:
+      g_value_init (val, G_TYPE_INT);
+      g_value_set_int (val, gtk_combo_box_get_active (GTK_COMBO_BOX (agg->function_combo)));
+      break;
+    case SUMMARY_COL_ARG1:
+      {
+       const gchar *text = gtk_entry_get_text (GTK_ENTRY (agg->summary_arg1_entry));
+       g_value_init (val, G_TYPE_DOUBLE);
+       g_value_set_double (val, g_strtod (text, 0));
+      }
+      break;
+    case SUMMARY_COL_ARG2:
+      {
+       const gchar *text = gtk_entry_get_text (GTK_ENTRY (agg->summary_arg2_entry));
+       g_value_init (val, G_TYPE_DOUBLE);
+       g_value_set_double (val, g_strtod (text, 0));
+      }
+      break;
+    default:
+      g_assert_not_reached ();
+      break;
+    }
+
+  return TRUE;
+}
+
+
+/* Update the status of the dialog box according to what row of the ACR's treeview
+   is selected */
+static  void
+on_acr_change (const struct aggregate *agg, GtkTreeView *tv)
+{
+  const gchar *varname;
+  const gchar *label;
+  const gchar *srcvar;
+  gint f_idx;
+  double arg1, arg2;
+  gchar *text = NULL;
+    
+  GtkTreeIter iter;
+  GtkTreePath *path = NULL;
+  GtkTreeModel *model = gtk_tree_view_get_model (tv);
+  gtk_tree_view_get_cursor (tv, &path, NULL);
+  
+  gtk_tree_model_get_iter (model, &iter, path);
+
+  gtk_tree_model_get (model, &iter,
+                     SUMMARY_COL_VARNAME, &varname,
+                     SUMMARY_COL_VARLABEL, &label,
+                     SUMMARY_COL_FUNCIDX, &f_idx,
+                     SUMMARY_COL_SRCVAR, &srcvar,
+                     SUMMARY_COL_ARG1, &arg1,
+                     SUMMARY_COL_ARG2, &arg2,
+                     -1);
+
+  gtk_entry_set_text (GTK_ENTRY (agg->summary_var_name_entry), varname);
+  gtk_entry_set_text (GTK_ENTRY (agg->summary_var_label_entry), label);
+  gtk_entry_set_text (GTK_ENTRY (agg->summary_sv_entry), srcvar);
+  
+  text = g_strdup_printf ("%g", arg1);
+  gtk_entry_set_text (GTK_ENTRY (agg->summary_arg1_entry), text);
+  g_free (text);
+
+  text = g_strdup_printf ("%g", arg2);
+  gtk_entry_set_text (GTK_ENTRY (agg->summary_arg2_entry), text);
+  g_free (text);
+
+
+  gtk_combo_box_set_active (GTK_COMBO_BOX (agg->function_combo), f_idx);
+}
+
+
+/* Pops up the Aggregate dialog box */
+void
+aggregate_dialog (PsppireDataWindow *dw)
+{
+  struct aggregate fd;
+  gint response;
+
+  PsppireVarStore *vs;
+
+  GtkWidget *dialog ;
+  GtkWidget *source ;
+
+  GtkWidget *break_selector ;
+
+  fd.xml = builder_new ("aggregate.ui");
+
+  fd.de = dw;
+
+  dialog = get_widget_assert (fd.xml, "psppire-dialog1");
+  source = get_widget_assert   (fd.xml, "dict-view");
+  break_selector = get_widget_assert   (fd.xml, "break-selector");
+
+  fd.break_variables = get_widget_assert (fd.xml, "psppire-var-view1");
+  fd.filename_radiobutton = get_widget_assert (fd.xml, "filename-radiobutton");
+  fd.filename_button = get_widget_assert (fd.xml, "filename-button");
+  fd.filename_box = get_widget_assert (fd.xml, "filename-box");
+  fd.filename_label = get_widget_assert (fd.xml, "filename-label");
+  fd.replace_radiobutton = get_widget_assert (fd.xml, "replace-radiobutton");
+  fd.add_radiobutton = get_widget_assert (fd.xml, "add-radiobutton");
+  fd.function_combo = get_widget_assert (fd.xml, "function-combo");
+
+  fd.summary_acr = get_widget_assert (fd.xml, "psppire-acr1");
+  fd.summary_var_name_entry = get_widget_assert (fd.xml, "summary-var-name-entry");
+
+  fd.summary_arg1 = get_widget_assert (fd.xml, "summary-arg1");
+  fd.summary_arg2 = get_widget_assert (fd.xml, "summary-arg2");
+
+  fd.summary_arg1_entry = get_widget_assert (fd.xml, "summary-arg-entry1");
+  fd.summary_arg2_entry = get_widget_assert (fd.xml, "summary-arg-entry2");
+
+  fd.summary_var_label_entry = get_widget_assert (fd.xml, "summary-var-label-entry");
+
+  fd.summary_sv = get_widget_assert (fd.xml, "source-var");
+  fd.summary_sv_entry = get_widget_assert (fd.xml, "source-var-entry");
+
+  fd.sorted_button = get_widget_assert (fd.xml, "sorted-radiobutton");
+  fd.needs_sort_button = get_widget_assert (fd.xml, "needs-sort-radiobutton");
+
+  {
+    GtkTreeViewColumn *column ;
+
+    GList *l ;
+
+    GtkCellRenderer *cell_renderer ;
+
+    GtkListStore *list = gtk_list_store_new (6,
+                                            G_TYPE_STRING,
+                                            G_TYPE_STRING,
+                                            G_TYPE_INT, 
+                                            G_TYPE_STRING,
+                                            G_TYPE_DOUBLE,
+                                            G_TYPE_DOUBLE);
+
+    psppire_acr_set_model (PSPPIRE_ACR (fd.summary_acr), list);
+
+    psppire_acr_set_get_value_func (PSPPIRE_ACR (fd.summary_acr),
+                                                get_summary_spec, &fd);
+
+    column = gtk_tree_view_get_column (PSPPIRE_ACR (fd.summary_acr)->tv, 0);
+
+    l = gtk_tree_view_column_get_cell_renderers (column);
+
+    cell_renderer = l->data;
+
+    gtk_tree_view_column_set_cell_data_func (column,
+                                            cell_renderer,
+                                            render_summary, 
+                                            &fd,
+                                            NULL);
+
+    g_signal_connect_swapped (PSPPIRE_ACR (fd.summary_acr)->tv,
+                             "cursor-changed", G_CALLBACK (on_acr_change), &fd);
+  }
+  
+  g_signal_connect_swapped (fd.summary_var_name_entry, "changed", G_CALLBACK (update_acr),  &fd);
+  g_signal_connect_swapped (fd.function_combo, "changed", G_CALLBACK (update_acr),  &fd);
+  g_signal_connect_swapped (fd.summary_sv_entry, "changed", G_CALLBACK (update_acr),  &fd);  
+  g_signal_connect_swapped (fd.summary_arg1_entry, "changed", G_CALLBACK (update_acr),  &fd);  
+  g_signal_connect_swapped (fd.summary_arg2_entry, "changed", G_CALLBACK (update_acr),  &fd);  
+
+  g_signal_connect_swapped (fd.function_combo, "changed",
+                           G_CALLBACK (update_arguments),  &fd);
+
+  populate_combo_model (GTK_COMBO_BOX (fd.function_combo));
+
+  g_signal_connect_swapped (dialog, "refresh", G_CALLBACK (refresh),  &fd);
+
+  g_object_get (fd.de->data_editor, "var-store", &vs, NULL);
+
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (fd.de));
+
+  g_object_get (vs, "dictionary", &fd.dict, NULL);
+  g_object_set (source, "model", fd.dict, NULL);
+
+
+  psppire_selector_set_filter_func (PSPPIRE_SELECTOR (break_selector), NULL);
+
+
+  psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
+                                     dialog_state_valid, &fd);
+
+  g_signal_connect (fd.filename_radiobutton, "toggled",
+                   G_CALLBACK (sensitive_if_active), fd.filename_box );
+
+  g_signal_connect_swapped (fd.filename_button, "clicked",
+                   G_CALLBACK (choose_filename), &fd);
+
+
+  response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
+
+  switch (response)
+    {
+    case GTK_RESPONSE_OK:
+      {
+       gchar *syntax = generate_syntax (&fd);
+
+       struct getl_interface *sss = create_syntax_string_source (syntax);
+       execute_syntax (sss);
+
+       g_free (syntax);
+      }
+      break;
+    case PSPPIRE_RESPONSE_PASTE:
+      {
+       gchar *syntax = generate_syntax (&fd);
+        paste_syntax_to_window (syntax);
+
+       g_free (syntax);
+      }
+      break;
+    default:
+      break;
+    }
+
+  g_object_unref (fd.xml);
+}
+
+
+\f
+
+static void
+append_destination_filename (const struct aggregate *agg, GString *gs)
+{
+  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (agg->filename_radiobutton)))
+    {
+      struct string ss;
+      const gchar *s = gtk_label_get_text (GTK_LABEL (agg->filename_label));
+      ds_init_empty (&ss);
+      syntax_gen_string (&ss, ss_cstr (s));
+      g_string_append (gs, ds_cstr (&ss));
+      ds_destroy (&ss);
+    }
+  else
+    {
+      g_string_append (gs, "* ");
+
+      if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (agg->replace_radiobutton)))
+       g_string_append (gs, "MODE=REPLACE");
+      else
+       g_string_append (gs, "MODE=ADDVARIABLES");
+    }
+}
+
+/* Append the syntax of the summary function pointed to by ITER to STRING */
+static void
+append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *string)
+{
+  GtkTreeIter combo_iter;
+  const char *varname;
+  const char *funcname;
+
+  GtkTreeModel *acr_model = GTK_TREE_MODEL (PSPPIRE_ACR (agg->summary_acr)->list_store);
+  GtkTreeModel *combo_model = gtk_combo_box_get_model (GTK_COMBO_BOX (agg->function_combo));
+
+
+  /* This is an index into the combo_model.  Its used to get the function name */
+  int f_idx;
+  double arg1, arg2;
+  int arity;
+  enum agr_src_vars has_src_vars;
+    const gchar *label ;
+  const gchar *srcvar ;
+
+  gtk_tree_model_get (acr_model, iter,
+                     SUMMARY_COL_VARNAME, &varname,
+                     SUMMARY_COL_VARLABEL, &label,
+                     SUMMARY_COL_FUNCIDX, &f_idx,
+                     SUMMARY_COL_SRCVAR, &srcvar,
+                     SUMMARY_COL_ARG1, &arg1,
+                     SUMMARY_COL_ARG2, &arg2,
+                     -1);
+
+  gtk_tree_model_iter_nth_child (combo_model, &combo_iter, NULL, f_idx);
+
+  gtk_tree_model_get (combo_model, &combo_iter,
+                     COMBO_MODEL_COL_SYNTAX, &funcname,
+                     COMBO_MODEL_COL_ARITY, &arity,
+                     COMBO_MODEL_COL_SRC_VARS, &has_src_vars,
+                     -1);
+
+  g_string_append (string, varname);
+
+  if (0 != strcmp ("", label))
+    {
+      struct string ss;
+      ds_init_empty (&ss);
+      syntax_gen_string (&ss, ss_cstr (label));
+      g_string_append (string, " ");
+      g_string_append (string, ds_cstr (&ss));
+      ds_destroy (&ss);
+    }
+    
+  g_string_append_printf (string, " = %s", funcname);
+
+  if ( has_src_vars != AGR_SV_NO)
+    {
+      g_string_append (string, " (");
+      
+      g_string_append (string, srcvar);
+
+      if ( arity > 0)
+       g_string_append_printf (string, ", %g", arg1);
+
+      if ( arity > 1)
+       g_string_append_printf (string, ", %g", arg2);
+
+      g_string_append (string, ")");
+    }
+}
+
+
+
+static void
+append_summary_variable_syntax (const struct aggregate *agg,  GString *string)
+{
+  GtkTreeIter iter;
+  GtkTreeModel *acr_model = GTK_TREE_MODEL (PSPPIRE_ACR (agg->summary_acr)->list_store);
+
+
+  gboolean ok;
+
+  for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (acr_model), &iter);
+       ok ;
+       ok = gtk_tree_model_iter_next (GTK_TREE_MODEL (acr_model), &iter)
+       )
+    {
+      g_string_append (string, "\n\t/");
+
+      append_summary_spec (agg, &iter, string);
+    }
+}
+
+
+static char *
+generate_syntax (const struct aggregate *agg)
+{
+  gchar *text;
+
+  GString *string = g_string_new ("AGGREGATE OUTFILE=");
+
+  append_destination_filename (agg, string);
+
+  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (agg->sorted_button)))
+    g_string_append (string, "\n\t/PRESORTED");
+
+  g_string_append (string, "\n\t/BREAK=");
+
+  psppire_var_view_append_names (PSPPIRE_VAR_VIEW (agg->break_variables), 0, string);
+
+  append_summary_variable_syntax (agg, string);
+
+  g_string_append (string, ".\n");
+
+  text = string->str;
+
+  g_string_free (string, FALSE);
+
+  return text;
+}
diff --git a/src/ui/gui/aggregate-dialog.h b/src/ui/gui/aggregate-dialog.h
new file mode 100644 (file)
index 0000000..302e594
--- /dev/null
@@ -0,0 +1,26 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2010  Free Software Foundation
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef __AGGREGATE_DIALOG_H
+#define __AGGREGATE_DIALOG_H
+
+
+#include <gtk/gtk.h>
+#include "psppire-data-window.h"
+
+void aggregate_dialog (PsppireDataWindow * data);
+
+#endif
diff --git a/src/ui/gui/aggregate.ui b/src/ui/gui/aggregate.ui
new file mode 100644 (file)
index 0000000..193d112
--- /dev/null
@@ -0,0 +1,534 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires psppire 0.0 -->
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="PsppireDialog" id="psppire-dialog1">
+    <property name="title" translatable="yes">Aggregate Data</property>
+    <property name="modal">True</property>
+    <property name="orientation">Vertical</property>
+    <child internal-child="hbox">
+      <object class="GtkVBox" id="dialog-hbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkHPaned" id="hbox1">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="PsppireDictView" id="dict-view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="border_width">5</property>
+                    <property name="headers_visible">False</property>
+                    <property name="headers_clickable">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment5">
+                        <property name="visible">True</property>
+                        <property name="yscale">0</property>
+                        <child>
+                          <object class="PsppireSelector" id="break-selector">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="border_width">5</property>
+                            <property name="source_widget">dict-view</property>
+                            <property name="dest_widget">psppire-var-view1</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frame2">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <object class="GtkAlignment" id="alignment2">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">automatic</property>
+                                <property name="vscrollbar_policy">automatic</property>
+                                <property name="shadow_type">in</property>
+                                <child>
+                                  <object class="PsppireVarView" id="psppire-var-view1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="border_width">5</property>
+                                    <property name="headers_visible">False</property>
+                                    <property name="headers_clickable">False</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label2">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">_Break variable(s)</property>
+                            <property name="use_markup">True</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame4">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox2">
+                        <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkTable" id="table1">
+                            <property name="visible">True</property>
+                            <property name="n_rows">4</property>
+                            <property name="n_columns">2</property>
+                            <child>
+                              <object class="GtkHBox" id="hbox5">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkLabel" id="label6">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Variable Name: </property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="summary-var-name-entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox9">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkLabel" id="label10">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Variable Label: </property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="summary-var-label-entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox8">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkLabel" id="label5">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Function: </property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="function-combo">
+                                    <property name="visible">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="pack_type">end</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="source-var">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="PsppireSelector" id="psppire-selector1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="border_width">5</property>
+                                    <property name="source_widget">dict-view</property>
+                                    <property name="dest_widget">source-var-entry</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="source-var-entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="summary-arg1">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkLabel" id="label8">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Argument 1: </property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="summary-arg-entry1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="summary-arg2">
+                                <property name="visible">True</property>
+                                <child>
+                                  <object class="GtkLabel" id="label9">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Argument 2: </property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="summary-arg-entry2">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="PsppireAcr" id="psppire-acr1">
+                            <property name="visible">True</property>
+                            <property name="border_width">5</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Aggregated variables</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame3">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <child>
+              <object class="GtkAlignment" id="alignment3">
+                <property name="visible">True</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkVBox" id="vbox4">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkRadioButton" id="add-radiobutton">
+                        <property name="label" translatable="yes">_Add aggregated variables to the active dataset</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="replace-radiobutton">
+                        <property name="label" translatable="yes">_Replace the current dataset with the aggregated variables</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">add-radiobutton</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="filename-radiobutton">
+                        <property name="label" translatable="yes">_Write a new data file containing only the aggregated variables</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">add-radiobutton</property>
+                      </object>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment8">
+                        <property name="visible">True</property>
+                        <property name="left_padding">15</property>
+                        <child>
+                          <object class="GtkHBox" id="filename-box">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <child>
+                              <object class="GtkButton" id="filename-button">
+                                <property name="label">gtk-save</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_stock">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="filename-label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">label</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Save</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkVBox" id="vboxbuttons">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkRadioButton" id="sorted-radiobutton">
+                        <property name="label" translatable="yes">File is _already sorted on break variable(s)</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="needs-sort-radiobutton">
+                        <property name="label" translatable="yes">Sort file before a_ggregating</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">sorted-radiobutton</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Options for very large datasets</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="PsppireHButtonBox" id="psppire-hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkToggleAction" id="toggleaction1"/>
+</interface>
index 7f56a84bfc9d8c15587d51bf2e73c3b16bb06730..5731ae533bd48fda9ed6ce355d44d4c94e503af3 100644 (file)
@@ -3,6 +3,7 @@
 include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
 UI_FILES = \
+       src/ui/gui/aggregate.ui \
        src/ui/gui/binomial.ui \
        src/ui/gui/compute.ui \
        src/ui/gui/correlation.ui \
@@ -116,6 +117,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-hbuttonbox.c \
        src/ui/gui/psppire-vbuttonbox.c \
        src/ui/gui/psppire-acr.c \
+       src/ui/gui/aggregate-dialog.c \
+       src/ui/gui/aggregate-dialog.h \
        src/ui/gui/binomial-dialog.c \
        src/ui/gui/binomial-dialog.h \
        src/ui/gui/checkbox-treeview.c \
index 023b9698740f727bf8192a2cbd836b8d39ba6184..69f2b413901f43aa4e67e5f6cb5c01bce72ef468 100644 (file)
@@ -14,8 +14,7 @@
           </object>
         </child>
       </object>
-   </child>
-       
+    </child>
     <child>
       <object class="GtkActionGroup" id="actiongroup1">
         <child>
            <property name="tooltip" translatable="yes">Transpose the cases with the variables</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="data_aggregate">
+           <property name="stock-id">pspp-aggregate</property>
+            <property name="name">data_aggregate</property>
+            <property name="label" translatable="yes">_Aggregate</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="data_split-file">
             <property name="name">data_split-file</property>
         <menu action="data">
           <menuitem action="data_sort-cases"/>
           <menuitem action="data_transpose"/>
+          <menuitem action="data_aggregate"/>
           <separator/>
           <menuitem action="data_split-file"/>
           <menuitem action="data_select-cases"/>
         </placeholder>
       </toolbar>
       <popup name="datasheet-variable-popup">
-         <menuitem action="action_insert-variable"/>
-         <separator/>
-         <menuitem action="edit_clear-variables"/>
-         <separator/>
-          <menuitem action="sort-up"/>
-          <menuitem action="sort-down"/>
+       <menuitem action="action_insert-variable"/>
+       <separator/>
+       <menuitem action="edit_clear-variables"/>
+       <separator/>
+        <menuitem action="sort-up"/>
+        <menuitem action="sort-down"/>
       </popup>
       <popup name="varsheet-variable-popup">
-         <menuitem action="action_insert-variable"/>
-         <separator/>
-         <menuitem action="edit_clear-variables"/>
+       <menuitem action="action_insert-variable"/>
+       <separator/>
+       <menuitem action="edit_clear-variables"/>
       </popup>
       <popup name="datasheet-cases-popup">
-         <menuitem action="edit_insert-case"/>
-         <separator/>
-         <menuitem action="edit_clear-cases"/>
+       <menuitem action="edit_insert-case"/>
+       <separator/>
+       <menuitem action="edit_clear-cases"/>
       </popup>
-</ui>
+    </ui>
   </object>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
index 160cdb2a1b8e635c4ad72a08892ca11edbddef9d..ada7fb40fcbd5ab45ad55edca1c5508c5a4c8c07 100644 (file)
@@ -23,6 +23,7 @@
 #include "dict-display.h"
 
 #include "psppire-dict.h"
+#include "psppire-var-view.h"
 #include <libpspp/i18n.h>
 #include "helper.h"
 #include <data/variable.h>
@@ -151,5 +152,3 @@ is_currently_in_entry (GtkTreeModel *model, GtkTreeIter *iter,
   return result;
 }
 
-
-
index f1a8a0016f9aa2c9920cc9b6424f9b0c34b251ca..5586cb10a7ecc19b3f40624ea12724a5ec921c26 100644 (file)
@@ -19,6 +19,9 @@
    dictionary in  GTK widgets.
 */
 
+#ifndef DICT_DISPLAY 
+#define DICT_DISPLAY 1
+
 #include <gtk/gtk.h>
 
 #include "psppire-selector.h"
@@ -44,4 +47,4 @@ void insert_source_row_into_entry (GtkTreeIter source_iter,
 gboolean is_currently_in_entry (GtkTreeModel *model, GtkTreeIter *iter,
                                PsppireSelector *selector);
 
-
+#endif
index 92c3e5990ab509e10381debf77c6c65e94a97b07..e6d905e0b5dbfea3e534afbfa2fba9e674084ca2 100644 (file)
@@ -57,6 +57,7 @@
 #include "ui/gui/t-test-paired-samples.h"
 #include "ui/gui/text-data-import-dialog.h"
 #include "ui/gui/transpose-dialog.h"
+#include "ui/gui/aggregate-dialog.h"
 #include "ui/gui/variable-info-dialog.h"
 #include "ui/gui/weight-cases-dialog.h"
 #include "ui/syntax-gen.h"
@@ -1081,6 +1082,8 @@ psppire_data_window_init (PsppireDataWindow *de)
  
   connect_action (de, "data_sort-cases", G_CALLBACK (sort_cases_dialog));
 
+  connect_action (de, "data_aggregate", G_CALLBACK (aggregate_dialog));
+
   connect_action (de, "transform_compute", G_CALLBACK (compute_dialog));
 
   connect_action (de, "edit_find", G_CALLBACK (find_dialog));
index 83fe2d82792a04fb34425b3f0f5a221dde2238fb..74d2bffcfbff15be6faa182b011f67836045727e 100644 (file)
@@ -981,8 +981,6 @@ psppire_selector_set_filter_func (PsppireSelector *selector,
                                  FilterItemsFunc *filter_func)
 {
   selector->filter = filter_func ;
-  
-  set_default_filter (selector);
 }