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=4575bd3bcb90fc6c1d60a4c6ba7fb72574f72275;hpb=ddd7c113f3e50c8d87f6a677856799d05a1f40c7;p=pspp-builds.git diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index 4575bd3b..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,14 +21,13 @@ #define _(msgid) gettext (msgid) #define N_(msgid) msgid - +#include #include -#include +#include #include "psppire-var-store.h" -#include #include "helper.h" #include @@ -44,35 +43,29 @@ enum { - PSPPIRE_VAR_STORE_TRAILING_ROWS = 1, + 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 GSheetModel *sheet_model, glong row, glong column); +static gchar *psppire_var_store_get_string (const PsppireSheetModel *sheet_model, glong row, glong column); -static gboolean psppire_var_store_clear (GSheetModel *model, glong row, glong col); +static gboolean psppire_var_store_clear (PsppireSheetModel *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 glong psppire_var_store_get_column_count (const GSheetModel * model); - -static gchar *text_for_column (const struct variable *pv, gint c, GError **err); - - -static void psppire_var_store_sheet_row_init (GSheetRowIface *iface); +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 GObjectClass *parent_class = NULL; @@ -128,24 +121,11 @@ 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; @@ -161,10 +141,6 @@ psppire_var_store_set_property (GObject *object, switch (property_id) { - case PSPPIRE_VAR_STORE_TRAILING_ROWS: - self->trailing_rows = g_value_get_int (value); - break; - case PSPPIRE_VAR_STORE_FORMAT_TYPE: self->format_type = g_value_get_enum (value); break; @@ -185,10 +161,6 @@ psppire_var_store_get_property (GObject *object, switch (property_id) { - case PSPPIRE_VAR_STORE_TRAILING_ROWS: - g_value_set_int (value, self->trailing_rows); - break; - case PSPPIRE_VAR_STORE_FORMAT_TYPE: g_value_set_enum (value, self->format_type); break; @@ -213,27 +185,14 @@ psppire_var_store_class_init (PsppireVarStoreClass *class) object_class->set_property = psppire_var_store_set_property; object_class->get_property = psppire_var_store_get_property; - /* The minimum value for trailing-rows is 1 to prevent the - var-store from ever having 0 rows, which breaks invariants - in gtksheet. */ - pspec = g_param_spec_int ("trailing-rows", - "Trailing rows", - "Number of rows displayed after last variable", - 1 /* minimum value */, - 100 /* maximum value */, - 40 /* default value */, - G_PARAM_READWRITE); - g_object_class_install_property (object_class, - PSPPIRE_VAR_STORE_TRAILING_ROWS, - pspec); - pspec = g_param_spec_enum ("format-type", "Variable format type", ("Whether variables have input or output " "formats"), - G_TYPE_PSPPIRE_VAR_STORE_FORMAT_TYPE, + 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); @@ -248,7 +207,6 @@ psppire_var_store_init (PsppireVarStore *var_store) g_critical ("Could not parse color \"%s\"", DISABLED_COLOR); var_store->dict = 0; - var_store->trailing_rows = 40; var_store->format_type = PSPPIRE_VAR_STORE_OUTPUT_FORMATS; } @@ -300,7 +258,7 @@ 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); @@ -308,7 +266,7 @@ psppire_var_store_is_editable (const GSheetModel *model, glong row, glong column static GdkColor * -psppire_var_store_get_foreground (const GSheetModel *model, glong row, glong column) +psppire_var_store_get_foreground (const PsppireSheetModel *model, glong row, glong column) { PsppireVarStore *store = PSPPIRE_VAR_STORE (model); @@ -319,20 +277,12 @@ 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 GSheetModel *model, gint col); +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; @@ -341,14 +291,16 @@ psppire_var_store_sheet_model_init (GSheetModelIface *iface) 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; } /** @@ -373,9 +325,9 @@ 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, + psppire_sheet_model_range_changed (model, n, 0, n, PSPPIRE_VAR_STORE_n_COLS); } @@ -383,9 +335,9 @@ var_change_callback (GtkWidget *w, gint n, gpointer data) 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); } @@ -393,9 +345,9 @@ 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 @@ -403,7 +355,7 @@ refresh (PsppireDict *d, gpointer data) { PsppireVarStore *vs = data; - g_sheet_model_range_changed (G_SHEET_MODEL (vs), -1, -1, -1, -1); + psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (vs), -1, -1, -1, -1); } /** @@ -434,7 +386,7 @@ psppire_var_store_set_dictionary (PsppireVarStore *var_store, PsppireDict *dict) 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 @@ -445,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); @@ -456,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); } @@ -465,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 ; @@ -482,7 +435,7 @@ psppire_var_store_clear (GSheetModel *model, glong row, glong col) switch (col) { case PSPPIRE_VAR_STORE_COL_LABEL: - var_set_label (pv, 0); + var_set_label (pv, NULL); return TRUE; break; } @@ -495,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 ; @@ -513,8 +466,11 @@ psppire_var_store_set_string (GSheetModel *model, switch (col) { case PSPPIRE_VAR_STORE_COL_NAME: - return psppire_dict_rename_var (var_store->dict, pv, text); - break; + { + 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)); @@ -522,10 +478,19 @@ psppire_var_store_set_string (GSheetModel *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 @@ -568,8 +533,10 @@ psppire_var_store_set_string (GSheetModel *model, } break; case PSPPIRE_VAR_STORE_COL_LABEL: - var_set_label (pv, text); - return TRUE; + { + var_set_label (pv, text); + return TRUE; + } break; case PSPPIRE_VAR_STORE_COL_TYPE: case PSPPIRE_VAR_STORE_COL_VALUES: @@ -588,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"), @@ -604,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}; @@ -612,7 +582,7 @@ text_for_column (const struct variable *pv, gint c, GError **err) 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: { @@ -699,12 +669,17 @@ 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: @@ -713,26 +688,18 @@ text_for_column (const struct variable *pv, gint c, GError **err) 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; @@ -763,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); @@ -788,38 +743,20 @@ psppire_var_store_get_row_count (const GSheetModel * model) } static glong -psppire_var_store_get_column_count (const GSheetModel * model) +psppire_var_store_get_column_count (const PsppireSheetModel * model) { return PSPPIRE_VAR_STORE_n_COLS ; } + /* Row related funcs */ -static glong -geometry_get_row_count (const GSheetRow *geom) -{ - gint rows = 0; - PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom); - - if (vs->dict) - rows = psppire_dict_get_var_cnt (vs->dict); - - return rows + vs->trailing_rows; -} - - -static gint -geometry_get_height (const GSheetRow *geom, glong row) -{ - return 25; -} - static gboolean -geometry_is_sensitive (const GSheetRow *geom, glong row) +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; @@ -827,23 +764,11 @@ geometry_is_sensitive (const GSheetRow *geom, glong row) return row < psppire_dict_get_var_cnt (vs->dict); } -static gchar * -geometry_get_button_label (const GSheetRow *geom, glong unit) -{ - gchar *label = g_strdup_printf (_("%ld"), unit + 1); - - return label; -} -static void -psppire_var_store_sheet_row_init (GSheetRowIface *iface) +static gchar * +get_row_title (const PsppireSheetModel *model, gint unit) { - iface->get_row_count = geometry_get_row_count; - iface->get_height = geometry_get_height; - iface->set_height = NULL; - iface->get_sensitivity = geometry_is_sensitive; - - iface->get_button_label = geometry_get_button_label; + return g_strdup_printf (_("%d"), unit + 1); } @@ -864,7 +789,7 @@ static const gchar *column_titles[] = { static gchar * -get_column_title (const GSheetModel *model, gint col) +get_column_title (const PsppireSheetModel *model, gint col) { if ( col >= 10) return NULL;