GtkTreeIter notused;
- return (gtk_tree_model_get_iter_first (row_vars, ¬used)
+ return (gtk_tree_model_get_iter_first (row_vars, ¬used)
&& gtk_tree_model_get_iter_first (col_vars, ¬used));
}
GtkTreeModel *liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->dest_rows));
gtk_list_store_clear (GTK_LIST_STORE (liststore));
-
+
liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->dest_cols));
gtk_list_store_clear (GTK_LIST_STORE (liststore));
}
-#define CROSSTABS_STATS \
- CS (CHISQ, N_("Chisq")) \
- CS (PHI, N_("Phi")) \
- CS (CC, N_("CC")) \
- CS (LAMBDA, N_("Lambda")) \
- CS (UC, N_("UC")) \
- CS (BTAU, N_("BTau")) \
- CS (CTAU, N_("CTau")) \
- CS (RISK, N_("Risk")) \
- CS (GAMMA, N_("Gamma")) \
- CS (D, N_("D")) \
- CS (KAPPA, N_("Kappa")) \
- CS (ETA, N_("Eta")) \
- CS (CORR, N_("Corr")) \
- CS (STATS_NONE, N_("None"))
-
-
-#define CROSSTABS_CELLS \
- CS (COUNT, N_("Count")) \
- CS (ROW, N_("Row")) \
- CS (COLUMN, N_("Column")) \
- CS (TOTAL, N_("Total")) \
- CS (EXPECTED, N_("Expected")) \
- CS (RESIDUAL, N_("Residual")) \
- CS (SRESIDUAL, N_("Std. Residual")) \
- CS (ASRESIDUAL, N_("Adjusted Std. Residual")) \
- CS (CELLS_NONE, N_("None"))
+#define CROSSTABS_STATS \
+ CS (CHISQ, N_("Chisq"), N_("Pearson chi-square, " \
+ "likelihood ratio, Fisher’s exact test, continuity correction, " \
+ "linear-by-linear association.")) \
+ CS (PHI, N_("Phi and Cramer's V"), NULL) \
+ CS (CC, N_("CC"), N_("Contingency coefficient")) \
+ CS (LAMBDA, N_("Lambda"), NULL) \
+ CS (UC, N_("UC"), N_("Uncertainty coefficient")) \
+ CS (BTAU, N_("BTau"), N_("Kendall's Tau-b")) \
+ CS (CTAU, N_("CTau"), N_("Kendall's Tau-c")) \
+ CS (RISK, N_("Risk"), N_("Relative Risk estimate")) \
+ CS (GAMMA, N_("Gamma"), NULL) \
+ CS (D, N_("D"), N_("Somer's d")) \
+ CS (KAPPA, N_("Kappa"), N_("Cohen's Kappa")) \
+ CS (ETA, N_("Eta"), NULL) \
+ CS (CORR, N_("Corr"), N_("Spearman correlation, Pearson's r")) \
+ CS (STATS_NONE, N_("None"), NULL)
+
+
+#define CROSSTABS_CELLS \
+ CS (COUNT, N_("Count"), N_("Frequency Count")) \
+ CS (ROW, N_("Row"), N_("Row percent")) \
+ CS (COLUMN, N_("Column"), N_("Column percent")) \
+ CS (TOTAL, N_("Total"), N_("Total percent")) \
+ CS (EXPECTED, N_("Expected"), N_("Expected value")) \
+ CS (RESIDUAL, N_("Residual"), NULL) \
+ CS (SRESIDUAL, N_("Std. Residual"), N_("Standardized Residual")) \
+ CS (ASRESIDUAL, N_("Adjusted Std. Residual"), NULL) \
+ CS (CELLS_NONE, N_("None"), NULL)
enum
{
-#define CS(NAME, LABEL) CS_##NAME,
+#define CS(NAME, LABEL, TOOLTIP) CS_##NAME,
CROSSTABS_STATS
#undef CS
N_CROSSTABS_STATS
enum
{
-#define CS(NAME, LABEL) CS_##NAME,
+#define CS(NAME, LABEL, TOOLTIP) CS_##NAME,
CROSSTABS_CELLS
#undef CS
N_CROSSTABS_CELLS
enum
{
-#define CS(NAME, LABEL) B_CS_##NAME = 1u << CS_##NAME,
+#define CS(NAME, LABEL, TOOLTIP) B_CS_##NAME = 1u << CS_##NAME,
CROSSTABS_STATS
CROSSTABS_CELLS
#undef CS
static const struct checkbox_entry_item stats[] =
{
-#define CS(NAME, LABEL) {#NAME, LABEL},
+#define CS(NAME, LABEL, TOOLTIP) {#NAME, LABEL, TOOLTIP},
CROSSTABS_STATS \
- CS(NONE, N_("None"))
+ CS(NONE, N_("None"), NULL)
#undef CS
};
static const struct checkbox_entry_item cells[] =
{
-#define CS(NAME, LABEL) {#NAME, LABEL},
+#define CS(NAME, LABEL, TOOLTIP) {#NAME, LABEL, TOOLTIP},
CROSSTABS_CELLS \
- CS(NONE, N_("None"))
+ CS(NONE, N_("None"), NULL)
#undef CS
};
ret = psppire_dialog_run (PSPPIRE_DIALOG (cd->format_dialog));
- if ( ret == PSPPIRE_RESPONSE_CONTINUE )
+ if (ret == PSPPIRE_RESPONSE_CONTINUE)
{
cd->format_options_avalue =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->avalue_button));
cd->format_options_table =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->table_button));
- cd->format_options_pivot =
+ cd->format_options_pivot =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->pivot_button));
}
}
gint ret = psppire_dialog_run (PSPPIRE_DIALOG (cd->cell_dialog));
- if ( ret == PSPPIRE_RESPONSE_CONTINUE )
+ if (ret == PSPPIRE_RESPONSE_CONTINUE)
{
g_object_unref (liststore);
}
gint ret = psppire_dialog_run (PSPPIRE_DIALOG (cd->stat_dialog));
- if ( ret == PSPPIRE_RESPONSE_CONTINUE )
+ if (ret == PSPPIRE_RESPONSE_CONTINUE)
{
g_object_unref (liststore);
}
}
-static void
-psppire_dialog_action_crosstabs_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_crosstabs_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogActionCrosstabs *act = PSPPIRE_DIALOG_ACTION_CROSSTABS (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
act->table_button = get_widget_assert (xml, "print-tables");
act->pivot_button = get_widget_assert (xml, "pivot");
-
- g_object_unref (xml);
-
act->format_options_avalue = TRUE;
act->format_options_table = TRUE;
act->format_options_pivot = TRUE;
psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->cell_view),
- B_CS_CELL_DEFAULT,
- N_CROSSTABS_CELLS,
- cells);
+ B_CS_CELL_DEFAULT,
+ N_CROSSTABS_CELLS,
+ cells);
act->cell = gtk_tree_view_get_model (GTK_TREE_VIEW (act->cell_view));
psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
- B_CS_STATS_DEFAULT,
- N_CROSSTABS_STATS,
- stats);
+ B_CS_STATS_DEFAULT,
+ N_CROSSTABS_STATS,
+ stats);
act->stat = gtk_tree_view_get_model (GTK_TREE_VIEW (act->stat_view));
psppire_dialog_action_set_refresh (pda, refresh);
psppire_dialog_action_set_valid_predicate (pda,
- dialog_state_valid);
+ dialog_state_valid);
g_signal_connect_swapped (act->cell_button, "clicked",
G_CALLBACK (on_cell_clicked), act);
g_signal_connect_swapped (act->format_button, "clicked",
G_CALLBACK (on_format_clicked), act);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_crosstabs_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_crosstabs_parent_class)->activate (pda);
+ return xml;
}
static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (const PsppireDialogAction *a)
{
PsppireDialogActionCrosstabs *cd = PSPPIRE_DIALOG_ACTION_CROSSTABS (a);
gchar *text = NULL;
if (cd->format_options_avalue)
g_string_append (string, "AVALUE");
- else
+ else
g_string_append (string, "DVALUE");
g_string_append (string, " ");
g_string_append (string, "TABLES");
else
g_string_append (string, "NOTABLES");
- g_string_append (string, " ");
-
- if (cd->format_options_pivot)
- g_string_append (string, "PIVOT");
- else
- g_string_append (string, "NOPIVOT");
-
selected = 0;
- for (i = 0, ok = gtk_tree_model_get_iter_first (cd->stat, &iter); ok;
+ for (i = 0, ok = gtk_tree_model_get_iter_first (cd->stat, &iter); ok;
i++, ok = gtk_tree_model_iter_next (cd->stat, &iter))
{
gboolean toggled;
gtk_tree_model_get (cd->stat, &iter,
- CHECKBOX_COLUMN_SELECTED, &toggled, -1);
- if (toggled)
- selected |= 1u << i;
- else
+ CHECKBOX_COLUMN_SELECTED, &toggled, -1);
+ if (toggled)
+ selected |= 1u << i;
+ else
selected &= ~(1u << i);
}
}
selected = 0;
- for (i = 0, ok = gtk_tree_model_get_iter_first (cd->cell, &iter); ok;
+ for (i = 0, ok = gtk_tree_model_get_iter_first (cd->cell, &iter); ok;
i++, ok = gtk_tree_model_iter_next (cd->cell, &iter))
{
gboolean toggled;
gtk_tree_model_get (cd->cell, &iter,
- CHECKBOX_COLUMN_SELECTED, &toggled, -1);
- if (toggled)
- selected |= 1u << i;
- else
+ CHECKBOX_COLUMN_SELECTED, &toggled, -1);
+ if (toggled)
+ selected |= 1u << i;
+ else
selected &= ~(1u << i);
}
static void
psppire_dialog_action_crosstabs_class_init (PsppireDialogActionCrosstabsClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_crosstabs_activate;
-
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_crosstabs_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
psppire_dialog_action_crosstabs_init (PsppireDialogActionCrosstabs *act)
{
}
-
projects / pspp / blobdiff