Merge 'master' into 'psppsheet'.

[pspp] / src / ui / gui / oneway-anova-dialog.c

diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c
index ea390c334275f797b4069fd793b994d02b3827fa..d656366cf06bade3e0a578ca33e2dadb0a38c472 100644 (file)
--- a/src/ui/gui/oneway-anova-dialog.c
+++ b/src/ui/gui/oneway-anova-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -15,13 +15,12 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #include <config.h>
 #include <gtk/gtk.h>
 #include "oneway-anova-dialog.h"
 #include "psppire-dict.h"
-#include "psppire-var-store.h"
-#include "helper.h"
+#include "psppire-var-view.h"
+#include "builder-wrapper.h"
 #include "psppire-data-window.h"
 #include "psppire-dialog.h"
 #include "dialog-common.h"
@@ -29,10 +28,8 @@
 #include "psppire-selector.h"
 #include "dict-display.h"
 
-
-#include <language/syntax-string-source.h>
 #include "executor.h"
-
+#include "helper.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -124,12 +121,9 @@ refresh (struct oneway_anova_dialog *ow)
 
 /* Pops up the dialog box */
 void
-oneway_anova_dialog (GObject *o, gpointer data)
+oneway_anova_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
-  PsppireVarStore *vs = NULL;
 
   struct oneway_anova_dialog ow;
 
@@ -141,9 +135,6 @@ oneway_anova_dialog (GObject *o, gpointer data)
   GtkWidget *selector2 =
     get_widget_assert (builder, "oneway-anova-selector2");
 
-  GtkWidget *selector1 =
-    get_widget_assert (builder, "oneway-anova-selector1");
-
   GtkWidget *contrasts_button =
     get_widget_assert (builder, "contrasts-button");
 
@@ -162,31 +153,18 @@ oneway_anova_dialog (GObject *o, gpointer data)
   ow.homogeneity =
     GTK_TOGGLE_BUTTON (get_widget_assert (builder, "checkbutton2"));
 
-  g_object_get (de->data_editor, "var-store", &vs, NULL);
-
-  g_object_get (vs, "dictionary", &ow.dict, NULL);
+  g_object_get (de->data_editor, "dictionary", &ow.dict, NULL);
 
   ow.dialog =
     GTK_WINDOW (get_widget_assert (builder, "oneway-anova-dialog"));
 
   gtk_window_set_transient_for (ow.dialog, GTK_WINDOW (de));
 
-  g_object_set (dict_view, "dictionary", ow.dict, NULL);
+  g_object_set (dict_view, "model", ow.dict, NULL);
 
-  set_dest_model (GTK_TREE_VIEW (ow.vars_treeview), ow.dict);
-
-
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
-                                insert_source_row_into_tree_view,
-                                NULL,
-                                NULL);
-
-
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
-                                insert_source_row_into_entry,
-                                is_currently_in_entry,
-                                NULL);
 
+  psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector2),
+                                   is_currently_in_entry);
 
 
   g_signal_connect_swapped (ow.dialog, "refresh", G_CALLBACK (refresh),  &ow);
@@ -227,22 +205,10 @@ oneway_anova_dialog (GObject *o, gpointer data)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      {
-       gchar *syntax = generate_syntax (&ow);
-
-       struct getl_interface *sss = create_syntax_string_source (syntax);
-       execute_syntax (sss);
-
-       g_free (syntax);
-      }
+      g_free (execute_syntax_string (de, generate_syntax (&ow)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
-      {
-       gchar *syntax = generate_syntax (&ow);
-        paste_syntax_in_new_window (syntax);
-
-       g_free (syntax);
-      }
+      g_free (paste_syntax_to_window (generate_syntax (&ow)));
       break;
     default:
       break;
@@ -260,22 +226,23 @@ static gchar * generate_syntax (const struct oneway_anova_dialog *ow)
   gint i;
   gboolean descriptives = gtk_toggle_button_get_active (ow->descriptives);
   gboolean homogeneity = gtk_toggle_button_get_active (ow->homogeneity);
+  struct string dss;
 
-  GString *str = g_string_new ("ONEWAY /VARIABLES=");
+  ds_init_cstr (&dss, "ONEWAY /VARIABLES=");
 
-  append_variable_names (str, ow->dict, GTK_TREE_VIEW (ow->vars_treeview), 0);
+  psppire_var_view_append_names_str (PSPPIRE_VAR_VIEW (ow->vars_treeview), 0, &dss);
 
-  g_string_append (str, " BY ");
+  ds_put_cstr (&dss, " BY ");
 
-  g_string_append (str, gtk_entry_get_text (GTK_ENTRY (ow->factor_entry)));
+  ds_put_cstr (&dss, gtk_entry_get_text (GTK_ENTRY (ow->factor_entry)));
 
   if (descriptives || homogeneity )
     {
-      g_string_append (str, "\n\t/STATISTICS=");
+      ds_put_cstr (&dss, "\n\t/STATISTICS=");
       if (descriptives)
-       g_string_append (str, "DESCRIPTIVES ");
+       ds_put_cstr (&dss, "DESCRIPTIVES ");
       if (homogeneity)
-       g_string_append (str, "HOMOGENEITY ");
+       ds_put_cstr (&dss, "HOMOGENEITY ");
     }
 
   for (i = 0 ; i < ow->contrasts_array->len ; ++i )
@@ -284,7 +251,7 @@ static gchar * generate_syntax (const struct oneway_anova_dialog *ow)
       GtkTreeIter iter;
       gboolean ok;
 
-      g_string_append (str, "\n\t/CONTRAST=");
+      ds_put_cstr (&dss, "\n\t/CONTRAST=");
 
       for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(ls),
                                               &iter);
@@ -295,14 +262,14 @@ static gchar * generate_syntax (const struct oneway_anova_dialog *ow)
 
          gtk_tree_model_get (GTK_TREE_MODEL (ls), &iter, 0, &v, -1);
 
-         g_string_append_printf (str, " %g", v);
+         ds_put_c_format (&dss, " %g", v);
        }
     }
 
-  g_string_append (str, ".\n");
+  ds_put_cstr (&dss, ".\n");
 
-  text = str->str;
-  g_string_free (str, FALSE);
+  text = ds_steal_cstr (&dss);
+  ds_destroy (&dss);
 
   return text;
 }