X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.c;h=ef9d978dd211342b79c118025428db92bce12249;hb=0ed82886f29b9c00f5068c69f021bd51c76488df;hp=1d6f465d437e5c2605bb8001a7ddce6fd720eb3c;hpb=9a331fe64eb814ae5c1322e21717a04fb254bf65;p=pspp diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index 1d6f465d43..ef9d978dd2 100644 --- a/src/ui/gui/psppire-var-store.c +++ b/src/ui/gui/psppire-var-store.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2006 Free Software Foundation + Copyright (C) 2006, 2009, 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 @@ -21,7 +21,7 @@ #define _(msgid) gettext (msgid) #define N_(msgid) msgid - +#include #include @@ -41,19 +41,55 @@ #include "var-display.h" +static void +var_change_callback (GtkWidget *w, gint n, gpointer data) +{ + PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data); + + psppire_sheet_model_range_changed (model, + n, 0, n, PSPPIRE_VAR_STORE_n_COLS); +} + + +static void +var_delete_callback (GtkWidget *w, const struct variable *var UNUSED, + gint dict_idx, gint case_idx UNUSED, gpointer data) +{ + PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data); + + psppire_sheet_model_rows_deleted (model, dict_idx, 1); +} + + + +static void +var_insert_callback (GtkWidget *w, glong row, gpointer data) +{ + PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data); + + psppire_sheet_model_rows_inserted (model, row, 1); +} + +static void +refresh (PsppireDict *d, gpointer data) +{ + PsppireVarStore *vs = data; + + psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (vs), -1, -1, -1, -1); +} + enum { PROP_0, - PSPPIRE_VAR_STORE_FORMAT_TYPE + PSPPIRE_VAR_STORE_FORMAT_TYPE, + PSPPIRE_VAR_STORE_DICT }; static void psppire_var_store_init (PsppireVarStore *var_store); static void psppire_var_store_class_init (PsppireVarStoreClass *class); static void psppire_var_store_sheet_model_init (PsppireSheetModelIface *iface); static void psppire_var_store_finalize (GObject *object); - - -gchar * missing_values_to_string (const struct variable *pv, GError **err); +static void psppire_var_store_dispose (GObject *object); static gchar *psppire_var_store_get_string (const PsppireSheetModel *sheet_model, glong row, glong column); @@ -67,7 +103,8 @@ static gboolean psppire_var_store_set_string (PsppireSheetModel *model, static glong psppire_var_store_get_row_count (const PsppireSheetModel * model); static glong psppire_var_store_get_column_count (const PsppireSheetModel * model); -static gchar *text_for_column (const struct variable *pv, gint c, GError **err); +static gchar *text_for_column (PsppireVarStore *vs, const struct variable *pv, + gint c, GError **err); static GObjectClass *parent_class = NULL; @@ -147,6 +184,27 @@ psppire_var_store_set_property (GObject *object, self->format_type = g_value_get_enum (value); break; + case PSPPIRE_VAR_STORE_DICT: + if ( self->dictionary) + g_object_unref (self->dictionary); + self->dictionary = g_value_dup_object (value); + g_signal_connect (self->dictionary, "variable-changed", G_CALLBACK (var_change_callback), + self); + + g_signal_connect (self->dictionary, "variable-deleted", G_CALLBACK (var_delete_callback), + self); + + g_signal_connect (self->dictionary, "variable-inserted", + G_CALLBACK (var_insert_callback), self); + + g_signal_connect (self->dictionary, "backend-changed", G_CALLBACK (refresh), + self); + + /* The entire model has changed */ + psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (self), -1, -1, -1, -1); + + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); break; @@ -167,8 +225,12 @@ psppire_var_store_get_property (GObject *object, g_value_set_enum (value, self->format_type); break; + case PSPPIRE_VAR_STORE_DICT: + g_value_take_object (value, self->dictionary); + break; + default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; } } @@ -178,16 +240,18 @@ static void psppire_var_store_class_init (PsppireVarStoreClass *class) { GObjectClass *object_class; - GParamSpec *pspec; + GParamSpec *format_pspec; + GParamSpec *dict_pspec; parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; object_class->finalize = psppire_var_store_finalize; + object_class->dispose = psppire_var_store_dispose; object_class->set_property = psppire_var_store_set_property; object_class->get_property = psppire_var_store_get_property; - pspec = g_param_spec_enum ("format-type", + format_pspec = g_param_spec_enum ("format-type", "Variable format type", ("Whether variables have input or output " "formats"), @@ -197,7 +261,17 @@ psppire_var_store_class_init (PsppireVarStoreClass *class) g_object_class_install_property (object_class, PSPPIRE_VAR_STORE_FORMAT_TYPE, - pspec); + format_pspec); + + dict_pspec = g_param_spec_object ("dictionary", + "Dictionary", + "The PsppireDict represented by this var store", + PSPPIRE_TYPE_DICT, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT); + + g_object_class_install_property (object_class, + PSPPIRE_VAR_STORE_DICT, + dict_pspec); } #define DISABLED_COLOR "gray" @@ -206,9 +280,9 @@ static void psppire_var_store_init (PsppireVarStore *var_store) { if ( ! gdk_color_parse (DISABLED_COLOR, &var_store->disabled)) - g_critical ("Could not parse color \"%s\"", DISABLED_COLOR); + g_critical ("Could not parse color `%s'", DISABLED_COLOR); - var_store->dict = 0; + var_store->dictionary = NULL; var_store->format_type = PSPPIRE_VAR_STORE_OUTPUT_FORMATS; } @@ -256,7 +330,7 @@ psppire_var_store_item_editable (PsppireVarStore *var_store, glong row, glong co struct variable * psppire_var_store_get_var (PsppireVarStore *store, glong row) { - return psppire_dict_get_variable (store->dict, row); + return psppire_dict_get_variable (store->dictionary, row); } static gboolean @@ -307,8 +381,8 @@ psppire_var_store_sheet_model_init (PsppireSheetModelIface *iface) /** * psppire_var_store_new: - * @dict: The dictionary for this var_store. - * + * @dict: The dictionary for this var_store. The caller retains its reference + * to @dict. * * Return value: a new #PsppireVarStore **/ @@ -317,49 +391,14 @@ psppire_var_store_new (PsppireDict *dict) { PsppireVarStore *retval; - retval = g_object_new (GTK_TYPE_VAR_STORE, NULL); + retval = g_object_new (GTK_TYPE_VAR_STORE, "dictionary", dict, NULL); - psppire_var_store_set_dictionary (retval, dict); + // psppire_var_store_set_dictionary (retval, dict); return retval; } -static void -var_change_callback (GtkWidget *w, gint n, gpointer data) -{ - PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data); - - psppire_sheet_model_range_changed (model, - n, 0, n, PSPPIRE_VAR_STORE_n_COLS); -} - - -static void -var_delete_callback (GtkWidget *w, gint dict_idx, gint case_idx, gint val_cnt, gpointer data) -{ - PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data); - - psppire_sheet_model_rows_deleted (model, dict_idx, 1); -} - - - -static void -var_insert_callback (GtkWidget *w, glong row, gpointer data) -{ - PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data); - - psppire_sheet_model_rows_inserted (model, row, 1); -} - -static void -refresh (PsppireDict *d, gpointer data) -{ - PsppireVarStore *vs = data; - - psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (vs), -1, -1, -1, -1); -} - +#if 0 /** * psppire_var_store_replace_set_dictionary: * @var_store: The variable store @@ -390,6 +429,7 @@ psppire_var_store_set_dictionary (PsppireVarStore *var_store, PsppireDict *dict) /* The entire model has changed */ psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (var_store), -1, -1, -1, -1); } +#endif static void psppire_var_store_finalize (GObject *object) @@ -398,19 +438,33 @@ psppire_var_store_finalize (GObject *object) (* parent_class->finalize) (object); } +static void +psppire_var_store_dispose (GObject *object) +{ + PsppireVarStore *self = PSPPIRE_VAR_STORE (object); + + if (self->dictionary) + g_object_unref (self->dictionary); + + /* must chain up */ + (* parent_class->dispose) (object); +} + + static gchar * -psppire_var_store_get_string (const PsppireSheetModel *model, glong row, glong column) +psppire_var_store_get_string (const PsppireSheetModel *model, + glong row, glong column) { PsppireVarStore *store = PSPPIRE_VAR_STORE (model); struct variable *pv; - if ( row >= psppire_dict_get_var_cnt (store->dict)) + if ( row >= psppire_dict_get_var_cnt (store->dictionary)) return 0; - pv = psppire_dict_get_variable (store->dict, row); + pv = psppire_dict_get_variable (store->dictionary, row); - return text_for_column (pv, column, 0); + return text_for_column (store, pv, column, 0); } @@ -425,7 +479,7 @@ psppire_var_store_clear (PsppireSheetModel *model, glong row, glong col) PsppireVarStore *var_store = PSPPIRE_VAR_STORE (model); - if ( row >= psppire_dict_get_var_cnt (var_store->dict)) + if ( row >= psppire_dict_get_var_cnt (var_store->dictionary)) return FALSE; pv = psppire_var_store_get_var (var_store, row); @@ -436,7 +490,7 @@ psppire_var_store_clear (PsppireSheetModel *model, glong row, glong col) switch (col) { case PSPPIRE_VAR_STORE_COL_LABEL: - var_set_label (pv, 0); + var_clear_label (pv); return TRUE; break; } @@ -456,7 +510,7 @@ psppire_var_store_set_string (PsppireSheetModel *model, PsppireVarStore *var_store = PSPPIRE_VAR_STORE (model); - if ( row >= psppire_dict_get_var_cnt (var_store->dict)) + if ( row >= psppire_dict_get_var_cnt (var_store->dictionary)) return FALSE; pv = psppire_var_store_get_var (var_store, row); @@ -468,14 +522,9 @@ psppire_var_store_set_string (PsppireSheetModel *model, { case PSPPIRE_VAR_STORE_COL_NAME: { - int i; - /* Until non-ascii in variable names is better managed, - simply refuse to allow them to be entered. */ - for (i = 0 ; i < strlen (text) ; ++i ) - if (!g_ascii_isprint (text[i])) - return FALSE; - return psppire_dict_rename_var (var_store->dict, pv, text); - break; + gboolean ok; + ok = psppire_dict_rename_var (var_store->dictionary, pv, text); + return ok; } case PSPPIRE_VAR_STORE_COL_COLUMNS: if ( ! text) return FALSE; @@ -484,16 +533,25 @@ psppire_var_store_set_string (PsppireSheetModel *model, break; case PSPPIRE_VAR_STORE_COL_WIDTH: { - int width = atoi (text); - if ( ! text) return FALSE; + const int width = atoi (text); + if ( ! text) + return FALSE; + + if (width < 0) + return FALSE; + if ( var_is_alpha (pv)) + { + if ( width > MAX_STRING ) + return FALSE; var_set_width (pv, width); + } else { bool for_input = var_store->format_type == PSPPIRE_VAR_STORE_INPUT_FORMATS; struct fmt_spec fmt ; - fmt = *var_get_write_format (pv); + fmt = *var_get_print_format (pv); if ( width < fmt_min_width (fmt.type, for_input) || width > fmt_max_width (fmt.type, for_input)) @@ -516,7 +574,7 @@ psppire_var_store_set_string (PsppireSheetModel *model, struct fmt_spec fmt; if ( ! text) return FALSE; decimals = atoi (text); - fmt = *var_get_write_format (pv); + fmt = *var_get_print_format (pv); if ( decimals > fmt_max_decimals (fmt.type, fmt.w, @@ -531,9 +589,7 @@ psppire_var_store_set_string (PsppireSheetModel *model, break; case PSPPIRE_VAR_STORE_COL_LABEL: { - gchar *s = utf8_to_pspp_locale (text, -1, NULL); - var_set_label (pv, s); - free (s); + var_set_label (pv, text, true); return TRUE; } break; @@ -557,88 +613,26 @@ psppire_var_store_set_string (PsppireSheetModel *model, static const gchar none[] = N_("None"); static gchar * -text_for_column (const struct variable *pv, gint c, GError **err) +text_for_column (PsppireVarStore *vs, + const struct variable *pv, gint c, GError **err) { - static const gchar *const type_label[] = - { - N_("Numeric"), - N_("Comma"), - N_("Dot"), - N_("Scientific"), - N_("Date"), - N_("Dollar"), - N_("Custom"), - N_("String") - }; - enum {VT_NUMERIC, VT_COMMA, VT_DOT, VT_SCIENTIFIC, VT_DATE, VT_DOLLAR, - VT_CUSTOM, VT_STRING}; - - const struct fmt_spec *write_spec = var_get_write_format (pv); + PsppireDict *dict = vs->dictionary; + + const struct fmt_spec *format = var_get_print_format (pv); switch (c) { case PSPPIRE_VAR_STORE_COL_NAME: - return pspp_locale_to_utf8 ( var_get_name (pv), -1, err); + return xstrdup (var_get_name (pv)); break; case PSPPIRE_VAR_STORE_COL_TYPE: - { - switch ( write_spec->type ) - { - case FMT_F: - return g_locale_to_utf8 (gettext (type_label[VT_NUMERIC]), -1, 0, 0, err); - break; - case FMT_COMMA: - return g_locale_to_utf8 (gettext (type_label[VT_COMMA]), -1, 0, 0, err); - break; - case FMT_DOT: - return g_locale_to_utf8 (gettext (type_label[VT_DOT]), -1, 0, 0, err); - break; - case FMT_E: - return g_locale_to_utf8 (gettext (type_label[VT_SCIENTIFIC]), -1, 0, 0, err); - break; - case FMT_DATE: - case FMT_EDATE: - case FMT_SDATE: - case FMT_ADATE: - case FMT_JDATE: - case FMT_QYR: - case FMT_MOYR: - case FMT_WKYR: - case FMT_DATETIME: - case FMT_TIME: - case FMT_DTIME: - case FMT_WKDAY: - case FMT_MONTH: - return g_locale_to_utf8 (type_label[VT_DATE], -1, 0, 0, err); - break; - case FMT_DOLLAR: - return g_locale_to_utf8 (type_label[VT_DOLLAR], -1, 0, 0, err); - break; - case FMT_CCA: - case FMT_CCB: - case FMT_CCC: - case FMT_CCD: - case FMT_CCE: - return g_locale_to_utf8 (gettext (type_label[VT_CUSTOM]), -1, 0, 0, err); - break; - case FMT_A: - return g_locale_to_utf8 (gettext (type_label[VT_STRING]), -1, 0, 0, err); - break; - default: - { - char str[FMT_STRING_LEN_MAX + 1]; - g_warning ("Unknown format: \"%s\"\n", - fmt_to_string (write_spec, str)); - } - break; - } - } + return xstrdup (fmt_gui_name (format->type)); break; case PSPPIRE_VAR_STORE_COL_WIDTH: { gchar *s; GString *gstr = g_string_sized_new (10); - g_string_printf (gstr, _("%d"), write_spec->w); + g_string_printf (gstr, _("%d"), format->w); s = g_locale_to_utf8 (gstr->str, gstr->len, 0, 0, err); g_string_free (gstr, TRUE); return s; @@ -648,7 +642,7 @@ text_for_column (const struct variable *pv, gint c, GError **err) { gchar *s; GString *gstr = g_string_sized_new (10); - g_string_printf (gstr, _("%d"), write_spec->d); + g_string_printf (gstr, _("%d"), format->d); s = g_locale_to_utf8 (gstr->str, gstr->len, 0, 0, err); g_string_free (gstr, TRUE); return s; @@ -665,40 +659,42 @@ text_for_column (const struct variable *pv, gint c, GError **err) } break; case PSPPIRE_VAR_STORE_COL_LABEL: - return pspp_locale_to_utf8 (var_get_label (pv), -1, err); + { + const char *label = var_get_label (pv); + if (label) + return xstrdup (label); + return NULL; + } break; case PSPPIRE_VAR_STORE_COL_MISSING: { - return missing_values_to_string (pv, err); + return missing_values_to_string (dict, pv, err); } break; case PSPPIRE_VAR_STORE_COL_VALUES: { if ( ! var_has_value_labels (pv)) - return g_locale_to_utf8 (gettext (none), -1, 0, 0, err); + return xstrdup (gettext (none)); else { - gchar *ss; - GString *gstr = g_string_sized_new (10); const struct val_labs *vls = var_get_value_labels (pv); - struct val_labs_iterator *ip = 0; - struct val_lab *vl = val_labs_first_sorted (vls, &ip); + const struct val_lab **labels = val_labs_sorted (vls); + const struct val_lab *vl = labels[0]; + free (labels); g_assert (vl); { - gchar *const vstr = value_to_text (vl->value, *write_spec); + gchar *s; + gchar *const vstr = value_to_text (vl->value, pv); - g_string_printf (gstr, "{%s,\"%s\"}_", vstr, vl->label); - g_free (vstr); - } - - val_labs_done (&ip); + s = g_strdup_printf (_("{%s,`%s'}_"), vstr, + val_lab_get_escaped_label (vl)); + free (vstr); - ss = pspp_locale_to_utf8 (gstr->str, gstr->len, err); - g_string_free (gstr, TRUE); - return ss; + return s; + } } } break; @@ -707,12 +703,12 @@ text_for_column (const struct variable *pv, gint c, GError **err) const gint align = var_get_alignment (pv); g_assert (align < n_ALIGNMENTS); - return g_locale_to_utf8 (gettext (alignments[align]), -1, 0, 0, err); + return xstrdup (alignment_to_string (align)); } break; case PSPPIRE_VAR_STORE_COL_MEASURE: { - return measure_to_string (pv, err); + return xstrdup (measure_to_string (var_get_measure (pv))); } break; } @@ -725,7 +721,7 @@ text_for_column (const struct variable *pv, gint c, GError **err) gint psppire_var_store_get_var_cnt (PsppireVarStore *store) { - return psppire_dict_get_var_cnt (store->dict); + return psppire_dict_get_var_cnt (store->dictionary); } @@ -735,8 +731,8 @@ psppire_var_store_get_row_count (const PsppireSheetModel * model) gint rows = 0; PsppireVarStore *vs = PSPPIRE_VAR_STORE (model); - if (vs->dict) - rows = psppire_dict_get_var_cnt (vs->dict); + if (vs->dictionary) + rows = psppire_dict_get_var_cnt (vs->dictionary); return rows ; } @@ -757,10 +753,10 @@ get_row_sensitivity (const PsppireSheetModel *model, gint row) { PsppireVarStore *vs = PSPPIRE_VAR_STORE (model); - if ( ! vs->dict) + if ( ! vs->dictionary) return FALSE; - return row < psppire_dict_get_var_cnt (vs->dict); + return row < psppire_dict_get_var_cnt (vs->dictionary); }