X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=116092fd77a139193f10e5f3d9b7b76b63d4d3cb;hb=c21a0f82e238fe80b61d8ab00e21ec32c753ca2f;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..116092fd 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -23,20 +23,21 @@ #include #include -#include "gtksheet.h" -#include "gsheetmodel.h" -#include "gsheet-column-iface.h" +#include +#include +#include #include "psppire-variable.h" #include "psppire-data-store.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 @@ -48,7 +49,7 @@ 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_finalize (GObject *object); -static const gchar *const psppire_data_store_get_string(GSheetModel *sheet_model, gint row, gint column); +static const gchar *psppire_data_store_get_string(GSheetModel *sheet_model, gint row, gint column); static gboolean psppire_data_store_set_string(GSheetModel *model, const gchar *text, gint row, gint column); @@ -147,6 +148,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; @@ -169,9 +171,11 @@ gboolean always_true() static void 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); @@ -182,25 +186,27 @@ delete_cases_callback(GtkWidget *w, gint first, gint n_cases, gpointer data) static void insert_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), - casenum, -1, - psppire_case_array_get_n_cases(store->cases), - -1); + casenum, -1, + psppire_case_array_get_n_cases(store->cases), + -1); } static void 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), casenum, -1, casenum, -1); @@ -211,9 +217,11 @@ changed_case_callback(GtkWidget *w, gint casenum, gpointer data) static void delete_variables_callback(GtkWidget *w, 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_column_columns_deleted(G_SHEET_COLUMN(store), var_num, n_vars); @@ -223,9 +231,11 @@ delete_variables_callback(GtkWidget *w, gint var_num, gint n_vars, gpointer data static void insert_variable_callback(GtkWidget *w, gint var_num, 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), @@ -319,10 +329,14 @@ psppire_data_store_finalize (GObject *object) } -static const gchar *const +static const gchar * psppire_data_store_get_string(GSheetModel *model, gint row, gint column) { - static gchar s[255]; + const char *text; + const struct fmt_spec *fp ; + const struct PsppireVariable *pv ; + const union value *v ; + GString *s; PsppireDataStore *store = PSPPIRE_DATA_STORE(model); g_return_val_if_fail(store->dict, NULL); @@ -334,14 +348,12 @@ psppire_data_store_get_string(GSheetModel *model, gint row, gint column) if ( row >= psppire_case_array_get_n_cases(store->cases)) return NULL; - const struct PsppireVariable *pv = psppire_dict_get_variable(store->dict, column); + pv = psppire_dict_get_variable(store->dict, column); - const union value *v = - psppire_case_array_get_value(store->cases, row, + v = psppire_case_array_get_value(store->cases, row, psppire_variable_get_index(pv)); - if ( store->show_labels) { const struct val_labs * vl = psppire_variable_get_value_labels(pv); @@ -349,43 +361,29 @@ psppire_data_store_get_string(GSheetModel *model, gint row, gint column) const gchar *label; if ( (label = val_labs_find(vl, *v)) ) { - return label; + return pspp_locale_to_utf8(label, -1, 0); } } - const struct fmt_spec *fp = psppire_variable_get_write_spec(pv); + fp = psppire_variable_get_write_spec(pv); - 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 - { - const gint len = psppire_variable_get_width(pv); - memcpy(s, v->s, len); - s[len] = '\0'; - } + s = g_string_sized_new (fp->w + 1); + g_string_set_size(s, fp->w); + + memset(s->str, 0, fp->w); - 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; - } + g_assert(fp->w == s->len); + + /* 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->str, fp, v); - return buf ; + + text = pspp_locale_to_utf8(s->str, fp->w, 0); + g_string_free(s, TRUE); + + return text; } @@ -456,23 +454,25 @@ psppire_data_store_set_string(GSheetModel *model, for(r = psppire_case_array_get_n_cases(store->cases) ; r <= row ; ++r ) { gint c; - psppire_case_array_insert_case(store->cases, r); + psppire_case_array_insert_case(store->cases, r, 0, 0); for (c = 0 ; c < psppire_dict_get_var_cnt(store->dict); ++c ) psppire_data_store_clear_datum(model, r, c); } - const gint index = psppire_variable_get_index(pv); + { + 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; + 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; - psppire_case_array_set_value(store->cases, row, index, fillit, &d_in); + psppire_case_array_set_value(store->cases, row, index, fillit, &d_in); + } return TRUE; } @@ -521,15 +521,17 @@ void psppire_data_store_create_system_file(PsppireDataStore *store, struct file_handle *handle) { - g_assert(handle); - const struct sfm_write_options wo = { true, /* writeable */ false, /* dont compress */ 3 /* version */ }; - struct sfm_writer *writer = sfm_open_writer(handle, store->dict->dict, wo); + struct sfm_writer *writer ; + + g_assert(handle); + + writer = sfm_open_writer(handle, store->dict->dict, wo); if ( ! writer) return; @@ -557,15 +559,16 @@ 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; + gtk_sheet_get_attributes(sheet, row, col, &attributes); + if (! layout ) layout = gtk_widget_create_pango_layout (GTK_WIDGET(sheet), "M"); + + g_assert(layout); pango_layout_set_font_description (layout, attributes.font_desc); @@ -592,13 +595,14 @@ columnWidthToPixels(GtkSheet *sheet, gint column, guint width) static gint geometry_get_width(const GSheetColumn *geom, gint unit, GtkSheet *sheet) { + const struct PsppireVariable *pv ; PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom); if ( unit >= psppire_dict_get_var_cnt(ds->dict) ) return 75; /* FIXME: We can optimise this by caching the widths until they're resized */ - const struct PsppireVariable *pv = psppire_dict_get_variable(ds->dict, unit); + pv = psppire_dict_get_variable(ds->dict, unit); return columnWidthToPixels(sheet, unit, psppire_variable_get_columns(pv)); } @@ -622,12 +626,13 @@ static GtkJustification geometry_get_justification(const GSheetColumn *geom, gint unit) { PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom); + const struct PsppireVariable *pv ; 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 */ @@ -640,14 +645,18 @@ static const gchar null_var_name[]=_("var"); static const gchar * geometry_get_button_label(const GSheetColumn *geom, gint unit) { + const gchar *text; + struct PsppireVariable *pv ; PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom); if ( unit >= psppire_dict_get_var_cnt(ds->dict) ) - return null_var_name; + return pspp_locale_to_utf8(null_var_name, -1, 0); - struct PsppireVariable *pv = psppire_dict_get_variable(ds->dict, unit); + pv = psppire_dict_get_variable(ds->dict, unit); + + text = pspp_locale_to_utf8(psppire_variable_get_name(pv), -1, 0); - return psppire_variable_get_name(pv); + return text; }