X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.c;h=26c1ee4d34e6cd0d5b13b4f2f89c78e1d5b865c8;hb=82217038368a953179398d9ecc7b80169a1b9ddc;hp=c296bfe2c7d438f7807931b02bfd402e9f3271b0;hpb=f514231dd2fc0c2adc1ebab5c46a4b55d2bd9c2b;p=pspp-builds.git diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index c296bfe2..26c1ee4d 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 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,18 +21,18 @@ #define _(msgid) gettext (msgid) #define N_(msgid) msgid - +#include #include -#include +#include #include "psppire-var-store.h" -#include "var-sheet.h" #include "helper.h" #include #include +#include #include #include "val-labs-dialog.h" @@ -41,35 +41,58 @@ #include "var-display.h" -#define TRAILING_ROWS 40 +enum + { + PROP_0, + PSPPIRE_VAR_STORE_FORMAT_TYPE + }; 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 (GSheetModelIface *iface); +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 gchar *psppire_var_store_get_string (const PsppireSheetModel *sheet_model, glong row, glong column); -static gchar *psppire_var_store_get_string (const GSheetModel *sheet_model, glong row, glong column); +static gboolean psppire_var_store_clear (PsppireSheetModel *model, glong row, glong col); -static gboolean psppire_var_store_clear (GSheetModel *model, glong row, glong col); - -static gboolean psppire_var_store_set_string (GSheetModel *model, +static gboolean psppire_var_store_set_string (PsppireSheetModel *model, const gchar *text, glong row, glong column); -static glong psppire_var_store_get_row_count (const GSheetModel * model); - -static gchar *text_for_column (const struct variable *pv, gint c, GError **err); +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 (PsppireVarStore *vs, const struct variable *pv, + gint c, GError **err); -static void psppire_var_store_sheet_row_init (GSheetRowIface *iface); +static GObjectClass *parent_class = NULL; +GType +psppire_var_store_format_type_get_type (void) +{ + static GType etype = 0; + if (etype == 0) + { + static const GEnumValue values[] = + { + { PSPPIRE_VAR_STORE_INPUT_FORMATS, + "PSPPIRE_VAR_STORE_INPUT_FORMATS", + "input" }, + { PSPPIRE_VAR_STORE_OUTPUT_FORMATS, + "PSPPIRE_VAR_STORE_OUTPUT_FORMATS", + "output" }, + { 0, NULL, NULL } + }; + + etype = g_enum_register_static + (g_intern_static_string ("PsppireVarStoreFormatType"), values); -static GObjectClass *parent_class = NULL; + } + return etype; +} GType psppire_var_store_get_type (void) @@ -98,51 +121,93 @@ psppire_var_store_get_type (void) NULL }; - static const GInterfaceInfo sheet_row_info = - { - (GInterfaceInitFunc) psppire_var_store_sheet_row_init, - NULL, - NULL - }; - var_store_type = g_type_register_static (G_TYPE_OBJECT, "PsppireVarStore", &var_store_info, 0); g_type_add_interface_static (var_store_type, - G_TYPE_SHEET_MODEL, + PSPPIRE_TYPE_SHEET_MODEL, &sheet_model_info); + } - g_type_add_interface_static (var_store_type, - G_TYPE_SHEET_ROW, - &sheet_row_info); + return var_store_type; +} +static void +psppire_var_store_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + PsppireVarStore *self = (PsppireVarStore *) object; + + switch (property_id) + { + case PSPPIRE_VAR_STORE_FORMAT_TYPE: + self->format_type = g_value_get_enum (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; } +} - return var_store_type; +static void +psppire_var_store_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + PsppireVarStore *self = (PsppireVarStore *) object; + + switch (property_id) + { + case PSPPIRE_VAR_STORE_FORMAT_TYPE: + g_value_set_enum (value, self->format_type); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } } + static void psppire_var_store_class_init (PsppireVarStoreClass *class) { GObjectClass *object_class; + GParamSpec *pspec; parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; object_class->finalize = psppire_var_store_finalize; + 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", + "Variable format type", + ("Whether variables have input or output " + "formats"), + PSPPIRE_TYPE_VAR_STORE_FORMAT_TYPE, + PSPPIRE_VAR_STORE_OUTPUT_FORMATS, + G_PARAM_READWRITE); + + g_object_class_install_property (object_class, + PSPPIRE_VAR_STORE_FORMAT_TYPE, + pspec); } +#define DISABLED_COLOR "gray" static void psppire_var_store_init (PsppireVarStore *var_store) { - GdkColormap *colormap = gdk_colormap_get_system (); - - g_assert (gdk_color_parse ("gray", &var_store->disabled)); - - gdk_colormap_alloc_color (colormap, &var_store->disabled, FALSE, TRUE); + if ( ! gdk_color_parse (DISABLED_COLOR, &var_store->disabled)) + g_critical ("Could not parse color \"%s\"", DISABLED_COLOR); var_store->dict = 0; + var_store->format_type = PSPPIRE_VAR_STORE_OUTPUT_FORMATS; } static gboolean @@ -155,7 +220,7 @@ psppire_var_store_item_editable (PsppireVarStore *var_store, glong row, glong co if ( !pv ) return TRUE; - if ( var_is_alpha (pv) && column == COL_DECIMALS ) + if ( var_is_alpha (pv) && column == PSPPIRE_VAR_STORE_COL_DECIMALS ) return FALSE; write_spec = var_get_print_format (pv); @@ -175,7 +240,7 @@ psppire_var_store_item_editable (PsppireVarStore *var_store, glong row, glong co case FMT_DTIME: case FMT_WKDAY: case FMT_MONTH: - if ( column == COL_DECIMALS || column == COL_WIDTH) + if ( column == PSPPIRE_VAR_STORE_COL_DECIMALS || column == PSPPIRE_VAR_STORE_COL_WIDTH) return FALSE; break; default: @@ -193,15 +258,15 @@ psppire_var_store_get_var (PsppireVarStore *store, glong row) } static gboolean -psppire_var_store_is_editable (const GSheetModel *model, glong row, glong column) +psppire_var_store_is_editable (const PsppireSheetModel *model, glong row, glong column) { PsppireVarStore *store = PSPPIRE_VAR_STORE (model); return psppire_var_store_item_editable (store, row, column); } -static const GdkColor * -psppire_var_store_get_foreground (const GSheetModel *model, glong row, glong column) +static GdkColor * +psppire_var_store_get_foreground (const PsppireSheetModel *model, glong row, glong column) { PsppireVarStore *store = PSPPIRE_VAR_STORE (model); @@ -212,34 +277,31 @@ psppire_var_store_get_foreground (const GSheetModel *model, glong row, glong col } -const PangoFontDescription * -psppire_var_store_get_font_desc (const GSheetModel *model, - glong row, glong column) -{ - PsppireVarStore *store = PSPPIRE_VAR_STORE (model); - - return store->font_desc; -} - - +static gchar *get_column_title (const PsppireSheetModel *model, gint col); +static gchar *get_row_title (const PsppireSheetModel *model, gint row); +static gboolean get_row_sensitivity (const PsppireSheetModel *model, gint row); static void -psppire_var_store_sheet_model_init (GSheetModelIface *iface) +psppire_var_store_sheet_model_init (PsppireSheetModelIface *iface) { iface->get_row_count = psppire_var_store_get_row_count; + iface->get_column_count = psppire_var_store_get_column_count; iface->free_strings = TRUE; iface->get_string = psppire_var_store_get_string; iface->set_string = psppire_var_store_set_string; iface->clear_datum = psppire_var_store_clear; iface->is_editable = psppire_var_store_is_editable; - iface->is_visible = NULL; iface->get_foreground = psppire_var_store_get_foreground; iface->get_background = NULL; - iface->get_font_desc = psppire_var_store_get_font_desc; - iface->get_cell_border = NULL; -} + iface->get_justification = NULL; + + iface->get_column_title = get_column_title; + iface->get_row_title = get_row_title; + iface->get_row_sensitivity = get_row_sensitivity; + iface->get_row_overstrike = NULL; +} /** * psppire_var_store_new: @@ -263,19 +325,19 @@ psppire_var_store_new (PsppireDict *dict) static void var_change_callback (GtkWidget *w, gint n, gpointer data) { - GSheetModel *model = G_SHEET_MODEL (data); + PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data); - g_sheet_model_range_changed (model, - n, 0, n, n_COLS); + 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) { - GSheetModel *model = G_SHEET_MODEL (data); + PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data); - g_sheet_model_rows_deleted (model, dict_idx, 1); + psppire_sheet_model_rows_deleted (model, dict_idx, 1); } @@ -283,12 +345,18 @@ var_delete_callback (GtkWidget *w, gint dict_idx, gint case_idx, gint val_cnt, g static void var_insert_callback (GtkWidget *w, glong row, gpointer data) { - GSheetModel *model = G_SHEET_MODEL (data); + PsppireSheetModel *model = PSPPIRE_SHEET_MODEL (data); - g_sheet_model_rows_inserted (model, row, 1); + 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); +} /** * psppire_var_store_replace_set_dictionary: @@ -311,12 +379,14 @@ psppire_var_store_set_dictionary (PsppireVarStore *var_store, PsppireDict *dict) g_signal_connect (dict, "variable-deleted", G_CALLBACK (var_delete_callback), var_store); - g_signal_connect (dict, "variable-inserted", G_CALLBACK (var_insert_callback), - var_store); + g_signal_connect (dict, "variable-inserted", + G_CALLBACK (var_insert_callback), var_store); + g_signal_connect (dict, "backend-changed", G_CALLBACK (refresh), + var_store); /* The entire model has changed */ - g_sheet_model_range_changed (G_SHEET_MODEL (var_store), -1, -1, -1, -1); + psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (var_store), -1, -1, -1, -1); } static void @@ -327,7 +397,8 @@ psppire_var_store_finalize (GObject *object) } static gchar * -psppire_var_store_get_string (const GSheetModel *model, glong row, glong column) +psppire_var_store_get_string (const PsppireSheetModel *model, + glong row, glong column) { PsppireVarStore *store = PSPPIRE_VAR_STORE (model); @@ -338,7 +409,7 @@ psppire_var_store_get_string (const GSheetModel *model, glong row, glong column) pv = psppire_dict_get_variable (store->dict, row); - return text_for_column (pv, column, 0); + return text_for_column (store, pv, column, 0); } @@ -347,7 +418,7 @@ psppire_var_store_get_string (const GSheetModel *model, glong row, glong column) Returns true if anything was updated, false otherwise. */ static gboolean -psppire_var_store_clear (GSheetModel *model, glong row, glong col) +psppire_var_store_clear (PsppireSheetModel *model, glong row, glong col) { struct variable *pv ; @@ -363,8 +434,8 @@ psppire_var_store_clear (GSheetModel *model, glong row, glong col) switch (col) { - case COL_LABEL: - var_set_label (pv, 0); + case PSPPIRE_VAR_STORE_COL_LABEL: + var_set_label (pv, NULL); return TRUE; break; } @@ -377,7 +448,7 @@ psppire_var_store_clear (GSheetModel *model, glong row, glong col) Returns true if anything was updated, false otherwise. */ static gboolean -psppire_var_store_set_string (GSheetModel *model, +psppire_var_store_set_string (PsppireSheetModel *model, const gchar *text, glong row, glong col) { struct variable *pv ; @@ -394,31 +465,45 @@ psppire_var_store_set_string (GSheetModel *model, switch (col) { - case COL_NAME: - return psppire_dict_rename_var (var_store->dict, pv, text); - break; - case COL_COLUMNS: + case PSPPIRE_VAR_STORE_COL_NAME: + { + gboolean ok; + ok = psppire_dict_rename_var (var_store->dict, pv, text); + return ok; + } + case PSPPIRE_VAR_STORE_COL_COLUMNS: if ( ! text) return FALSE; var_set_display_width (pv, atoi (text)); return TRUE; break; - case COL_WIDTH: + 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); - if ( width < fmt_min_output_width (fmt.type) + if ( width < fmt_min_width (fmt.type, for_input) || - width > fmt_max_output_width (fmt.type)) + width > fmt_max_width (fmt.type, for_input)) return FALSE; fmt.w = width; - fmt.d = MIN (fmt_max_output_decimals (fmt.type, width), fmt.d); + fmt.d = MIN (fmt_max_decimals (fmt.type, width, for_input), fmt.d); var_set_both_formats (pv, &fmt); } @@ -426,17 +511,20 @@ psppire_var_store_set_string (GSheetModel *model, return TRUE; } break; - case COL_DECIMALS: + case PSPPIRE_VAR_STORE_COL_DECIMALS: { + bool for_input + = var_store->format_type == PSPPIRE_VAR_STORE_INPUT_FORMATS; int decimals; struct fmt_spec fmt; if ( ! text) return FALSE; decimals = atoi (text); fmt = *var_get_write_format (pv); if ( decimals > - fmt_max_output_decimals (fmt.type, - fmt.w - )) + fmt_max_decimals (fmt.type, + fmt.w, + for_input + )) return FALSE; fmt.d = decimals; @@ -444,15 +532,17 @@ psppire_var_store_set_string (GSheetModel *model, return TRUE; } break; - case COL_LABEL: - var_set_label (pv, text); - return TRUE; + case PSPPIRE_VAR_STORE_COL_LABEL: + { + var_set_label (pv, text); + return TRUE; + } break; - case COL_TYPE: - case COL_VALUES: - case COL_MISSING: - case COL_ALIGN: - case COL_MEASURE: + case PSPPIRE_VAR_STORE_COL_TYPE: + case PSPPIRE_VAR_STORE_COL_VALUES: + case PSPPIRE_VAR_STORE_COL_MISSING: + case PSPPIRE_VAR_STORE_COL_ALIGN: + case PSPPIRE_VAR_STORE_COL_MEASURE: /* These can be modified only by their respective dialog boxes */ return FALSE; break; @@ -465,11 +555,13 @@ psppire_var_store_set_string (GSheetModel *model, } -const static gchar none[] = N_("None"); +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) { + PsppireDict *dict = vs->dict; static const gchar *const type_label[] = { N_("Numeric"), @@ -481,6 +573,7 @@ text_for_column (const struct variable *pv, gint c, GError **err) N_("Custom"), N_("String") }; + enum {VT_NUMERIC, VT_COMMA, VT_DOT, VT_SCIENTIFIC, VT_DATE, VT_DOLLAR, VT_CUSTOM, VT_STRING}; @@ -488,10 +581,10 @@ text_for_column (const struct variable *pv, gint c, GError **err) switch (c) { - case COL_NAME: - return pspp_locale_to_utf8 ( var_get_name (pv), -1, err); + case PSPPIRE_VAR_STORE_COL_NAME: + return xstrdup (var_get_name (pv)); break; - case COL_TYPE: + case PSPPIRE_VAR_STORE_COL_TYPE: { switch ( write_spec->type ) { @@ -545,7 +638,7 @@ text_for_column (const struct variable *pv, gint c, GError **err) } } break; - case COL_WIDTH: + case PSPPIRE_VAR_STORE_COL_WIDTH: { gchar *s; GString *gstr = g_string_sized_new (10); @@ -555,7 +648,7 @@ text_for_column (const struct variable *pv, gint c, GError **err) return s; } break; - case COL_DECIMALS: + case PSPPIRE_VAR_STORE_COL_DECIMALS: { gchar *s; GString *gstr = g_string_sized_new (10); @@ -565,7 +658,7 @@ text_for_column (const struct variable *pv, gint c, GError **err) return s; } break; - case COL_COLUMNS: + case PSPPIRE_VAR_STORE_COL_COLUMNS: { gchar *s; GString *gstr = g_string_sized_new (10); @@ -575,45 +668,42 @@ text_for_column (const struct variable *pv, gint c, GError **err) return s; } break; - case COL_LABEL: - return pspp_locale_to_utf8 (var_get_label (pv), -1, err); + case PSPPIRE_VAR_STORE_COL_LABEL: + { + const char *label = var_get_label (pv); + if (label) + return xstrdup (label); + return NULL; + } break; - case COL_MISSING: + case PSPPIRE_VAR_STORE_COL_MISSING: { - return missing_values_to_string (pv, err); + return missing_values_to_string (dict, pv, err); } break; - case COL_VALUES: + case PSPPIRE_VAR_STORE_COL_VALUES: { if ( ! var_has_value_labels (pv)) return g_locale_to_utf8 (gettext (none), -1, 0, 0, err); 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 *const vstr = value_to_text (vl->value, dict, *write_spec); - g_string_printf (gstr, "{%s,\"%s\"}_", vstr, vl->label); - g_free (vstr); + return g_strdup_printf ( "{%s,\"%s\"}_", vstr, val_lab_get_label (vl)); } - - val_labs_done (&ip); - - ss = pspp_locale_to_utf8 (gstr->str, gstr->len, err); - g_string_free (gstr, TRUE); - return ss; } } break; - case COL_ALIGN: + case PSPPIRE_VAR_STORE_COL_ALIGN: { const gint align = var_get_alignment (pv); @@ -621,7 +711,7 @@ text_for_column (const struct variable *pv, gint c, GError **err) return g_locale_to_utf8 (gettext (alignments[align]), -1, 0, 0, err); } break; - case COL_MEASURE: + case PSPPIRE_VAR_STORE_COL_MEASURE: { return measure_to_string (pv, err); } @@ -640,20 +730,8 @@ psppire_var_store_get_var_cnt (PsppireVarStore *store) } -void -psppire_var_store_set_font (PsppireVarStore *store, const PangoFontDescription *fd) -{ - g_return_if_fail (store); - g_return_if_fail (PSPPIRE_IS_VAR_STORE (store)); - - store->font_desc = fd; - - g_sheet_model_range_changed (G_SHEET_MODEL (store), -1, -1, -1, -1); -} - - static glong -psppire_var_store_get_row_count (const GSheetModel * model) +psppire_var_store_get_row_count (const PsppireSheetModel * model) { gint rows = 0; PsppireVarStore *vs = PSPPIRE_VAR_STORE (model); @@ -664,32 +742,21 @@ psppire_var_store_get_row_count (const GSheetModel * model) return rows ; } -/* Row related funcs */ - static glong -geometry_get_row_count (const GSheetRow *geom, gpointer data) +psppire_var_store_get_column_count (const PsppireSheetModel * model) { - gint rows = 0; - PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom); - - if (vs->dict) - rows = psppire_dict_get_var_cnt (vs->dict); - - return rows + TRAILING_ROWS; + return PSPPIRE_VAR_STORE_n_COLS ; } + -static gint -geometry_get_height (const GSheetRow *geom, glong row, gpointer data) -{ - return 25; -} +/* Row related funcs */ static gboolean -geometry_is_sensitive (const GSheetRow *geom, glong row, gpointer data) +get_row_sensitivity (const PsppireSheetModel *model, gint row) { - PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom); + PsppireVarStore *vs = PSPPIRE_VAR_STORE (model); if ( ! vs->dict) return FALSE; @@ -697,32 +764,34 @@ geometry_is_sensitive (const GSheetRow *geom, glong row, gpointer data) return row < psppire_dict_get_var_cnt (vs->dict); } -static -gboolean always_true () -{ - return TRUE; -} - static gchar * -geometry_get_button_label (const GSheetRow *geom, glong unit, gpointer data) +get_row_title (const PsppireSheetModel *model, gint unit) { - gchar *label = g_strdup_printf (_("%ld"), unit); - - return label; + return g_strdup_printf (_("%d"), unit + 1); } -static void -psppire_var_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_is_sensitive; - iface->get_button_label = geometry_get_button_label; -} + +static const gchar *column_titles[] = { + N_("Name"), + N_("Type"), + N_("Width"), + N_("Decimals"), + N_("Label"), + N_("Values"), + N_("Missing"), + N_("Columns"), + N_("Align"), + N_("Measure"), +}; +static gchar * +get_column_title (const PsppireSheetModel *model, gint col) +{ + if ( col >= 10) + return NULL; + return g_strdup (gettext (column_titles[col])); +}