X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=f711162f725624934d37b672c3e1c2d4424026d4;hb=1c9e32859d6da9505e1904d5b0f95cfd276a734e;hp=aa118593608a52b0aba1e5d03f2097cb9e6e2a63;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index aa118593..f711162f 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -1,8 +1,7 @@ /* psppire-data-store.c - + PSPPIRE --- A Graphical User Interface for PSPP Copyright (C) 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 @@ -22,47 +21,65 @@ #include #include #include +#include +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + +#include +#include +#include +#include -#include "gtksheet.h" -#include "gsheetmodel.h" -#include "gsheet-column-iface.h" +#include +#include +#include + +#include -#include "psppire-variable.h" #include "psppire-data-store.h" +#include "psppire-case-file.h" +#include "helper.h" -#include "dictionary.h" -#include "missing-values.h" -#include "value-labels.h" -#include "data-in.h" +#include +#include +#include +#include -#include "file-handle-def.h" -#include "sys-file-writer.h" +#include +#include -#define _(A) A -#define N_(A) A static void psppire_data_store_init (PsppireDataStore *data_store); static void psppire_data_store_class_init (PsppireDataStoreClass *class); static void psppire_data_store_sheet_model_init (GSheetModelIface *iface); static void psppire_data_store_sheet_column_init (GSheetColumnIface *iface); +static void psppire_data_store_sheet_row_init (GSheetRowIface *iface); + static void psppire_data_store_finalize (GObject *object); -static const gchar *const psppire_data_store_get_string(GSheetModel *sheet_model, gint row, gint column); +static gchar *psppire_data_store_get_string (const GSheetModel *sheet_model, gint row, gint column); -static gboolean psppire_data_store_set_string(GSheetModel *model, +static gboolean psppire_data_store_set_string (GSheetModel *model, const gchar *text, gint row, gint column); -static gboolean psppire_data_store_clear_datum(GSheetModel *model, +static gboolean psppire_data_store_clear_datum (GSheetModel *model, gint row, gint column); #define MIN_COLUMNS 10 -#define max(A,B) ((A>B)?A:B) +#define TRAILING_ROWS 10 static GObjectClass *parent_class = NULL; + +enum {FONT_CHANGED, + n_SIGNALS}; + +static guint signals [n_SIGNALS]; + + inline GType psppire_data_store_get_type (void) { @@ -97,6 +114,12 @@ psppire_data_store_get_type (void) NULL }; + static const GInterfaceInfo sheet_row_info = + { + (GInterfaceInitFunc) psppire_data_store_sheet_row_init, + NULL, + NULL + }; data_store_type = g_type_register_static (G_TYPE_OBJECT, "PsppireDataStore", @@ -110,11 +133,15 @@ psppire_data_store_get_type (void) G_TYPE_SHEET_COLUMN, &sheet_column_info); + g_type_add_interface_static (data_store_type, + G_TYPE_SHEET_ROW, + &sheet_row_info); } return data_store_type; } + static void psppire_data_store_class_init (PsppireDataStoreClass *class) { @@ -124,6 +151,34 @@ psppire_data_store_class_init (PsppireDataStoreClass *class) object_class = (GObjectClass*) class; object_class->finalize = psppire_data_store_finalize; + + signals [FONT_CHANGED] = + g_signal_new ("font_changed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); +} + + + +static gint +psppire_data_store_get_var_count (const GSheetModel *model) +{ + const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); + + return psppire_dict_get_var_cnt (store->dict); +} + +static gint +psppire_data_store_get_case_count (const GSheetModel *model) +{ + const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); + + return psppire_case_file_get_case_count (store->case_file); } @@ -131,15 +186,16 @@ static void psppire_data_store_init (PsppireDataStore *data_store) { data_store->dict = 0; - data_store->cases = 0; + data_store->case_file = 0; + data_store->width_of_m = 10; } const PangoFontDescription * -psppire_data_store_get_font_desc(GSheetModel *model, +psppire_data_store_get_font_desc (const GSheetModel *model, gint row, gint column) { - PsppireDataStore *store = PSPPIRE_DATA_STORE(model); - + PsppireDataStore *store = PSPPIRE_DATA_STORE (model); + return store->font_desc; } @@ -147,6 +203,7 @@ psppire_data_store_get_font_desc(GSheetModel *model, static void psppire_data_store_sheet_model_init (GSheetModelIface *iface) { + iface->free_strings = TRUE; iface->get_string = psppire_data_store_get_string; iface->set_string = psppire_data_store_set_string; iface->clear_datum = psppire_data_store_clear_datum; @@ -156,90 +213,144 @@ psppire_data_store_sheet_model_init (GSheetModelIface *iface) iface->get_background = NULL; iface->get_font_desc = psppire_data_store_get_font_desc; iface->get_cell_border = NULL; + iface->get_column_count = psppire_data_store_get_var_count; + iface->get_row_count = psppire_data_store_get_case_count; } static -gboolean always_true() +gboolean always_true () { return TRUE; } - static void -delete_cases_callback(GtkWidget *w, gint first, gint n_cases, gpointer data) +delete_cases_callback (GtkWidget *w, gint first, gint n_cases, gpointer data) { + PsppireDataStore *store ; + g_return_if_fail (data); - PsppireDataStore *store = PSPPIRE_DATA_STORE(data); + store = PSPPIRE_DATA_STORE (data); - g_assert(first >= 0); + g_assert (first >= 0); - g_sheet_model_rows_deleted (G_SHEET_MODEL(store), first, n_cases); + g_sheet_model_rows_deleted (G_SHEET_MODEL (store), first, n_cases); } static void -insert_case_callback(GtkWidget *w, gint casenum, gpointer data) +insert_case_callback (GtkWidget *w, gint casenum, gpointer data) { + PsppireDataStore *store ; + g_return_if_fail (data); - PsppireDataStore *store = PSPPIRE_DATA_STORE(data); - - g_sheet_model_range_changed (G_SHEET_MODEL(store), - casenum, -1, - psppire_case_array_get_n_cases(store->cases), - -1); + store = PSPPIRE_DATA_STORE (data); + + g_sheet_model_range_changed (G_SHEET_MODEL (store), + casenum, -1, + psppire_case_file_get_case_count (store->case_file), + -1); + + g_sheet_model_rows_inserted (G_SHEET_MODEL (store), casenum, 1); } static void -changed_case_callback(GtkWidget *w, gint casenum, gpointer data) +changed_case_callback (GtkWidget *w, gint casenum, gpointer data) { + PsppireDataStore *store ; g_return_if_fail (data); - PsppireDataStore *store = PSPPIRE_DATA_STORE(data); - + store = PSPPIRE_DATA_STORE (data); - g_sheet_model_range_changed (G_SHEET_MODEL(store), + g_sheet_model_range_changed (G_SHEET_MODEL (store), casenum, -1, casenum, -1); - } static void -delete_variables_callback(GtkWidget *w, gint var_num, gint n_vars, gpointer data) +delete_variables_callback (GObject *obj, gint var_num, gint n_vars, gpointer data) { + PsppireDataStore *store ; + g_return_if_fail (data); - PsppireDataStore *store = PSPPIRE_DATA_STORE(data); + store = PSPPIRE_DATA_STORE (data); + + g_sheet_model_columns_deleted (G_SHEET_MODEL (store), var_num, n_vars); - g_sheet_column_columns_deleted(G_SHEET_COLUMN(store), - var_num, n_vars); + g_sheet_column_columns_changed (G_SHEET_COLUMN (store), + var_num, -1); } static void -insert_variable_callback(GtkWidget *w, gint var_num, gpointer data) +variable_changed_callback (GObject *obj, gint var_num, gpointer data) { + PsppireDataStore *store; + g_return_if_fail (data); - PsppireDataStore *store = PSPPIRE_DATA_STORE(data); - - /* - g_sheet_model_range_changed (G_SHEET_MODEL(store), - casenum, -1, - psppire_case_array_get_n_cases(store->cases), - -1); - */ + store = PSPPIRE_DATA_STORE (data); + + g_sheet_column_columns_changed (G_SHEET_COLUMN (store), + var_num, 1); + + + g_sheet_model_range_changed (G_SHEET_MODEL (store), + -1, var_num, + -1, var_num); +} + +static void +insert_variable_callback (GObject *obj, gint var_num, gpointer data) +{ + PsppireDataStore *store; + gint posn; + + g_return_if_fail (data); + + store = PSPPIRE_DATA_STORE (data); + + if ( var_num > 0 ) + { + struct variable *variable = + psppire_dict_get_variable (store->dict, var_num); + + g_assert (variable != NULL); + + posn = var_get_case_index (variable); + } + else + { + posn = 0; + } - psppire_case_array_resize(store->cases, - dict_get_next_value_idx (store->dict->dict)); + psppire_case_file_insert_values (store->case_file, 1, posn); + g_sheet_column_columns_changed (G_SHEET_COLUMN (store), + var_num, 1); + + g_sheet_model_columns_inserted (G_SHEET_MODEL (store), var_num, 1); } +static void +dict_size_change_callback (GObject *obj, + gint posn, gint adjustment, gpointer data) +{ + PsppireDataStore *store ; + + g_return_if_fail (data); + + store = PSPPIRE_DATA_STORE (data); + + psppire_case_file_insert_values (store->case_file, adjustment, posn); +} + /** @@ -250,28 +361,41 @@ insert_variable_callback(GtkWidget *w, gint var_num, gpointer data) * Return value: a new #PsppireDataStore **/ PsppireDataStore * -psppire_data_store_new (PsppireDict *dict, PsppireCaseArray *cases) +psppire_data_store_new (PsppireDict *dict) { PsppireDataStore *retval; retval = g_object_new (GTK_TYPE_DATA_STORE, NULL); - retval->cases = cases; - g_signal_connect(cases, "cases-deleted", G_CALLBACK(delete_cases_callback), - retval); + psppire_data_store_set_dictionary (retval, dict); - g_signal_connect(cases, "case-inserted", G_CALLBACK(insert_case_callback), - retval); + return retval; +} - g_signal_connect(cases, "case-changed", G_CALLBACK(changed_case_callback), - retval); +void +psppire_data_store_set_case_file (PsppireDataStore *data_store, + PsppireCaseFile *cf) +{ + if ( data_store->case_file) + { + g_object_unref (data_store->case_file); + } + data_store->case_file = cf; - psppire_data_store_set_dictionary(retval, dict); + g_signal_connect (data_store->case_file, "cases-deleted", + G_CALLBACK (delete_cases_callback), + data_store); + g_signal_connect (data_store->case_file, "case-inserted", + G_CALLBACK (insert_case_callback), + data_store); - return retval; + + g_signal_connect (data_store->case_file, "case-changed", + G_CALLBACK (changed_case_callback), + data_store); } @@ -285,29 +409,31 @@ psppire_data_store_new (PsppireDict *dict, PsppireCaseArray *cases) * destroyed. **/ void -psppire_data_store_set_dictionary(PsppireDataStore *data_store, PsppireDict *dict) +psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *dict) { -#if 0 - if ( data_store->dict ) g_object_unref(data_store->dict); -#endif - data_store->dict = dict; - psppire_case_array_resize(data_store->cases, - dict_get_next_value_idx (data_store->dict->dict)); - + g_signal_connect (dict, "variable-inserted", + G_CALLBACK (insert_variable_callback), + data_store); - g_signal_connect(dict, "variable-inserted", - G_CALLBACK(insert_variable_callback), + g_signal_connect (dict, "variables-deleted", + G_CALLBACK (delete_variables_callback), data_store); - g_signal_connect(dict, "variables-deleted", - G_CALLBACK(delete_variables_callback), + g_signal_connect (dict, "variable-changed", + G_CALLBACK (variable_changed_callback), data_store); + g_signal_connect (dict, "dict-size-changed", + G_CALLBACK (dict_size_change_callback), + data_store); + /* The entire model has changed */ - g_sheet_model_range_changed (G_SHEET_MODEL(data_store), -1, -1, -1, -1); + g_sheet_model_range_changed (G_SHEET_MODEL (data_store), -1, -1, -1, -1); + + g_sheet_column_columns_changed (G_SHEET_COLUMN (data_store), 0, -1); } static void @@ -319,345 +445,333 @@ psppire_data_store_finalize (GObject *object) } -static const gchar *const -psppire_data_store_get_string(GSheetModel *model, gint row, gint column) + +/* Insert a blank case before POSN */ +gboolean +psppire_data_store_insert_new_case (PsppireDataStore *ds, gint posn) { - static gchar s[255]; - PsppireDataStore *store = PSPPIRE_DATA_STORE(model); + gboolean result; + gint val_cnt, v; + struct ccase cc; + g_return_val_if_fail (ds, FALSE); - g_return_val_if_fail(store->dict, NULL); - g_return_val_if_fail(store->cases, NULL); - if (column >= psppire_dict_get_var_cnt(store->dict)) - return NULL; + /* Opportunity for optimisation exists here when creating a blank case */ + val_cnt = datasheet_get_column_cnt (ds->case_file->datasheet) ; + + case_create (&cc, val_cnt); + + memset ( case_data_rw_idx (&cc, 0), 0, val_cnt * MAX_SHORT_STRING); + + for (v = 0 ; v < psppire_dict_get_var_cnt (ds->dict) ; ++v) + { + const struct variable *pv = psppire_dict_get_variable (ds->dict, v); + if ( var_is_alpha (pv)) + continue; + + case_data_rw (&cc, pv)->f = SYSMIS; + } + + result = psppire_case_file_insert_case (ds->case_file, &cc, posn); - if ( row >= psppire_case_array_get_n_cases(store->cases)) + case_destroy (&cc); + + return result; +} + + +static gchar * +psppire_data_store_get_string (const GSheetModel *model, gint row, gint column) +{ + gint idx; + char *text; + const struct fmt_spec *fp ; + const struct variable *pv ; + union value *v ; + GString *s; + PsppireDataStore *store = PSPPIRE_DATA_STORE (model); + + g_return_val_if_fail (store->dict, NULL); + g_return_val_if_fail (store->case_file, NULL); + + if (column >= psppire_dict_get_var_cnt (store->dict)) return NULL; - const struct PsppireVariable *pv = psppire_dict_get_variable(store->dict, column); + if ( row >= psppire_case_file_get_case_count (store->case_file)) + return NULL; + pv = psppire_dict_get_variable (store->dict, column); - const union value *v = - psppire_case_array_get_value(store->cases, row, - psppire_variable_get_index(pv)); + g_assert (pv); + idx = var_get_case_index (pv); - if ( store->show_labels) - { - const struct val_labs * vl = psppire_variable_get_value_labels(pv); + g_assert (idx >= 0); - const gchar *label; - if ( (label = val_labs_find(vl, *v)) ) - { - return label; - } - } + v = psppire_case_file_get_value (store->case_file, row, idx, NULL, + var_get_width (pv)); - const struct fmt_spec *fp = psppire_variable_get_write_spec(pv); + g_return_val_if_fail (v, NULL); - if ( psppire_variable_get_type(pv) == NUMERIC ) - { - /* Converts binary value V into printable form in the exactly - FP->W character in buffer S according to format specification - FP. No null terminator is appended to the buffer. */ - data_out (s, fp, v); - s[fp->w] = '\0'; - } - else + if ( store->show_labels) { - const gint len = psppire_variable_get_width(pv); - memcpy(s, v->s, len); - s[len] = '\0'; + const gchar *label = var_lookup_value_label (pv, v); + if (label) + { + free (v); + return pspp_locale_to_utf8 (label, -1, 0); + } } - static gchar buf[255]; - GError *err = NULL; - gchar *text = g_locale_to_utf8(s, fp->w, 0, 0, &err); - if ( !err ) - { - g_snprintf(buf, 255, text); - g_free(text); - } - else - { - g_warning("Cannot convert string \"%s\" to utf-8: %s\n", s, err->message); - g_error_free(err); - return NULL; - } + fp = var_get_write_format (pv); - return buf ; -} + s = g_string_sized_new (fp->w + 1); + g_string_set_size (s, fp->w); + memset (s->str, 0, fp->w); -static gboolean -set_null_string_value(union value *val, gpointer data) -{ - strcpy(val->s, ""); - return TRUE; -} + g_assert (fp->w == s->len); -static gboolean -set_sysmis_value(union value *val, gpointer data) -{ - val->f = SYSMIS; - return TRUE; + /* Converts binary value V into printable form in the exactly + FP->W character in buffer S according to format specification + FP. No null terminator is appended to the buffer. */ + data_out (v, fp, s->str); + + text = pspp_locale_to_utf8 (s->str, fp->w, 0); + g_string_free (s, TRUE); + + g_strchomp (text); + + free (v); + return text; } -static gboolean -psppire_data_store_clear_datum(GSheetModel *model, +static gboolean +psppire_data_store_clear_datum (GSheetModel *model, gint row, gint col) { - PsppireDataStore *store = PSPPIRE_DATA_STORE(model); + PsppireDataStore *store = PSPPIRE_DATA_STORE (model); - const struct PsppireVariable *pv = psppire_dict_get_variable(store->dict, col); + union value v; + const struct variable *pv = psppire_dict_get_variable (store->dict, col); - const gint index = psppire_variable_get_index(pv) ; + const gint index = var_get_case_index (pv) ; - if ( psppire_variable_get_type(pv) == NUMERIC) - psppire_case_array_set_value(store->cases, row, index, set_sysmis_value,0); + if ( var_is_numeric (pv)) + v.f = SYSMIS; else - psppire_case_array_set_value(store->cases, row, index, set_null_string_value,0); - return TRUE; -} + memcpy (v.s, "", MAX_SHORT_STRING); - -static gboolean -fillit(union value *val, gpointer data) -{ - struct data_in *d_in = data; - - d_in->v = val; - - if ( ! data_in(d_in) ) - { - g_warning("Cant encode string\n"); - return FALSE; - } + psppire_case_file_set_value (store->case_file, row, index, &v, + var_get_width (pv)); return TRUE; } -/* Attempts to update that part of the variable store which corresponds +/* Attempts to update that part of the variable store which corresponds to ROW, COL with the value TEXT. Returns true if anything was updated, false otherwise. */ -static gboolean -psppire_data_store_set_string(GSheetModel *model, +static gboolean +psppire_data_store_set_string (GSheetModel *model, const gchar *text, gint row, gint col) { - gint r; - PsppireDataStore *store = PSPPIRE_DATA_STORE(model); + PsppireDataStore *store = PSPPIRE_DATA_STORE (model); - const struct PsppireVariable *pv = psppire_dict_get_variable(store->dict, col); + const struct variable *pv = psppire_dict_get_variable (store->dict, col); + g_return_val_if_fail (pv, FALSE); - for(r = psppire_case_array_get_n_cases(store->cases) ; r <= row ; ++r ) +#if 0 + /* Allow the user to insert a lot of blank cases, simply by skipping rows */ + for (r = psppire_case_file_get_case_count (store->case_file); r <= row ; ++r) { + gint c; - psppire_case_array_insert_case(store->cases, r); - for (c = 0 ; c < psppire_dict_get_var_cnt(store->dict); ++c ) - psppire_data_store_clear_datum(model, r, c); - } + psppire_case_array_insert_case (store->cases, r, 0, 0); - const gint index = psppire_variable_get_index(pv); - struct data_in d_in; - d_in.s = text; - d_in.e = text + strlen(text); - d_in.v = 0; - d_in.f1 = d_in.f2 = 0; - d_in.format = * psppire_variable_get_write_spec(pv); - d_in.flags = 0; + for (c = 0 ; c < psppire_dict_get_var_cnt (store->dict); ++c ) + psppire_data_store_clear_datum (model, r, c); + } +#endif - psppire_case_array_set_value(store->cases, row, index, fillit, &d_in); + psppire_case_file_data_in (store->case_file, row, + var_get_case_index (pv), ss_cstr (text), + var_get_write_format (pv)); return TRUE; } void -psppire_data_store_set_font(PsppireDataStore *store, PangoFontDescription *fd) +psppire_data_store_set_font (PsppireDataStore *store, + const PangoFontDescription *fd) { g_return_if_fail (store); g_return_if_fail (PSPPIRE_IS_DATA_STORE (store)); store->font_desc = fd; - g_sheet_model_range_changed (G_SHEET_MODEL(store), +#if 0 + store->width_of_m = calc_m_width (fd); +#endif + g_signal_emit (store, signals [FONT_CHANGED], 0); + + + g_sheet_model_range_changed (G_SHEET_MODEL (store), -1, -1, -1, -1); } void -psppire_data_store_show_labels(PsppireDataStore *store, gboolean show_labels) +psppire_data_store_show_labels (PsppireDataStore *store, gboolean show_labels) { g_return_if_fail (store); g_return_if_fail (PSPPIRE_IS_DATA_STORE (store)); store->show_labels = show_labels; - g_sheet_model_range_changed (G_SHEET_MODEL(store), + g_sheet_model_range_changed (G_SHEET_MODEL (store), -1, -1, -1, -1); } -static gboolean -write_case(const struct ccase *cc, - gpointer aux) -{ - struct sfm_writer *writer = aux; - - if ( ! sfm_write_case(writer, cc) ) - return FALSE; - - - return TRUE; -} - +/* FIXME: There's no reason to actually have this function. + It should be done by a procedure */ void -psppire_data_store_create_system_file(PsppireDataStore *store, +psppire_data_store_create_system_file (PsppireDataStore *store, struct file_handle *handle) { - g_assert(handle); - + gint i, var_cnt; const struct sfm_write_options wo = { true, /* writeable */ false, /* dont compress */ 3 /* version */ - }; + }; + + struct casewriter *writer; - struct sfm_writer *writer = sfm_open_writer(handle, store->dict->dict, wo); + g_assert (handle); - if ( ! writer) + writer = sfm_open_writer (handle, store->dict->dict, wo); + + if ( ! writer) return; - psppire_case_array_iterate_case(store->cases, write_case, writer); - sfm_close_writer(writer); -} + var_cnt = psppire_data_store_get_var_count (G_SHEET_MODEL (store)); + for (i = 0 ; i < psppire_case_file_get_case_count (store->case_file); ++i ) + { + struct ccase c; + psppire_case_file_get_case (store->case_file, i, &c); + casewriter_write (writer, &c); + } + casewriter_destroy (writer); +} -/* Column related funcs */ -static gint -geometry_get_column_count(const GSheetColumn *geom) +void +psppire_data_store_clear (PsppireDataStore *data_store) { - PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom); + psppire_case_file_clear (data_store->case_file); - return max(MIN_COLUMNS, psppire_dict_get_var_cnt(ds->dict)); + psppire_dict_clear (data_store->dict); } -/* Return the width that an 'M' character would occupy when typeset at - row, col */ -static guint -M_width(GtkSheet *sheet, gint row, gint col) -{ - GtkSheetCellAttr attributes; - gtk_sheet_get_attributes(sheet, row, col, &attributes); - PangoRectangle rect; - /* FIXME: make this a member of the data store */ - static PangoLayout *layout = 0; - if (! layout ) - layout = gtk_widget_create_pango_layout (GTK_WIDGET(sheet), "M"); - - pango_layout_set_font_description (layout, - attributes.font_desc); - - pango_layout_get_extents (layout, NULL, &rect); +/* Column related funcs */ -#if 0 - g_object_unref(G_OBJECT(layout)); -#endif +static gint +geometry_get_column_count (const GSheetColumn *geom) +{ + PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - return PANGO_PIXELS(rect.width); + return MAX (MIN_COLUMNS, psppire_dict_get_var_cnt (ds->dict)); } -/* Return the number of pixels corresponding to a column of - WIDTH characters */ -static inline guint -columnWidthToPixels(GtkSheet *sheet, gint column, guint width) -{ - return (M_width(sheet, 0, column) * width); -} - static gint -geometry_get_width(const GSheetColumn *geom, gint unit, GtkSheet *sheet) +geometry_get_width (const GSheetColumn *geom, gint unit) { - PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom); - - if ( unit >= psppire_dict_get_var_cnt(ds->dict) ) - return 75; + const struct variable *pv ; + PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - /* FIXME: We can optimise this by caching the widths until they're resized */ - const struct PsppireVariable *pv = psppire_dict_get_variable(ds->dict, unit); - - return columnWidthToPixels(sheet, unit, psppire_variable_get_columns(pv)); -} + if ( unit >= psppire_dict_get_var_cnt (ds->dict) ) + return ds->width_of_m * 8 ; + pv = psppire_dict_get_variable (ds->dict, unit); + if ( pv == NULL ) + return ds->width_of_m * 8 ; + return ds->width_of_m * var_get_display_width (pv); +} static void -geometry_set_width(GSheetColumn *geom, gint unit, gint width, GtkSheet *sheet) +geometry_set_width (GSheetColumn *geom, gint unit, gint width) { - PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom); + PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - struct PsppireVariable *pv = psppire_dict_get_variable(ds->dict, unit); + struct variable *pv = psppire_dict_get_variable (ds->dict, unit); - psppire_variable_set_columns(pv, width / M_width(sheet, 1, unit)); + var_set_display_width (pv, width / ds->width_of_m ); } static GtkJustification -geometry_get_justification(const GSheetColumn *geom, gint unit) +geometry_get_justification (const GSheetColumn *geom, gint unit) { - PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom); + PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); + const struct variable *pv ; - if ( unit >= psppire_dict_get_var_cnt(ds->dict) ) + if ( unit >= psppire_dict_get_var_cnt (ds->dict) ) return GTK_JUSTIFY_LEFT; - const struct PsppireVariable *pv = psppire_dict_get_variable(ds->dict, unit); + pv = psppire_dict_get_variable (ds->dict, unit); - /* Kludge: Happily GtkJustification is defined similarly - to enum alignment from pspp/variable.h */ - return psppire_variable_get_alignment(pv); + return (var_get_alignment (pv) == ALIGN_LEFT ? GTK_JUSTIFY_LEFT + : var_get_alignment (pv) == ALIGN_RIGHT ? GTK_JUSTIFY_RIGHT + : GTK_JUSTIFY_CENTER); } -static const gchar null_var_name[]=_("var"); - -static const gchar * -geometry_get_button_label(const GSheetColumn *geom, gint unit) +static const gchar null_var_name[]=N_("var"); + +static gchar * +geometry_get_column_button_label (const GSheetColumn *geom, gint unit) { - PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom); + gchar *text; + struct variable *pv ; + PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); + + if ( unit >= psppire_dict_get_var_cnt (ds->dict) ) + return g_locale_to_utf8 (null_var_name, -1, 0, 0, 0); - if ( unit >= psppire_dict_get_var_cnt(ds->dict) ) - return null_var_name; + pv = psppire_dict_get_variable (ds->dict, unit); - struct PsppireVariable *pv = psppire_dict_get_variable(ds->dict, unit); + text = pspp_locale_to_utf8 (var_get_name (pv), -1, 0); - return psppire_variable_get_name(pv); + return text; } static gboolean -geometry_get_sensitivity(const GSheetColumn *geom, gint unit) +geometry_get_sensitivity (const GSheetColumn *geom, gint unit) { - PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom); + PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - - return (unit < psppire_dict_get_var_cnt(ds->dict)); + return (unit < psppire_dict_get_var_cnt (ds->dict)); } @@ -670,6 +784,69 @@ psppire_data_store_sheet_column_init (GSheetColumnIface *iface) iface->get_visibility = always_true; iface->get_sensitivity = geometry_get_sensitivity; iface->get_justification = geometry_get_justification; + iface->get_button_label = geometry_get_column_button_label; +} + + +/* Row related funcs */ + +static gint +geometry_get_row_count (const GSheetRow *geom, gpointer data) +{ + PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); + + return TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file); +} + + +static gint +geometry_get_height (const GSheetRow *geom, gint unit, gpointer data) +{ + return 25; +} + + +static gboolean +geometry_get_row_sensitivity (const GSheetRow *geom, gint unit, gpointer data) +{ + PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); + + + return (unit < psppire_case_file_get_case_count (ds->case_file)); +} + + +static gchar * +geometry_get_row_button_label (const GSheetRow *geom, gint unit, gpointer data) +{ + gchar *text; + gchar *s; + PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom); - iface->get_button_label = geometry_get_button_label; + if ( unit > + TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file)) + return 0; + + s = g_strdup_printf (_("%d"), unit); + + text = pspp_locale_to_utf8 (s, -1, 0); + + g_free (s); + + return text; } + + +static void +psppire_data_store_sheet_row_init (GSheetRowIface *iface) +{ + iface->get_row_count = geometry_get_row_count; + + iface->get_height = geometry_get_height; + iface->set_height = 0; + iface->get_visibility = always_true; + iface->get_sensitivity = geometry_get_row_sensitivity; + + iface->get_button_label = geometry_get_row_button_label; +} +