projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
table-casereader: Put space between columns.
[pspp]
/
src
/
ui
/
gui
/
t-test-independent-samples-dialog.c
diff --git
a/src/ui/gui/t-test-independent-samples-dialog.c
b/src/ui/gui/t-test-independent-samples-dialog.c
index 473e04e02b2f86d09dd150862cff4baadb4e78dd..2da218e529058762dff7fe321848b4bb317189ff 100644
(file)
--- a/
src/ui/gui/t-test-independent-samples-dialog.c
+++ b/
src/ui/gui/t-test-independent-samples-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2009 Free Software Foundation
+ Copyright (C) 2007, 2009
, 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
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
@@
-21,6
+21,7
@@
#include "t-test-independent-samples-dialog.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "t-test-independent-samples-dialog.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
+#include "psppire-var-view.h"
#include "executor.h"
#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "executor.h"
#include "psppire-data-window.h"
#include "psppire-dialog.h"
@@
-30,7
+31,6
@@
#include "t-test-options.h"
#include <ui/syntax-gen.h>
#include "t-test-options.h"
#include <ui/syntax-gen.h>
-#include <language/syntax-string-source.h>
#include "helper.h"
#include <gl/xalloc.h>
#include "helper.h"
#include <gl/xalloc.h>
@@
-160,7
+160,7
@@
generate_syntax (const struct tt_indep_samples_dialog *d)
GString *str = g_string_new ("T-TEST /VARIABLES=");
GString *str = g_string_new ("T-TEST /VARIABLES=");
-
append_variable_names (str, d->dict, GTK_TREE_VIEW (tv), 0
);
+
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (tv), 0, str
);
g_string_append (str, "\n\t/GROUPS=");
g_string_append (str, "\n\t/GROUPS=");
@@
-387,11
+387,10
@@
dialog_state_valid (gpointer data)
/* Pops up the dialog box */
void
/* Pops up the dialog box */
void
-t_test_independent_samples_dialog (
GObject *o, gpointer data
)
+t_test_independent_samples_dialog (
PsppireDataWindow *de
)
{
struct tt_indep_samples_dialog tt_d;
gint response;
{
struct tt_indep_samples_dialog tt_d;
gint response;
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
PsppireVarStore *vs = NULL;
PsppireVarStore *vs = NULL;
@@
-400,9
+399,6
@@
t_test_independent_samples_dialog (GObject *o, gpointer data)
GtkWidget *dict_view =
get_widget_assert (xml, "indep-samples-t-test-treeview1");
GtkWidget *dict_view =
get_widget_assert (xml, "indep-samples-t-test-treeview1");
- GtkWidget *test_variables_treeview =
- get_widget_assert (xml, "indep-samples-t-test-treeview2");
-
GtkWidget *selector2 =
get_widget_assert (xml, "indep-samples-t-test-selector2");
GtkWidget *selector2 =
get_widget_assert (xml, "indep-samples-t-test-selector2");
@@
-428,21
+424,10
@@
t_test_independent_samples_dialog (GObject *o, gpointer data)
g_object_set (dict_view, "model", tt_d.dict, NULL);
g_object_set (dict_view, "model", tt_d.dict, NULL);
- set_dest_model (GTK_TREE_VIEW (test_variables_treeview), tt_d.dict);
-
-
- psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector1),
- insert_source_row_into_tree_view,
- NULL);
-
psppire_selector_set_allow (PSPPIRE_SELECTOR (selector1),
numeric_only);
psppire_selector_set_allow (PSPPIRE_SELECTOR (selector1),
numeric_only);
- psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector2),
- insert_source_row_into_entry,
- NULL);
-
psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector2),
is_currently_in_entry);
psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector2),
is_currently_in_entry);
@@
-469,21
+454,10
@@
t_test_independent_samples_dialog (GObject *o, gpointer data)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&tt_d);
-
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (generate_syntax (&tt_d)));
break;
case PSPPIRE_RESPONSE_PASTE:
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&tt_d);
- paste_syntax_in_new_window (syntax);
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&tt_d)));
break;
default:
break;
break;
default:
break;