/* 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
#include "checkbox-treeview.h"
#include "crosstabs-dialog.h"
+#include "psppire-var-view.h"
#include <gtk/gtk.h>
#include <stdlib.h>
-#include <language/syntax-string-source.h>
#include <ui/gui/psppire-data-window.h>
#include <ui/gui/dialog-common.h>
#include <ui/gui/dict-display.h>
-#include "helper.h"
+#include "executor.h"
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/helper.h>
+#include <ui/gui/builder-wrapper.h>
+#include "helper.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#undef CS
};
-enum
- {
- LABEL,
- NO_LABEL,
- NO_VAL_LABEL,
- };
struct format_options
{
gboolean avalue;
GtkWidget *stat_view;
GtkWidget *cell_view;
- GtkToggleButton *label;
- GtkToggleButton *no_label;
- GtkToggleButton *no_val_label;
struct format_options current_opts;
};
on_format_clicked (struct crosstabs_dialog *cd)
{
int ret;
- gboolean lab;
- gboolean no_lab;
- gboolean no_val_lab;
if (cd->current_opts.avalue)
{
{
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));
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
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=");
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
/* 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;
-
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
+ PsppireDict *dict = NULL;
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");
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
- g_object_set (source, "dictionary", vs->dict, NULL);
-
- set_dest_model (GTK_TREE_VIEW (dest_rows), vs->dict);
- set_dest_model (GTK_TREE_VIEW (dest_cols), vs->dict);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (row_selector),
- source,
- dest_rows,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (col_selector),
- source,
- dest_cols,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
+ g_object_get (vs, "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);
- cd.dict = vs->dict;
+ g_object_get (vs, "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");
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;
projects / pspp-builds.git / blobdiff