/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2012, 2013, 2014 Free Software Foundation
+ Copyright (C) 2012, 2013, 2014, 2019 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
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
+#define POSTHOC_BONFERRONI 0x01
+#define POSTHOC_GH 0x02
+#define POSTHOC_LSD 0x04
+#define POSTHOC_SCHEFFE 0x08
+#define POSTHOC_SIDAK 0x10
+#define POSTHOC_TUKEY 0x20
static void next (GtkWidget *widget, PsppireDialogActionOneway *);
static void prev (GtkWidget *widget, PsppireDialogActionOneway *);
+static void run_posthoc_dialog (PsppireDialogActionOneway *ow);
static void run_contrasts_dialog (PsppireDialogActionOneway *csd);
static void push_new_store (GArray *contrast_stack, PsppireDialogActionOneway *csd);
ds_put_cstr (&dss, gtk_entry_get_text (GTK_ENTRY (ow->factor_entry)));
- if (descriptives || homogeneity )
+ if (descriptives || homogeneity)
{
ds_put_cstr (&dss, "\n\t/STATISTICS=");
if (descriptives)
if (homogeneity)
ds_put_cstr (&dss, "HOMOGENEITY ");
}
-
- for (i = 0 ; i < ow->contrasts_array->len ; ++i )
+ if (ow->posthoc)
+ {
+ ds_put_cstr (&dss, "\n\t/POSTHOC=");
+ if (ow->posthoc & POSTHOC_BONFERRONI)
+ ds_put_cstr (&dss, "BONFERRONI ");
+ if (ow->posthoc & POSTHOC_GH)
+ ds_put_cstr (&dss, "GH ");
+ if (ow->posthoc & POSTHOC_LSD)
+ ds_put_cstr (&dss, "LSD ");
+ if (ow->posthoc & POSTHOC_SCHEFFE)
+ ds_put_cstr (&dss, "SCHEFFE ");
+ if (ow->posthoc & POSTHOC_SIDAK)
+ ds_put_cstr (&dss, "SIDAK ");
+ if (ow->posthoc & POSTHOC_TUKEY)
+ ds_put_cstr (&dss, "TUKEY ");
+ }
+ for (i = 0 ; i < ow->contrasts_array->len ; ++i)
{
GtkListStore *ls = g_array_index (ow->contrasts_array, GtkListStore*, i);
GtkTreeIter iter;
GtkTreeIter notused;
- if ( !gtk_tree_model_get_iter_first (vars, ¬used) )
+ if (!gtk_tree_model_get_iter_first (vars, ¬used))
return FALSE;
- if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (ow->factor_entry))))
+ if (0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (ow->factor_entry))))
return FALSE;
gtk_widget_set_sensitive (csd->prev, csd->c > 1);
- if ( csd->c > 0 )
+ if (csd->c > 0)
ls = g_array_index (csd->temp_contrasts, GtkTreeModel*, csd->c - 1);
psppire_acr_set_model (PSPPIRE_ACR (csd->acr), GTK_LIST_STORE (ls));
for (ok = gtk_tree_model_get_iter_first (ls, &iter);
ok;
ok = gtk_tree_model_iter_next (ls, &iter)
- )
+)
{
gdouble v;
gtk_tree_model_get (ls, &iter, 0, &v, -1);
g_array_sized_new (FALSE, FALSE, sizeof (GtkListStore *),
src_array->len);
- for (i = 0 ; i < src_array->len ; ++i )
+ for (i = 0 ; i < src_array->len ; ++i)
{
GtkTreeIter src_iter;
}
-
-
-static void
-psppire_dialog_action_oneway_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_oneway_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionOneway *act = PSPPIRE_DIALOG_ACTION_ONEWAY (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("oneway.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("oneway.ui");
- GtkWidget *contrasts_button =
- get_widget_assert (xml, "contrasts-button");
+ GtkWidget *contrasts_button = get_widget_assert (xml, "contrasts-button");
+/* Posthoc button */
+ GtkWidget *posthoc_button= get_widget_assert (xml, "posthoc-button");
GtkEntry *entry = GTK_ENTRY (get_widget_assert (xml, "entry1"));
pda->dialog = get_widget_assert (xml, "oneway-anova-dialog");
act->descriptives = get_widget_assert (xml, "checkbutton1");
act->homogeneity = get_widget_assert (xml, "checkbutton2");
+/* Posthoc tests dialog */
+ act->posthoc_dialog = get_widget_assert (xml, "posthoc-dialog");
+
+ act->bonferroni_button = get_widget_assert (xml, "bonferroni-button");
+ act->gh_button = get_widget_assert (xml, "gh-button");
+ act->lsd_button = get_widget_assert (xml, "lsd-button");
+ act->scheffe_button = get_widget_assert (xml, "scheffe-button");
+ act->sidak_button = get_widget_assert (xml, "sidak-button");
+ act->tukey_button = get_widget_assert (xml, "tukey-button");
+
+ g_signal_connect_swapped (posthoc_button, "clicked",
+ G_CALLBACK (run_posthoc_dialog), act);
+
+/* Contrast dialog */
act->contrasts_dialog = get_widget_assert (xml, "contrasts-dialog");
-
+
act->next = get_widget_assert (xml, "next-button");
act->prev = get_widget_assert (xml, "prev-button");
act->ctotal = get_widget_assert (xml, "entry2");
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
psppire_dialog_action_set_refresh (pda, refresh);
-
+ return xml;
}
static void
psppire_dialog_action_oneway_class_init (PsppireDialogActionOnewayClass *class)
{
- psppire_dialog_action_set_activation (class, psppire_dialog_action_oneway_activate);
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_oneway_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
{
act->contrasts_array = NULL;
act->c = -1;
-
+ act->posthoc = 0;
}
+/* Posthoc dialog */
+static void
+run_posthoc_dialog (PsppireDialogActionOneway *ow)
+{
+ gint response;
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ow->bonferroni_button),
+ ow->posthoc & POSTHOC_BONFERRONI);
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ow->gh_button),
+ ow->posthoc & POSTHOC_GH);
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ow->lsd_button),
+ ow->posthoc & POSTHOC_LSD);
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ow->scheffe_button),
+ ow->posthoc & POSTHOC_SCHEFFE);
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ow->sidak_button),
+ ow->posthoc & POSTHOC_SIDAK);
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ow->tukey_button),
+ ow->posthoc & POSTHOC_TUKEY);
+ response = psppire_dialog_run (PSPPIRE_DIALOG (ow->posthoc_dialog));
-\f
+ if (response == PSPPIRE_RESPONSE_CONTINUE)
+ {
+ ow->posthoc= 0;
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->bonferroni_button)))
+ ow->posthoc |= POSTHOC_BONFERRONI;
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->gh_button)))
+ ow->posthoc |= POSTHOC_GH;
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->lsd_button)))
+ ow->posthoc |= POSTHOC_LSD;
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->scheffe_button)))
+ ow->posthoc |= POSTHOC_SCHEFFE;
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->sidak_button)))
+ ow->posthoc |= POSTHOC_SIDAK;
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ow->tukey_button)))
+ ow->posthoc |= POSTHOC_TUKEY;
+ }
+}\f
static void
run_contrasts_dialog (PsppireDialogActionOneway *csd)
response = psppire_dialog_run (PSPPIRE_DIALOG (csd->contrasts_dialog));
- if ( response == PSPPIRE_RESPONSE_CONTINUE )
+ if (response == PSPPIRE_RESPONSE_CONTINUE)
{
csd->contrasts_array = clone_contrasts_array (csd->temp_contrasts);
}
static void
prev (GtkWidget *widget, PsppireDialogActionOneway *csd)
{
- if ( csd->c > 0 )
+ if (csd->c > 0)
--csd->c;
list_store_changed (csd);