X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-sheet-spec.c;h=76b3ff6436279836879f4ef127d9afbbc74f90b3;hb=03a7b96a587a58bda342b4eb5ce5f935880ba2b7;hp=560a73dd4300ad30ec4643f5b6d4f6f50d9babf0;hpb=5c210c96542db2a357cf1aa6b690ef2ea88a54b1;p=pspp diff --git a/src/ui/gui/page-sheet-spec.c b/src/ui/gui/page-sheet-spec.c index 560a73dd43..76b3ff6436 100644 --- a/src/ui/gui/page-sheet-spec.c +++ b/src/ui/gui/page-sheet-spec.c @@ -16,11 +16,12 @@ #include +#include "page-sheet-spec.h" + #include "ui/gui/text-data-import-dialog.h" #include #include -#include #include #include #include @@ -39,7 +40,6 @@ #include "libpspp/i18n.h" #include "libpspp/line-reader.h" #include "libpspp/message.h" -#include "ui/gui/checkbox-treeview.h" #include "ui/gui/dialog-common.h" #include "ui/gui/executor.h" #include "ui/gui/helper.h" @@ -49,11 +49,13 @@ #include "ui/gui/psppire-encoding-selector.h" #include "ui/gui/psppire-empty-list-store.h" #include "ui/gui/psppire-var-sheet.h" -#include "ui/gui/psppire-var-store.h" #include "ui/gui/psppire-scanf.h" #include "ui/syntax-gen.h" -#include "gl/error.h" +#include "ui/gui/psppire-spreadsheet-model.h" + +#include + #include "gl/intprops.h" #include "gl/xalloc.h" @@ -63,36 +65,111 @@ struct import_assistant; - - /* The "sheet-spec" page of the assistant. */ +/* The sheet_spec page of the assistant (only relevant for spreadsheet imports). */ +struct sheet_spec_page + { + GtkWidget *page; + struct casereader *reader; + struct dictionary *dict; + + struct spreadsheet_read_options opts; + }; + + +char * +sheet_spec_gen_syntax (const struct import_assistant *ia) +{ + const struct sheet_spec_page *ssp = ia->sheet_spec; + GtkBuilder *builder = ia->asst.builder; + GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry"); + const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry)); + + struct string s = DS_EMPTY_INITIALIZER; + + syntax_gen_pspp (&s, + "GET DATA" + "\n /TYPE=%ss" + "\n /FILE=%sq" + "\n /SHEET=index %d" + "\n /READNAMES=%ss", + (ia->spreadsheet->type == SPREADSHEET_GNUMERIC) ? "GNM" : "ODS", + ia->file.file_name, + ssp->opts.sheet_index, + ssp->opts.read_names ? "ON" : "OFF"); + + + if (range && 0 != strcmp ("", range)) + { + syntax_gen_pspp (&s, + "\n /CELLRANGE=RANGE %sq", range); + } + else + { + syntax_gen_pspp (&s, + "\n /CELLRANGE=FULL"); + } + + + syntax_gen_pspp (&s, "."); + + + return ds_cstr (&s); +} + + +static void +on_sheet_combo_changed (GtkComboBox *cb, struct import_assistant *ia) +{ + GtkTreeIter iter; + gchar *range = NULL; + GtkTreeModel *model = gtk_combo_box_get_model (cb); + GtkBuilder *builder = ia->asst.builder; + GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry"); + + gtk_combo_box_get_active_iter (cb, &iter); + gtk_tree_model_get (model, &iter, PSPPIRE_SPREADSHEET_MODEL_COL_RANGE, &range, -1); + gtk_entry_set_text (GTK_ENTRY (range_entry), range ? range : ""); + g_free (range); +} /* Initializes IA's sheet_spec substructure. */ -void -init_sheet_spec_page (struct import_assistant *ia) +struct sheet_spec_page * +sheet_spec_page_create (struct import_assistant *ia) { GtkBuilder *builder = ia->asst.builder; - struct sheet_spec_page *p = &ia->sheet_spec; + struct sheet_spec_page *p = xzalloc (sizeof (*p)); + + GtkWidget *combo_box = get_widget_assert (builder, "sheet-entry"); + GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer, + "text", 0, + NULL); - p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Sheet"), - GTK_ASSISTANT_PAGE_INTRO); + g_signal_connect (combo_box, "changed", G_CALLBACK (on_sheet_combo_changed), ia); + add_page_to_assistant (ia, get_widget_assert (builder, "Sheet"), + GTK_ASSISTANT_PAGE_INTRO); + + return p; } /* Prepares IA's sheet_spec page. */ void prepare_sheet_spec_page (struct import_assistant *ia) { - struct sheet_spec_page *p = &ia->sheet_spec; - GtkBuilder *builder = ia->asst.builder; GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry"); + GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox"); + + gtk_combo_box_set_model (GTK_COMBO_BOX (sheet_entry), + psppire_spreadsheet_model_new (ia->spreadsheet)); - printf ("%s %d\n", __FUNCTION__, p->spreadsheet->sheets); + gtk_combo_box_set_active (GTK_COMBO_BOX (sheet_entry), 0); - gtk_spin_button_set_digits (GTK_SPIN_BUTTON (sheet_entry), 0); - gtk_spin_button_set_range (GTK_SPIN_BUTTON (sheet_entry), 1, p->spreadsheet->sheets); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (readnames_checkbox), FALSE); } @@ -100,7 +177,13 @@ prepare_sheet_spec_page (struct import_assistant *ia) void reset_sheet_spec_page (struct import_assistant *ia) { - printf ("%s\n", __FUNCTION__); + GtkBuilder *builder = ia->asst.builder; + GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry"); + GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox"); + + gtk_combo_box_set_active (GTK_COMBO_BOX (sheet_entry), 0); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (readnames_checkbox), FALSE); } /* Called when the Forward button is clicked, @@ -116,47 +199,36 @@ post_sheet_spec_page (struct import_assistant *ia) GtkBuilder *builder = ia->asst.builder; - struct file *file = &ia->file; - struct sheet_spec_page *ssp = &ia->sheet_spec; + struct sheet_spec_page *ssp = ia->sheet_spec; struct casereader *creader = NULL; struct dictionary *dict = NULL; - GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry"); - GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry"); GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox"); - - gint num = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (sheet_entry)); - + GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry"); const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry)); + GtkWidget *combo_box = get_widget_assert (builder, "sheet-entry"); - if ( num < 1 ) - num = 1; + gint num = gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box)); ssp->opts.sheet_name = NULL; ssp->opts.cell_range = NULL; - ssp->opts.sheet_index = num; + ssp->opts.sheet_index = num + 1; if ( convert_cell_ref (range, &col_start, &row_start, &col_stop, &row_stop)) { - ssp->opts.cell_range = range; + ssp->opts.cell_range = g_strdup (range); } - ssp->sri.file_name = file->file_name; - ssp->sri.read_names = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (readnames_checkbox)); - ssp->sri.asw = -1; + ssp->opts.read_names = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (readnames_checkbox)); + ssp->opts.asw = -1; - switch (ssp->spreadsheet->type) + switch (ia->spreadsheet->type) { case SPREADSHEET_ODS: - { - creader = ods_make_reader (ssp->spreadsheet, &ssp->sri, &ssp->opts); - dict = ssp->spreadsheet->dict; - } - break; case SPREADSHEET_GNUMERIC: { - creader = gnumeric_make_reader (ssp->spreadsheet, &ssp->sri, &ssp->opts); - dict = ssp->spreadsheet->dict; + creader = spreadsheet_make_reader (ia->spreadsheet, &ssp->opts); + dict = ia->spreadsheet->dict; } break; default: @@ -184,3 +256,55 @@ post_sheet_spec_page (struct import_assistant *ia) } } + +/* + Update IA according to the contents of DICT and CREADER. + CREADER will be destroyed by this function. +*/ +void +update_assistant (struct import_assistant *ia) +{ + struct sheet_spec_page *ssp = ia->sheet_spec; + int rows = 0; + + if (ssp->dict) + { + struct ccase *c; + int col; + + ia->column_cnt = dict_get_var_cnt (ssp->dict); + ia->columns = xcalloc (ia->column_cnt, sizeof (*ia->columns)); + for (col = 0; col < ia->column_cnt ; ++col) + { + const struct variable *var = dict_get_var (ssp->dict, col); + ia->columns[col].name = xstrdup (var_get_name (var)); + ia->columns[col].contents = NULL; + } + + for (; (c = casereader_read (ssp->reader)) != NULL; case_unref (c)) + { + rows++; + for (col = 0; col < ia->column_cnt ; ++col) + { + char *ss; + const struct variable *var = dict_get_var (ssp->dict, col); + + ia->columns[col].contents = xrealloc (ia->columns[col].contents, + sizeof (struct substring) * rows); + + ss = data_out (case_data (c, var), dict_get_encoding (ssp->dict), + var_get_print_format (var)); + + ia->columns[col].contents[rows - 1] = ss_cstr (ss); + } + + if (rows > MAX_PREVIEW_LINES) + { + case_unref (c); + break; + } + } + } + + ia->file.line_cnt = rows; +}