X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-sheet.c;h=3d018d0f2c5c40f6440194f1649625badac663d3;hb=8fa97cbb0299bddaa217bb23dcbac3e6f2503cd1;hp=29e0309c9ea4eacff07a1dd43ae7b92f2a0fb84a;hpb=2dd0df69f627a06ffb887128d22e3d686d1cd207;p=pspp-builds.git diff --git a/src/ui/gui/data-sheet.c b/src/ui/gui/data-sheet.c index 29e0309c..3d018d0f 100644 --- a/src/ui/gui/data-sheet.c +++ b/src/ui/gui/data-sheet.c @@ -1,7 +1,6 @@ -/* +/* PSPPIRE --- A Graphical User Interface for PSPP Copyright (C) 2004, 2005, 2006 Free Software Foundation - Written by John Darrington 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 @@ -16,9 +15,10 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. + 02110-1301, USA. */ +#include #include #include @@ -29,7 +29,6 @@ #include #include "psppire-dict.h" -#include "psppire-variable.h" #include "psppire-data-store.h" #include "helper.h" @@ -37,93 +36,50 @@ #include #include -#include "menu-actions.h" #include "data-sheet.h" - -extern GladeXML *xml; - - -static gboolean -traverse_callback (GtkSheet * sheet, - gint row, gint col, - gint *new_row, gint *new_column - ) -{ - PsppireDataStore *data_store = PSPPIRE_DATA_STORE(gtk_sheet_get_model(sheet)); - - const gint n_vars = psppire_dict_get_var_cnt(data_store->dict); - - if ( *new_column >= n_vars ) - return FALSE; - - return TRUE; -} - - - -/* Callback which occurs when the column title is double clicked */ static gboolean -click2column(GtkWidget *w, gint col, gpointer data) +traverse_callback (GtkSheet * sheet, + gint row, gint col, + gint *new_row, gint *new_column + ) { - gint current_row, current_column; - GtkWidget *var_sheet = get_widget_assert(xml, "variable_sheet"); - - select_sheet(PAGE_VAR_SHEET); + gint case_count; + gint n_vars; - gtk_sheet_get_active_cell(GTK_SHEET(var_sheet), - ¤t_row, ¤t_column); + PsppireDataStore *data_store = + PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet)); - gtk_sheet_set_active_cell(GTK_SHEET(var_sheet), col, current_column); - return FALSE; -} + g_assert (data_store); + n_vars = psppire_dict_get_var_cnt (data_store->dict); -/* Update the data_ref_entry with the reference of the active cell */ -gint -update_data_ref_entry(const GtkSheet *sheet, gint row, gint col) -{ + if ( *new_column >= n_vars ) + return FALSE; - /* The entry where the reference to the current cell is displayed */ - GtkEntry *cell_ref_entry; + case_count = psppire_case_file_get_case_count (data_store->case_file); - PsppireDataStore *data_store = PSPPIRE_DATA_STORE(gtk_sheet_get_model(sheet)); - if (data_store) + if ( *new_row >= case_count ) { - const struct PsppireVariable *pv = - psppire_dict_get_variable(data_store->dict, col); - - gchar *text ; - gchar *s ; - - if ( !xml) - return FALSE; - - text = g_strdup_printf("%d: %s", row, - pv ? psppire_variable_get_name(pv) : ""); - - cell_ref_entry = GTK_ENTRY(get_widget_assert(xml, "cell_ref_entry")); + gint i; - s = pspp_locale_to_utf8(text, -1, 0); + for ( i = case_count ; i <= *new_row; ++i ) + psppire_data_store_insert_new_case (data_store, i); - g_free(text); - - gtk_entry_set_text(cell_ref_entry, s); - - g_free(s); + return TRUE; } - return FALSE; + return TRUE; } -extern PsppireDataStore *data_store ; +extern PsppireDataStore *the_data_store ; /* Return the width that an 'M' character would occupy when typeset in WIDGET */ -static guint -calc_m_width(GtkWidget *widget, const PangoFontDescription *font_desc) +static guint +calc_m_width (GtkWidget *widget, const PangoFontDescription *font_desc) { PangoRectangle rect; PangoLayout *layout ; @@ -135,56 +91,55 @@ calc_m_width(GtkWidget *widget, const PangoFontDescription *font_desc) g_assert (layout); pango_layout_set_text (layout, "M", 1); - + pango_layout_set_font_description (layout, font_desc); pango_layout_get_extents (layout, NULL, &rect); - g_object_unref(G_OBJECT(layout)); - g_object_unref(G_OBJECT(context)); + g_object_unref (G_OBJECT (layout)); + g_object_unref (G_OBJECT (context)); - return PANGO_PIXELS(rect.width); + return PANGO_PIXELS (rect.width); } void -font_change_callback(GObject *obj, gpointer data) +font_change_callback (GObject *obj, gpointer data) { GtkWidget *sheet = data; - PsppireDataStore *ds = PSPPIRE_DATA_STORE(obj); + PsppireDataStore *ds = PSPPIRE_DATA_STORE (obj); - ds->width_of_m = calc_m_width(sheet, ds->font_desc); + ds->width_of_m = calc_m_width (sheet, ds->font_desc); } -GtkWidget* + + +G_MODULE_EXPORT GtkWidget* psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2) { GtkWidget *sheet; - sheet = gtk_sheet_new(G_SHEET_ROW(data_store), - G_SHEET_COLUMN(data_store), "data sheet", 0); + sheet = gtk_sheet_new (G_SHEET_ROW (the_data_store), + G_SHEET_COLUMN (the_data_store), "data sheet", 0); - data_store->width_of_m = calc_m_width(sheet, data_store->font_desc); - - g_signal_connect (G_OBJECT (sheet), "activate", - G_CALLBACK (update_data_ref_entry), - 0); + the_data_store->width_of_m = calc_m_width (sheet, the_data_store->font_desc); g_signal_connect (G_OBJECT (sheet), "traverse", G_CALLBACK (traverse_callback), 0); - g_signal_connect (G_OBJECT (sheet), "double-click-column", - G_CALLBACK (click2column), - 0); - - g_signal_connect (G_OBJECT (data_store), "font-changed", + g_signal_connect (G_OBJECT (the_data_store), "font-changed", G_CALLBACK (font_change_callback), sheet); - gtk_sheet_set_active_cell(GTK_SHEET(sheet), -1, -1); - gtk_widget_show(sheet); + gtk_sheet_set_active_cell (GTK_SHEET (sheet), -1, -1); + + gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_data_store)); + + gtk_sheet_set_autoscroll (GTK_SHEET (sheet), FALSE); + + gtk_widget_show (sheet); return sheet; }