psppire-dialog-action-crosstabs: Do not add PIVOT or NOPIVOT to command.

[pspp] / src / ui / gui / psppire-dialog-action-crosstabs.c

diff --git a/src/ui/gui/psppire-dialog-action-crosstabs.c b/src/ui/gui/psppire-dialog-action-crosstabs.c
index 6fc41de0d41bee20f0fa8388413ebc2cb2610128..3c2bd5957943a142efd149ded6942268efd2a08b 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-crosstabs.c
+++ b/src/ui/gui/psppire-dialog-action-crosstabs.c
@@ -67,37 +67,39 @@ refresh (PsppireDialogAction *rd_)
   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
@@ -105,7 +107,7 @@ enum
 
 enum
   {
-#define CS(NAME, LABEL) CS_##NAME,
+#define CS(NAME, LABEL, TOOLTIP) CS_##NAME,
     CROSSTABS_CELLS
 #undef CS
     N_CROSSTABS_CELLS
@@ -113,7 +115,7 @@ enum
 
 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
@@ -126,17 +128,17 @@ enum
 
 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
   };
 
@@ -294,13 +296,6 @@ generate_syntax (const PsppireDialogAction *a)
     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;