projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug in oneway /descriptives subcommand vs. weights.
[pspp]
/
src
/
ui
/
gui
/
t-test-one-sample.c
diff --git
a/src/ui/gui/t-test-one-sample.c
b/src/ui/gui/t-test-one-sample.c
index f92a32f92eaf3c3dcd39e71e01368a641cf24518..ea92a9212946f05a5fdf9a932751c80616a496de 100644
(file)
--- a/
src/ui/gui/t-test-one-sample.c
+++ b/
src/ui/gui/t-test-one-sample.c
@@
-17,22
+17,21
@@
#include <config.h>
#include <config.h>
-#include <glade/glade.h>
#include <gtk/gtk.h>
#include "t-test-one-sample.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include <gtk/gtk.h>
#include "t-test-one-sample.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
+#include "psppire-var-view.h"
#include "helper.h"
#include "helper.h"
-#include <gtksheet/gtksheet.h>
-#include "data-editor.h"
+#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "dict-display.h"
#include "widget-io.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "dict-display.h"
#include "widget-io.h"
+#include "executor.h"
#include "t-test-options.h"
#include <language/syntax-string-source.h>
#include "t-test-options.h"
#include <language/syntax-string-source.h>
-#include "syntax-editor.h"
#include <gettext.h>
#define _(msgid) gettext (msgid)
#include <gettext.h>
#define _(msgid) gettext (msgid)
@@
-60,7
+59,7
@@
generate_syntax (const struct tt_one_sample_dialog *d)
g_string_append (str, "\n\t/VARIABLES=");
g_string_append (str, "\n\t/VARIABLES=");
-
append_variable_names (str, d->dict, GTK_TREE_VIEW (d->vars_treeview), 0
);
+
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (d->vars_treeview), 0, str
);
tt_options_dialog_append_syntax (d->opt, str);
tt_options_dialog_append_syntax (d->opt, str);
@@
-121,18
+120,14
@@
dialog_state_valid (gpointer data)
/* Pops up the dialog box */
void
/* Pops up the dialog box */
void
-t_test_one_sample_dialog (
GObject *o, gpointer data
)
+t_test_one_sample_dialog (
PsppireDataWindow *de
)
{
struct tt_one_sample_dialog tt_d;
gint response;
{
struct tt_one_sample_dialog tt_d;
gint response;
- struct data_editor *de = data;
- PsppireVarStore *vs;
+ PsppireVarStore *vs
= NULL
;
- GladeXML *xml = XML_NEW ("t-test.glade");
-
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+ GtkBuilder *xml = builder_new ("t-test.ui");
GtkWidget *dict_view =
get_widget_assert (xml, "one-sample-t-test-treeview2");
GtkWidget *dict_view =
get_widget_assert (xml, "one-sample-t-test-treeview2");
@@
-140,33
+135,21
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
GtkWidget *options_button =
get_widget_assert (xml, "button1");
GtkWidget *options_button =
get_widget_assert (xml, "button1");
- GtkWidget *selector = get_widget_assert (xml, "psppire-selector1");
-
GtkWidget *dialog = get_widget_assert (xml, "t-test-one-sample-dialog");
GtkWidget *dialog = get_widget_assert (xml, "t-test-one-sample-dialog");
-
vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet)
);
+
g_object_get (de->data_editor, "var-store", &vs, NULL
);
-
tt_d.dict = vs->dict
;
+
g_object_get (vs, "dictionary", &tt_d.dict, NULL)
;
tt_d.vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
tt_d.test_value_entry = get_widget_assert (xml, "test-value-entry");
tt_d.vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
tt_d.test_value_entry = get_widget_assert (xml, "test-value-entry");
- tt_d.opt = tt_options_dialog_create (xml, de->parent.window);
-
- gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
-
- attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
- vs->dict,
- GTK_SELECTION_MULTIPLE,
- var_is_numeric);
+ tt_d.opt = tt_options_dialog_create (xml, GTK_WINDOW (de));
- set_dest_model (GTK_TREE_VIEW (tt_d.vars_treeview), vs->dict);
-
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- dict_view, tt_d.vars_treeview,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
+ g_object_set (dict_view, "model",
+ tt_d.dict,
+ "predicate",
+ var_is_numeric, NULL);
g_signal_connect_swapped (dialog, "refresh",
G_CALLBACK (refresh), &tt_d);
g_signal_connect_swapped (dialog, "refresh",
G_CALLBACK (refresh), &tt_d);
@@
-185,6
+168,7
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-195,10
+179,7
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
{
gchar *syntax = generate_syntax (&tt_d);
{
gchar *syntax = generate_syntax (&tt_d);
- struct syntax_editor *se =
- (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
- gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
+ paste_syntax_to_window (syntax);
g_free (syntax);
}
g_free (syntax);
}