#include <ui/gui/dict-display.h>
#include "executor.h"
#include <ui/gui/psppire-dialog.h>
-#include <ui/gui/psppire-var-store.h>
#include <ui/gui/builder-wrapper.h>
#include "helper.h"
#define N_(msgid) msgid
-#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")) \
+#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 (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")) \
+#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"))
enum
struct crosstabs_dialog cd;
GtkBuilder *xml = builder_new ("crosstabs.ui");
- PsppireVarStore *vs = NULL;
PsppireDict *dict = NULL;
cd.stat_view = get_widget_assert (xml, "stats-view");
cd.cell_view = get_widget_assert (xml, "cell-view");
- g_object_get (de->data_editor, "var-store", &vs, NULL);
-
put_checkbox_items_in_treeview (GTK_TREE_VIEW(cd.stat_view),
B_CS_STATS_DEFAULT,
N_CROSSTABS_STATS,
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
- g_object_get (vs, "dictionary", &dict, NULL);
+ g_object_get (de->data_editor, "dictionary", &dict, NULL);
g_object_set (source, "model", dict, NULL);
cd.row_vars = GTK_TREE_VIEW (dest_rows);
cd.col_vars = GTK_TREE_VIEW (dest_cols);
- g_object_get (vs, "dictionary", &cd.dict, NULL);
+ g_object_get (de->data_editor, "dictionary", &cd.dict, NULL);
cd.format_dialog = get_widget_assert (xml, "format-dialog");
cd.table_button = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "print-tables"));
cd.pivot_button = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "pivot"));