X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcrosstabs-dialog.c;h=3cb8218b91465e09dd584ccc9e2f955aa0de049b;hb=d4ae90b2fe74d2d1427afad35d32c9e5584211ed;hp=8198520d6b686222f518dc4664d32d7db007b28d;hpb=b94025a12799b6826a772731b8f58907dca2cf5c;p=pspp diff --git a/src/ui/gui/crosstabs-dialog.c b/src/ui/gui/crosstabs-dialog.c index 8198520d6b..3cb8218b91 100644 --- a/src/ui/gui/crosstabs-dialog.c +++ b/src/ui/gui/crosstabs-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008 Free Software Foundation + Copyright (C) 2008, 2010, 2011, 2012 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 @@ -18,49 +18,49 @@ #include "checkbox-treeview.h" #include "crosstabs-dialog.h" +#include "psppire-var-view.h" #include #include -#include #include #include #include #include "executor.h" #include -#include -#include +#include +#include "helper.h" #include "gettext.h" #define _(msgid) gettext (msgid) #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 @@ -108,12 +108,6 @@ static const struct checkbox_entry_item cells[] = #undef CS }; -enum - { - LABEL, - NO_LABEL, - NO_VAL_LABEL, - }; struct format_options { gboolean avalue; @@ -140,9 +134,6 @@ struct crosstabs_dialog GtkWidget *stat_view; GtkWidget *cell_view; - GtkToggleButton *label; - GtkToggleButton *no_label; - GtkToggleButton *no_val_label; struct format_options current_opts; }; @@ -159,9 +150,6 @@ static void on_format_clicked (struct crosstabs_dialog *cd) { int ret; - gboolean lab; - gboolean no_lab; - gboolean no_val_lab; if (cd->current_opts.avalue) { @@ -175,14 +163,6 @@ on_format_clicked (struct crosstabs_dialog *cd) { gtk_toggle_button_set_active (cd->pivot_button, TRUE); } - lab = gtk_toggle_button_get_active (cd->label); - no_lab = gtk_toggle_button_get_active (cd->no_label); - no_val_lab = gtk_toggle_button_get_active (cd->no_val_label); - if (!lab) - if (!no_lab) - if (!no_val_lab) - gtk_toggle_button_set_active (cd->label, TRUE); - ret = psppire_dialog_run (PSPPIRE_DIALOG (cd->format_dialog)); @@ -195,12 +175,6 @@ on_format_clicked (struct crosstabs_dialog *cd) cd->current_opts.pivot = (gtk_toggle_button_get_active (cd->pivot_button) == TRUE) ? TRUE : FALSE; } - else - { - gtk_toggle_button_set_active (cd->label, lab); - gtk_toggle_button_set_active (cd->no_label, no_lab); - gtk_toggle_button_set_active (cd->no_val_label, no_val_lab); - } } static void @@ -259,9 +233,9 @@ generate_syntax (const struct crosstabs_dialog *cd) GString *string = g_string_new ("CROSSTABS"); g_string_append (string, "\n\t/TABLES="); - append_variable_names (string, cd->dict, GTK_TREE_VIEW (cd->row_vars), 0); + psppire_var_view_append_names (PSPPIRE_VAR_VIEW (cd->row_vars), 0, string); g_string_append (string, "\tBY\t"); - append_variable_names (string, cd->dict, GTK_TREE_VIEW (cd->col_vars), 0); + psppire_var_view_append_names (PSPPIRE_VAR_VIEW (cd->col_vars), 0, string); g_string_append (string, "\n\t/FORMAT="); @@ -274,19 +248,6 @@ generate_syntax (const struct crosstabs_dialog *cd) g_string_append (string, "DVALUE"); } g_string_append (string, " "); - if (gtk_toggle_button_get_active (cd->label)) - { - g_string_append (string, "LABELS"); - } - else if (gtk_toggle_button_get_active (cd->no_label)) - { - g_string_append (string, "NOLABELS"); - } - else if (gtk_toggle_button_get_active (cd->no_val_label)) - { - g_string_append (string, "NOVALLABS"); - } - g_string_append (string, " "); if (cd->current_opts.table) g_string_append (string, "TABLES"); else @@ -382,24 +343,19 @@ dialog_state_valid (gpointer data) /* Pops up the Crosstabs dialog box */ void -crosstabs_dialog (GObject *o, gpointer data) +crosstabs_dialog (PsppireDataWindow *de) { gint response; struct crosstabs_dialog cd; GtkBuilder *xml = builder_new ("crosstabs.ui"); - PsppireVarStore *vs = NULL; PsppireDict *dict = NULL; - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - GtkWidget *dialog = get_widget_assert (xml, "crosstabs-dialog"); GtkWidget *source = get_widget_assert (xml, "dict-treeview"); GtkWidget *dest_rows = get_widget_assert (xml, "rows"); GtkWidget *dest_cols = get_widget_assert (xml, "cols"); - GtkWidget *row_selector = get_widget_assert (xml, "row-selector"); - GtkWidget *col_selector = get_widget_assert (xml, "col-selector"); GtkWidget *format_button = get_widget_assert (xml, "format-button"); GtkWidget *stat_button = get_widget_assert (xml, "stats-button"); GtkWidget *cell_button = get_widget_assert (xml, "cell-button"); @@ -408,8 +364,6 @@ crosstabs_dialog (GObject *o, gpointer data) 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, @@ -423,29 +377,15 @@ crosstabs_dialog (GObject *o, gpointer data) 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); - set_dest_model (GTK_TREE_VIEW (dest_rows), dict); - set_dest_model (GTK_TREE_VIEW (dest_cols), dict); - - psppire_selector_set_select_func (PSPPIRE_SELECTOR (row_selector), - insert_source_row_into_tree_view, - NULL); - - psppire_selector_set_select_func (PSPPIRE_SELECTOR (col_selector), - insert_source_row_into_tree_view, - 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")); - cd.label = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "radiobutton1")); - cd.no_label = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "radiobutton2")); - cd.no_val_label = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "radiobutton3")); cd.stat_dialog = get_widget_assert (xml, "stat-dialog"); cd.cell_dialog = get_widget_assert (xml, "cell-dialog"); @@ -478,23 +418,10 @@ crosstabs_dialog (GObject *o, gpointer data) switch (response) { case GTK_RESPONSE_OK: - { - gchar *syntax = generate_syntax (&cd); - - struct getl_interface *sss = create_syntax_string_source (syntax); - execute_syntax (sss); - - g_free (syntax); - } + g_free (execute_syntax_string (de, generate_syntax (&cd))); break; case PSPPIRE_RESPONSE_PASTE: - { - gchar *syntax = generate_syntax (&cd); - - paste_syntax_in_new_window (syntax); - - g_free (syntax); - } + g_free (paste_syntax_to_window (generate_syntax (&cd))); break; default: break;