projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-window: Avoid doubled separator in Windows menu.
[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 dde60e89a8f093819dcee2cdf4bab9d449033c75..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.
/* 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
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
@@
-19,9
+19,8
@@
#include <gtk/gtk.h>
#include "oneway-anova-dialog.h"
#include "psppire-dict.h"
#include <gtk/gtk.h>
#include "oneway-anova-dialog.h"
#include "psppire-dict.h"
-#include "psppire-var-store.h"
#include "psppire-var-view.h"
#include "psppire-var-view.h"
-#include "
hel
per.h"
+#include "
builder-wrap
per.h"
#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
@@
-29,9
+28,8
@@
#include "psppire-selector.h"
#include "dict-display.h"
#include "psppire-selector.h"
#include "dict-display.h"
-#include <language/syntax-string-source.h>
#include "executor.h"
#include "executor.h"
-
+#include "helper.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-127,8
+125,6
@@
oneway_anova_dialog (PsppireDataWindow *de)
{
gint response;
{
gint response;
- PsppireVarStore *vs = NULL;
-
struct oneway_anova_dialog ow;
GtkBuilder *builder = builder_new ("oneway.ui");
struct oneway_anova_dialog ow;
GtkBuilder *builder = builder_new ("oneway.ui");
@@
-157,9
+153,7
@@
oneway_anova_dialog (PsppireDataWindow *de)
ow.homogeneity =
GTK_TOGGLE_BUTTON (get_widget_assert (builder, "checkbutton2"));
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"));
ow.dialog =
GTK_WINDOW (get_widget_assert (builder, "oneway-anova-dialog"));
@@
-211,22
+205,10
@@
oneway_anova_dialog (PsppireDataWindow *de)
switch (response)
{
case GTK_RESPONSE_OK:
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:
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;
break;
default:
break;
@@
-244,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);
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=");
- psppire_var_view_append_names
(PSPPIRE_VAR_VIEW (ow->vars_treeview), 0, str
);
+ 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 )
{
if (descriptives || homogeneity )
{
-
g_string_append (str
, "\n\t/STATISTICS=");
+
ds_put_cstr (&dss
, "\n\t/STATISTICS=");
if (descriptives)
if (descriptives)
-
g_string_append (str
, "DESCRIPTIVES ");
+
ds_put_cstr (&dss
, "DESCRIPTIVES ");
if (homogeneity)
if (homogeneity)
-
g_string_append (str
, "HOMOGENEITY ");
+
ds_put_cstr (&dss
, "HOMOGENEITY ");
}
for (i = 0 ; i < ow->contrasts_array->len ; ++i )
}
for (i = 0 ; i < ow->contrasts_array->len ; ++i )
@@
-268,7
+251,7
@@
static gchar * generate_syntax (const struct oneway_anova_dialog *ow)
GtkTreeIter iter;
gboolean ok;
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);
for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(ls),
&iter);
@@
-279,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);
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;
}
return text;
}