/* 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);
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
{
PsppireDialogActionOneway *ow = PSPPIRE_DIALOG_ACTION_ONEWAY (act);
gchar *text;
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 ");
}
-
+ 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);
}
-
-
-static void
-psppire_dialog_action_oneway_activate (GtkAction *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);
- GtkBuilder *xml = builder_new ("oneway.ui");
- GtkWidget *contrasts_button =
- get_widget_assert (xml, "contrasts-button");
+ GtkBuilder *xml = builder_new ( "oneway.ui");
+
+ 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);
-
- g_object_unref (xml);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_oneway_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_oneway_parent_class)->activate (pda);
+ return xml;
}
static void
psppire_dialog_action_oneway_class_init (PsppireDialogActionOnewayClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = 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);
-\f
+ 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));
+
+ 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)
projects / pspp / blobdiff