[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp po/de.po po/en_GB.po src/ui/gui/ChangeLog ...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp po/de.po po/en_GB.po src/ui/gui/ChangeLog ... |
|
Date: |
Thu, 13 Dec 2007 07:58:21 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/12/13 07:58:20
Modified files:
po : de.po en_GB.po
src/ui/gui : ChangeLog dialog-common.c dialog-common.h
t-test-independent-samples-dialog.c
t-test.glade
Log message:
Miscellaneous T Test improvements. See bug #21760
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/pspp/po/en_GB.po?cvsroot=pspp&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/dialog-common.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/dialog-common.h?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/t-test-independent-samples-dialog.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/t-test.glade?cvsroot=pspp&r1=1.2&r2=1.3
Patches:
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- po/de.po 11 Dec 2007 11:46:05 -0000 1.83
+++ po/de.po 13 Dec 2007 07:58:20 -0000 1.84
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-12-10 21:25+0900\n"
+"POT-Creation-Date: 2007-12-12 21:07+0900\n"
"PO-Revision-Date: 2006-07-28 19:32+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -5088,7 +5088,7 @@
msgid "Value:"
msgstr "Werte:"
-#: src/ui/gui/data-editor.glade:1814 src/ui/gui/t-test.glade:365
+#: src/ui/gui/data-editor.glade:1814 src/ui/gui/t-test.glade:460
msgid "Missing Values"
msgstr "Lösewerten"
@@ -5931,50 +5931,48 @@
msgid "To End"
msgstr ""
-#: src/ui/gui/t-test.glade:54
-#, fuzzy
-msgid "Grouping Variable:"
-msgstr "Variableansicht"
+#: src/ui/gui/t-test.glade:53 src/ui/gui/t-test.glade:161
+msgid "Define Groups"
+msgstr ""
-#: src/ui/gui/t-test.glade:89 src/ui/gui/t-test.glade:545
+#: src/ui/gui/t-test.glade:88 src/ui/gui/t-test.glade:640
#, fuzzy
msgid "Test Variable(s):"
msgstr "Variableansicht"
-#: src/ui/gui/t-test.glade:162
-msgid "Define Groups"
+#: src/ui/gui/t-test.glade:174 src/ui/gui/t-test.glade:533
+msgid "Options..."
msgstr ""
-#: src/ui/gui/t-test.glade:175 src/ui/gui/t-test.glade:438
-msgid "Options..."
+#: src/ui/gui/t-test.glade:255
+msgid "_Use specified values:"
msgstr ""
-#: src/ui/gui/t-test.glade:259
+#: src/ui/gui/t-test.glade:273
+msgid "_Cut point:"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:333
msgid "Group_1 value:"
msgstr ""
-#: src/ui/gui/t-test.glade:270
+#: src/ui/gui/t-test.glade:344
msgid "Group_2 value:"
msgstr ""
-#: src/ui/gui/t-test.glade:336
+#: src/ui/gui/t-test.glade:431
msgid "Exclude cases _analysis by analysis"
msgstr ""
-#: src/ui/gui/t-test.glade:347
+#: src/ui/gui/t-test.glade:442
msgid "Exclude cases _listwise"
msgstr ""
-#: src/ui/gui/t-test.glade:459
+#: src/ui/gui/t-test.glade:554
#, fuzzy
msgid "Test Value: "
msgstr "Werte:"
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
-msgstr ""
-
#: src/ui/gui/variable-info-dialog.c:88
#, fuzzy, c-format
msgid "Label: %s\n"
@@ -6150,3 +6148,7 @@
#, c-format
msgid "could not access definition for terminal `%s'"
msgstr ""
+
+#, fuzzy
+#~ msgid "Grouping Variable:"
+#~ msgstr "Variableansicht"
Index: po/en_GB.po
===================================================================
RCS file: /sources/pspp/pspp/po/en_GB.po,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- po/en_GB.po 11 Dec 2007 11:46:05 -0000 1.99
+++ po/en_GB.po 13 Dec 2007 07:58:20 -0000 1.100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-12-10 21:25+0900\n"
+"POT-Creation-Date: 2007-12-12 21:07+0900\n"
"PO-Revision-Date: 2007-09-15 08:29+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: John Darrington <address@hidden>\n"
@@ -5047,7 +5047,7 @@
msgid "Value:"
msgstr ""
-#: src/ui/gui/data-editor.glade:1814 src/ui/gui/t-test.glade:365
+#: src/ui/gui/data-editor.glade:1814 src/ui/gui/t-test.glade:460
msgid "Missing Values"
msgstr ""
@@ -5837,47 +5837,46 @@
msgid "To End"
msgstr ""
-#: src/ui/gui/t-test.glade:54
-msgid "Grouping Variable:"
+#: src/ui/gui/t-test.glade:53 src/ui/gui/t-test.glade:161
+msgid "Define Groups"
msgstr ""
-#: src/ui/gui/t-test.glade:89 src/ui/gui/t-test.glade:545
+#: src/ui/gui/t-test.glade:88 src/ui/gui/t-test.glade:640
msgid "Test Variable(s):"
msgstr ""
-#: src/ui/gui/t-test.glade:162
-msgid "Define Groups"
+#: src/ui/gui/t-test.glade:174 src/ui/gui/t-test.glade:533
+msgid "Options..."
msgstr ""
-#: src/ui/gui/t-test.glade:175 src/ui/gui/t-test.glade:438
-msgid "Options..."
+#: src/ui/gui/t-test.glade:255
+msgid "_Use specified values:"
msgstr ""
-#: src/ui/gui/t-test.glade:259
+#: src/ui/gui/t-test.glade:273
+msgid "_Cut point:"
+msgstr ""
+
+#: src/ui/gui/t-test.glade:333
msgid "Group_1 value:"
msgstr ""
-#: src/ui/gui/t-test.glade:270
+#: src/ui/gui/t-test.glade:344
msgid "Group_2 value:"
msgstr ""
-#: src/ui/gui/t-test.glade:336
+#: src/ui/gui/t-test.glade:431
msgid "Exclude cases _analysis by analysis"
msgstr ""
-#: src/ui/gui/t-test.glade:347
+#: src/ui/gui/t-test.glade:442
msgid "Exclude cases _listwise"
msgstr ""
-#: src/ui/gui/t-test.glade:459
+#: src/ui/gui/t-test.glade:554
msgid "Test Value: "
msgstr ""
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
-msgstr ""
-
#: src/ui/gui/variable-info-dialog.c:88
#, c-format
msgid "Label: %s\n"
Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- src/ui/gui/ChangeLog 10 Dec 2007 10:21:05 -0000 1.100
+++ src/ui/gui/ChangeLog 13 Dec 2007 07:58:20 -0000 1.101
@@ -1,3 +1,12 @@
+2007-12-13 John Darrington <address@hidden>
+
+ * dialog-common.c dialog-common.h (numeric_only): New function.
+
+ * t-test-independent-samples-dialog.c: Added the ability to specify
+ groups by a threshold ("Cut Point"). Keep OK/Paste buttons insensitive,
+ until groups are properly defined. Prevented variables treeview from
+ accepting string variables.
+
2007-12-08 John Darrington <address@hidden>
* data-editor.h data-editor.c: Added hooks for one sample t-test
Index: src/ui/gui/dialog-common.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dialog-common.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/ui/gui/dialog-common.c 23 Nov 2007 10:34:54 -0000 1.4
+++ src/ui/gui/dialog-common.c 13 Dec 2007 07:58:20 -0000 1.5
@@ -236,3 +236,59 @@
return retval;
}
+
+
+/* Returns true iff the variable selected by SOURCE is numeric */
+gboolean
+numeric_only (GtkWidget *source, GtkWidget *dest)
+{
+ gboolean ok;
+ GtkTreeIter iter;
+ gboolean retval = TRUE;
+
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (source));
+
+ PsppireDict *dict;
+ GtkTreeSelection *selection;
+ GList *list, *l;
+
+ while (GTK_IS_TREE_MODEL_FILTER (model))
+ {
+ model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
+ }
+
+ dict = PSPPIRE_DICT (model);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (source));
+
+ list = gtk_tree_selection_get_selected_rows (selection, &model);
+
+ /* Iterate through the selection of the source treeview */
+ for (l = list; l ; l = l->next)
+ {
+ GtkTreePath *path = l->data;
+ GtkTreePath *fpath;
+ gint *idx;
+
+ const struct variable *v;
+
+ fpath = gtk_tree_model_filter_convert_path_to_child_path
+ (GTK_TREE_MODEL_FILTER (model), path);
+
+ idx = gtk_tree_path_get_indices (fpath);
+
+ v = psppire_dict_get_variable (dict, idx[0]);
+
+ if ( var_is_alpha (v))
+ {
+ retval = FALSE;
+ break;
+ }
+ }
+
+ g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
+ g_list_free (list);
+
+ return retval;
+}
+
Index: src/ui/gui/dialog-common.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dialog-common.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/ui/gui/dialog-common.h 23 Nov 2007 10:34:54 -0000 1.3
+++ src/ui/gui/dialog-common.h 13 Dec 2007 07:58:20 -0000 1.4
@@ -65,5 +65,14 @@
*/
gboolean homogeneous_types (GtkWidget *source, GtkWidget *dest);
+/* Returns TRUE if all of the variable(s) represented by the rows
+ currently selected by SOURCE widget, are numeric. DEST is ignored.
+
+ In other words, this function when passed as the argument to
+ psppire_selector_set_allow, ensures that the selector selects only
+ numeric variables.
+*/
+gboolean numeric_only (GtkWidget *source, GtkWidget *dest);
+
#endif
Index: src/ui/gui/t-test-independent-samples-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/t-test-independent-samples-dialog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/ui/gui/t-test-independent-samples-dialog.c 11 Dec 2007 11:46:05
-0000 1.6
+++ src/ui/gui/t-test-independent-samples-dialog.c 13 Dec 2007 07:58:20
-0000 1.7
@@ -35,29 +35,130 @@
#include <language/syntax-string-source.h>
#include "syntax-editor.h"
+#include <gl/xalloc.h>
+
#include <gettext.h>
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
+enum group_definition
+ {
+ GROUPS_UNDEF,
+ GROUPS_VALUES,
+ GROUPS_CUT_POINT
+ };
+
+struct tt_groups_dialog
+{
+ GtkWidget *dialog;
+ GtkWidget *label;
+ GtkWidget *table1;
+ GtkWidget *table2;
+ GtkWidget *hbox1;
+
+ GtkWidget *values_toggle_button;
+ GtkWidget *cut_point_toggle_button;
+
+ GtkWidget *grp_entry[2];
+ GtkWidget *cut_point_entry;
+
+ enum group_definition group_defn;
+ gchar *val[2];
+};
+
+static void
+set_group_criterion_type (GtkToggleButton *button,
+ struct tt_groups_dialog *groups)
+{
+ gboolean by_values = gtk_toggle_button_get_active (button);
+
+ gtk_widget_set_sensitive (groups->label, by_values);
+ gtk_widget_set_sensitive (groups->table2, by_values);
+
+ gtk_widget_set_sensitive (groups->hbox1, !by_values);
+}
+
+static void
+tt_groups_dialog_destroy (struct tt_groups_dialog *grps)
+{
+ g_object_unref (grps->table1);
+ g_object_unref (grps->table2);
+
+ g_free (grps->val[0]);
+ g_free (grps->val[1]);
+
+ g_free (grps);
+}
+
+static struct tt_groups_dialog *
+tt_groups_dialog_create (GladeXML *xml, GtkWindow *parent)
+{
+ struct tt_groups_dialog *grps = xmalloc (sizeof (*grps));
+
+ grps->group_defn = GROUPS_UNDEF;
+
+ grps->dialog = get_widget_assert (xml, "define-groups-dialog");
+ grps->table1 = get_widget_assert (xml, "table1");
+ grps->table2 = get_widget_assert (xml, "table2");
+ grps->label = get_widget_assert (xml, "label4");
+ grps->hbox1 = get_widget_assert (xml, "hbox1");
+
+ grps->grp_entry[0] = get_widget_assert (xml, "group1-entry");
+ grps->grp_entry[1] = get_widget_assert (xml, "group2-entry");
+ grps->cut_point_entry = get_widget_assert (xml, "cut-point-entry");
+
+ grps->cut_point_toggle_button = get_widget_assert (xml, "radiobutton4");
+ grps->values_toggle_button = get_widget_assert (xml, "radiobutton3");
+
+ g_object_ref (grps->table1);
+ g_object_ref (grps->table2);
+
+ g_signal_connect (grps->values_toggle_button, "toggled",
+ G_CALLBACK (set_group_criterion_type), grps);
+
+ gtk_window_set_transient_for (parent,
+ GTK_WINDOW (grps->dialog));
+
+
+
+ grps->val[0] = strdup ("");
+ grps->val[1] = strdup ("");
+
+ return grps;
+}
+
+
struct tt_indep_samples_dialog
{
GladeXML *xml; /* The xml that generated the widgets */
GtkWidget *dialog;
PsppireDict *dict;
- gboolean groups_defined;
+ GtkWidget *define_groups_button;
+ GtkWidget *groups_entry;
+ struct tt_groups_dialog *grps;
struct tt_options_dialog *opts;
};
+static void
+set_define_groups_sensitivity (GtkEntry *entry,
+ struct tt_indep_samples_dialog *tt_d)
+{
+ const gchar *text = gtk_entry_get_text (entry);
+
+ const struct variable *v = psppire_dict_lookup_var (tt_d->dict, text);
+
+ gtk_widget_set_sensitive (tt_d->define_groups_button, v != NULL);
+}
+
+
static gchar *
generate_syntax (const struct tt_indep_samples_dialog *d)
{
struct variable *group_variable;
gchar *text;
- GtkWidget *entry =
- get_widget_assert (d->xml, "indep-samples-t-test-entry");
GtkWidget *tv =
get_widget_assert (d->xml, "indep-samples-t-test-treeview2");
@@ -69,47 +170,48 @@
g_string_append (str, "\n\t/GROUPS=");
group_variable =
- psppire_dict_lookup_var (d->dict, gtk_entry_get_text (GTK_ENTRY (entry)));
+ psppire_dict_lookup_var (d->dict,
+ gtk_entry_get_text (GTK_ENTRY (d->groups_entry)));
g_string_append (str, var_get_name (group_variable));
- if ( d->groups_defined )
+ if (d->grps->group_defn != GROUPS_UNDEF)
{
- GtkWidget *entry1 = get_widget_assert (d->xml, "group1-entry");
- GtkWidget *entry2 = get_widget_assert (d->xml, "group2-entry");
-
- const gchar *val1 = gtk_entry_get_text (GTK_ENTRY (entry1));
- const gchar *val2 = gtk_entry_get_text (GTK_ENTRY (entry2));
-
g_string_append (str, "(");
+
if ( var_is_alpha (group_variable))
{
struct string s;
- ds_init_cstr (&s, val1);
+ ds_init_cstr (&s, d->grps->val[0]);
gen_quoted_string (&s);
g_string_append (str, ds_cstr (&s));
ds_destroy (&s);
}
else
{
- g_string_append (str, val1);
+ g_string_append (str, d->grps->val[0]);
}
+
+ if ( d->grps->group_defn == GROUPS_VALUES )
+ {
g_string_append (str, ",");
+
if ( var_is_alpha (group_variable))
{
struct string s;
- ds_init_cstr (&s, val2);
+ ds_init_cstr (&s, d->grps->val[1]);
gen_quoted_string (&s);
g_string_append (str, ds_cstr (&s));
ds_destroy (&s);
}
else
{
- g_string_append (str, val2);
+ g_string_append (str, d->grps->val[1]);
}
- g_string_append (str, ")");
}
+ g_string_append (str, ")");
+ }
tt_options_dialog_append_syntax (d->opts, str);
@@ -122,38 +224,44 @@
return text;
}
-
-
static void
-refresh (GladeXML *xml)
+refresh (struct tt_indep_samples_dialog *ttd)
{
- GtkWidget *entry =
- get_widget_assert (xml, "indep-samples-t-test-entry");
-
GtkWidget *tv =
- get_widget_assert (xml, "indep-samples-t-test-treeview2");
+ get_widget_assert (ttd->xml, "indep-samples-t-test-treeview2");
GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv));
- gtk_entry_set_text (GTK_ENTRY (entry), "");
+ gtk_entry_set_text (GTK_ENTRY (ttd->groups_entry), "");
gtk_list_store_clear (GTK_LIST_STORE (model));
+
+ gtk_widget_set_sensitive (ttd->define_groups_button, FALSE);
}
+/* Returns TRUE iff the define groups subdialog has a
+ state which defines a valid group criterion */
static gboolean
define_groups_state_valid (gpointer data)
{
- struct tt_indep_samples_dialog *d = data;
+ struct tt_groups_dialog *d = data;
- GtkWidget *entry1 = get_widget_assert (d->xml, "group1-entry");
- GtkWidget *entry2 = get_widget_assert (d->xml, "group2-entry");
-
- if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (entry1))))
+ if ( gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON (d->values_toggle_button)))
+ {
+ if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (d->grp_entry[0]))))
return FALSE;
- if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (entry2))))
+ if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (d->grp_entry[1]))))
+ return FALSE;
+ }
+ else
+ {
+ if ( 0 == strcmp ("",
+ gtk_entry_get_text (GTK_ENTRY (d->cut_point_entry))))
return FALSE;
+ }
return TRUE;
}
@@ -161,19 +269,101 @@
static void
run_define_groups (struct tt_indep_samples_dialog *ttd)
{
+ struct tt_groups_dialog *grps = ttd->grps;
+
gint response;
- GtkWidget *dialog =
- get_widget_assert (ttd->xml, "define-groups-dialog");
+ GtkWidget *box = get_widget_assert (ttd->xml, "dialog-hbox2");
+
+ const gchar *text = gtk_entry_get_text (GTK_ENTRY (ttd->groups_entry));
+
+ const struct variable *v = psppire_dict_lookup_var (ttd->dict, text);
+
+ if ( grps->table2->parent)
+ gtk_container_remove (GTK_CONTAINER (grps->table2->parent), grps->table2);
+
+ if ( grps->table1->parent)
+ gtk_container_remove (GTK_CONTAINER (grps->table1->parent), grps->table1);
+
+
+ if ( var_is_numeric (v))
+ {
+ gtk_table_attach_defaults (GTK_TABLE (grps->table1), grps->table2,
+ 1, 2, 1, 2);
+
+ gtk_container_add (GTK_CONTAINER (box), grps->table1);
+ }
+ else
+ {
+ gtk_container_add (GTK_CONTAINER (box), grps->table2);
+ grps->group_defn = GROUPS_VALUES;
+ }
+
+
+ psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (grps->dialog),
+ define_groups_state_valid, grps);
+
+ if ( grps->group_defn != GROUPS_CUT_POINT )
+ {
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON (grps->cut_point_toggle_button), TRUE);
+
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON (grps->values_toggle_button), TRUE);
+
+ gtk_entry_set_text (GTK_ENTRY (grps->grp_entry[0]), grps->val[0]);
+ gtk_entry_set_text (GTK_ENTRY (grps->grp_entry[1]), grps->val[1]);
+
+ gtk_entry_set_text (GTK_ENTRY (grps->cut_point_entry), "");
+ }
+ else
+ {
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON (grps->values_toggle_button), TRUE);
+
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON (grps->cut_point_toggle_button), TRUE);
+
+ gtk_entry_set_text (GTK_ENTRY (grps->grp_entry[0]), "");
+ gtk_entry_set_text (GTK_ENTRY (grps->grp_entry[1]), "");
+
+ gtk_entry_set_text (GTK_ENTRY (grps->cut_point_entry), grps->val[0]);
+ }
+
+ g_signal_emit_by_name (grps->grp_entry[0], "changed");
+ g_signal_emit_by_name (grps->grp_entry[1], "changed");
+ g_signal_emit_by_name (grps->cut_point_entry, "changed");
- psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
- define_groups_state_valid, ttd);
+ response = psppire_dialog_run (PSPPIRE_DIALOG (grps->dialog));
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (ttd->dialog));
+ if (response == PSPPIRE_RESPONSE_CONTINUE)
+ {
+ g_free (grps->val[0]);
+ g_free (grps->val[1]);
- response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
+ if (gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON (grps->values_toggle_button)))
+ {
+ grps->group_defn = GROUPS_VALUES;
- ttd->groups_defined = (response == PSPPIRE_RESPONSE_CONTINUE);
+ grps->val[0] =
+ strdup (gtk_entry_get_text (GTK_ENTRY (grps->grp_entry[0])));
+
+ grps->val[1] =
+ strdup (gtk_entry_get_text (GTK_ENTRY (grps->grp_entry[1])));
+ }
+ else
+ {
+ grps->group_defn = GROUPS_CUT_POINT;
+
+ grps->val[1] = NULL;
+
+ grps->val[0] =
+ strdup (gtk_entry_get_text (GTK_ENTRY (grps->cut_point_entry)));
+ }
+
+ psppire_dialog_notify_change (PSPPIRE_DIALOG (ttd->dialog));
+ }
}
@@ -183,9 +373,6 @@
{
struct tt_indep_samples_dialog *tt_d = data;
- GtkWidget *entry =
- get_widget_assert (tt_d->xml, "indep-samples-t-test-entry");
-
GtkWidget *tv_vars =
get_widget_assert (tt_d->xml, "indep-samples-t-test-treeview2");
@@ -193,17 +380,18 @@
GtkTreeIter notused;
- if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (entry))))
+ if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (tt_d->groups_entry))))
return FALSE;
-
if ( 0 == gtk_tree_model_get_iter_first (vars, ¬used))
return FALSE;
+ if ( tt_d->grps->group_defn == GROUPS_UNDEF)
+ return FALSE;
+
return TRUE;
}
-
/* Pops up the dialog box */
void
t_test_independent_samples_dialog (GObject *o, gpointer data)
@@ -231,12 +419,6 @@
GtkWidget *selector1 =
get_widget_assert (xml, "indep-samples-t-test-selector1");
- GtkWidget *entry =
- get_widget_assert (xml, "indep-samples-t-test-entry");
-
- GtkWidget *define_groups_button =
- get_widget_assert (xml, "define-groups-button");
-
GtkWidget *options_button =
get_widget_assert (xml, "options-button");
@@ -245,8 +427,12 @@
tt_d.dialog = get_widget_assert (xml, "t-test-independent-samples-dialog");
tt_d.xml = xml;
tt_d.dict = vs->dict;
- tt_d.groups_defined = FALSE;
+
+ tt_d.define_groups_button = get_widget_assert (xml, "define-groups-button");
+ tt_d.groups_entry = get_widget_assert (xml, "indep-samples-t-test-entry");
tt_d.opts = tt_options_dialog_create (xml, de->parent.window);
+ tt_d.grps = tt_groups_dialog_create (xml, de->parent.window);
+
gtk_window_set_transient_for (GTK_WINDOW (tt_d.dialog), de->parent.window);
@@ -262,13 +448,16 @@
insert_source_row_into_tree_view,
NULL);
+ psppire_selector_set_allow (PSPPIRE_SELECTOR (selector1),
+ numeric_only);
+
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
- dict_view, entry,
+ dict_view, tt_d.groups_entry,
insert_source_row_into_entry,
is_currently_in_entry);
- g_signal_connect_swapped (define_groups_button, "clicked",
+ g_signal_connect_swapped (tt_d.define_groups_button, "clicked",
G_CALLBACK (run_define_groups), &tt_d);
@@ -276,7 +465,11 @@
G_CALLBACK (tt_options_dialog_run), tt_d.opts);
- g_signal_connect_swapped (tt_d.dialog, "refresh", G_CALLBACK (refresh),
xml);
+ g_signal_connect_swapped (tt_d.dialog, "refresh", G_CALLBACK (refresh),
+ &tt_d);
+
+ g_signal_connect (tt_d.groups_entry, "changed",
+ G_CALLBACK (set_define_groups_sensitivity), &tt_d);
psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (tt_d.dialog),
@@ -312,6 +505,8 @@
}
tt_options_dialog_destroy (tt_d.opts);
+ tt_groups_dialog_destroy (tt_d.grps);
+
g_object_unref (xml);
}
Index: src/ui/gui/t-test.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/t-test.glade,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/ui/gui/t-test.glade 10 Dec 2007 10:21:06 -0000 1.2
+++ src/ui/gui/t-test.glade 13 Dec 2007 07:58:20 -0000 1.3
@@ -50,8 +50,7 @@
<widget class="GtkLabel" id="label36">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Grouping
Variable:</property>
+ <property name="label" translatable="yes">Define
Groups</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -225,9 +224,84 @@
<widget class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton3</property>
+ </widget>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Use specified
values:</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Cut
point:</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="cut-point-entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ <property name="y_padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="table2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
<child>
<widget class="GtkEntry" id="group1-entry">
<property name="visible">True</property>
@@ -278,6 +352,27 @@
</child>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_EXPAND</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x_options"></property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="padding">5</property>
</packing>
</child>