X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=4662978bd3a3de3ab9e68539cfd27c20f2f866e0;hb=7f7a97504941ebe3293e135c9dbe21a4d9ff6edf;hp=047cca78113fddef9a70e1f53becabfc0cacb9fb;hpb=6f3865480503c571963d8a2d1af858a4d72d4e88;p=pspp diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index 047cca7811..4662978bd3 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -1,5 +1,6 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2006, 2008, 2009, 2010, 2011, 2012 Free Software Foundation + Copyright (C) 2006, 2008, 2009, 2010, 2011, 2012, + 2013, 2016, 2017 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 @@ -19,7 +20,7 @@ #include #include #define _(msgid) gettext (msgid) -#define N_(msgid) msgid +#define P_(msgid) msgid #include #include @@ -41,13 +42,9 @@ #include -#include "xalloc.h" #include "xmalloca.h" - - -static void psppire_data_store_init (PsppireDataStore *data_store); -static void psppire_data_store_class_init (PsppireDataStoreClass *class); +#include "value-variant.h" static void psppire_data_store_finalize (GObject *object); static void psppire_data_store_dispose (GObject *object); @@ -67,77 +64,250 @@ static GObjectClass *parent_class = NULL; enum { - BACKEND_CHANGED, - CASES_DELETED, - CASE_INSERTED, + ITEMS_CHANGED, CASE_CHANGED, n_SIGNALS }; static guint signals [n_SIGNALS]; +static gint +__tree_model_iter_n_children (GtkTreeModel *tree_model, + GtkTreeIter *iter) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); + + if (store->datasheet == NULL) + return 0; + + gint n = datasheet_get_n_rows (store->datasheet); + + return n; +} + +static GtkTreeModelFlags +__tree_model_get_flags (GtkTreeModel *model) +{ + g_return_val_if_fail (PSPPIRE_IS_DATA_STORE (model), (GtkTreeModelFlags) 0); + + return GTK_TREE_MODEL_LIST_ONLY; +} + +static gint +__tree_model_get_n_columns (GtkTreeModel *tree_model) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); + + return psppire_dict_get_var_cnt (store->dict); +} + -GType -psppire_data_store_get_type (void) +static gboolean +__iter_nth_child (GtkTreeModel *tree_model, + GtkTreeIter *iter, + GtkTreeIter *parent, + gint n) { - static GType data_store_type = 0; + PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); - if (!data_store_type) + g_assert (parent == NULL); + g_return_val_if_fail (store, FALSE); + + if (!store->datasheet || n >= datasheet_get_n_rows (store->datasheet)) { - static const GTypeInfo data_store_info = - { - sizeof (PsppireDataStoreClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) psppire_data_store_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PsppireDataStore), - 0, - (GInstanceInitFunc) psppire_data_store_init, - }; - - data_store_type = g_type_register_static (G_TYPE_OBJECT, - "PsppireDataStore", - &data_store_info, 0); + iter->stamp = -1; + iter->user_data = NULL; + return FALSE; } - return data_store_type; + iter->user_data = GINT_TO_POINTER (n); + iter->stamp = store->stamp; + + return TRUE; +} + +/* Set the contents of OUT to reflect the information provided by IN, COL, and + ROW, for MODEL. Returns TRUE if successful. */ +gboolean +psppire_data_store_string_to_value (GtkTreeModel *model, gint col, gint row, + const gchar *in, GValue *out) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (model); + + while (col >= psppire_dict_get_var_cnt (store->dict)) + { + const struct variable *var = + psppire_dict_insert_variable (store->dict, + psppire_dict_get_var_cnt (store->dict), + NULL); + g_return_val_if_fail (var, FALSE); + } + + const struct variable *variable = psppire_dict_get_variable (store->dict, col); + g_return_val_if_fail (variable, FALSE); + + const struct fmt_spec *fmt = var_get_print_format (variable); + + int width = var_get_width (variable); + + union value val; + value_init (&val, width); + const struct val_labs *value_labels = var_get_value_labels (variable); + const union value *vp = NULL; + if (value_labels) + { + vp = val_labs_find_value (value_labels, in); + if (vp) + value_copy (&val, vp, width); + } + char *xx = NULL; + if (vp == NULL) + { + xx = data_in (ss_cstr (in), psppire_dict_encoding (store->dict), + fmt->type, settings_get_fmt_settings (), + &val, width, "UTF-8"); + } + + GVariant *vrnt = value_variant_new (&val, width); + value_destroy (&val, width); + + g_value_init (out, G_TYPE_VARIANT); + g_value_set_variant (out, vrnt); + free (xx); + return TRUE; +} + +static char * +unlabeled_value (PsppireDataStore *store, const struct variable *variable, const union value *val) +{ + if (var_is_numeric (variable) && + var_is_value_missing (variable, val, MV_SYSTEM)) + return g_strdup (""); + + const struct fmt_spec *fmt = var_get_print_format (variable); + return value_to_text__ (*val, fmt, psppire_dict_encoding (store->dict)); +} + +gchar * +psppire_data_store_value_to_string (gpointer unused, PsppireDataStore *store, gint col, gint row, const GValue *v) +{ + const struct variable *variable = psppire_dict_get_variable (store->dict, col); + g_return_val_if_fail (variable, g_strdup ("???")); + + GVariant *vrnt = g_value_get_variant (v); + g_return_val_if_fail (vrnt, g_strdup ("???")); + + union value val; + value_variant_get (&val, vrnt); + + char *out = unlabeled_value (store, variable, &val); + + value_destroy_from_variant (&val, vrnt); + + return out; +} + +gchar * +psppire_data_store_value_to_string_with_labels (gpointer unused, PsppireDataStore *store, gint col, gint row, const GValue *v) +{ + const struct variable *variable = psppire_dict_get_variable (store->dict, col); + g_return_val_if_fail (variable, g_strdup ("???")); + + GVariant *vrnt = g_value_get_variant (v); + union value val; + value_variant_get (&val, vrnt); + + char *out = NULL; + + const struct val_labs *vls = var_get_value_labels (variable); + struct val_lab *vl = val_labs_lookup (vls, &val); + if (vl != NULL) + out = strdup (val_lab_get_label (vl)); + else + out = unlabeled_value (store, variable, &val); + + value_destroy_from_variant (&val, vrnt); + + return out; +} + +static void +__get_value (GtkTreeModel *tree_model, + GtkTreeIter *iter, + gint column, + GValue *value) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); + + g_return_if_fail (iter->stamp == store->stamp); + + const struct variable *variable = psppire_dict_get_variable (store->dict, column); + if (NULL == variable) + return; + + gint row = GPOINTER_TO_INT (iter->user_data); + + struct ccase *cc = datasheet_get_row (store->datasheet, row); + + g_return_if_fail (cc); + + g_value_init (value, G_TYPE_VARIANT); + + const union value *val = case_data_idx (cc, var_get_case_index (variable)); + + GVariant *vv = value_variant_new (val, var_get_width (variable)); + + g_value_set_variant (value, vv); + + case_unref (cc); } +static void +__tree_model_init (GtkTreeModelIface *iface) +{ + iface->get_flags = __tree_model_get_flags; + iface->get_n_columns = __tree_model_get_n_columns ; + iface->get_column_type = NULL; + iface->get_iter = NULL; + iface->iter_next = NULL; + iface->get_path = NULL; + iface->get_value = __get_value; + + iface->iter_children = NULL; + iface->iter_has_child = NULL; + iface->iter_n_children = __tree_model_iter_n_children; + iface->iter_nth_child = __iter_nth_child; + iface->iter_parent = NULL; +} + +G_DEFINE_TYPE_WITH_CODE (PsppireDataStore, psppire_data_store, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, + __tree_model_init)) + static void psppire_data_store_class_init (PsppireDataStoreClass *class) { GObjectClass *object_class; parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass*) class; + object_class = G_OBJECT_CLASS (class); object_class->finalize = psppire_data_store_finalize; object_class->dispose = psppire_data_store_dispose; - signals [BACKEND_CHANGED] = - g_signal_new ("backend-changed", + signals [ITEMS_CHANGED] = + g_signal_new ("items-changed", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + psppire_marshal_VOID__UINT_UINT_UINT, G_TYPE_NONE, - 0); - - signals [CASE_INSERTED] = - g_signal_new ("case-inserted", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_FIRST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, - 1, - G_TYPE_INT); - + 3, + G_TYPE_UINT, /* Index of the start of the change */ + G_TYPE_UINT, /* The number of items deleted */ + G_TYPE_UINT); /* The number of items inserted */ signals [CASE_CHANGED] = g_signal_new ("case-changed", @@ -149,26 +319,10 @@ psppire_data_store_class_init (PsppireDataStoreClass *class) G_TYPE_NONE, 1, G_TYPE_INT); - - signals [CASES_DELETED] = - g_signal_new ("cases-deleted", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_FIRST, - 0, - NULL, NULL, - psppire_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, - G_TYPE_INT, - G_TYPE_INT); } -static gboolean -psppire_data_store_insert_value (PsppireDataStore *ds, - gint width, gint where); - casenumber psppire_data_store_get_case_count (const PsppireDataStore *store) { @@ -193,8 +347,21 @@ psppire_data_store_init (PsppireDataStore *data_store) data_store->dict = NULL; data_store->datasheet = NULL; data_store->dispose_has_run = FALSE; + data_store->stamp = g_random_int (); +} + + +static void +psppire_data_store_delete_value (PsppireDataStore *store, gint case_index) +{ + g_return_if_fail (store->datasheet); + g_return_if_fail (case_index < datasheet_get_n_columns (store->datasheet)); + + datasheet_delete_columns (store->datasheet, case_index, 1); + datasheet_insert_column (store->datasheet, NULL, -1, case_index); } + /* A callback which occurs after a variable has been deleted. */ @@ -205,14 +372,50 @@ delete_variable_callback (GObject *obj, const struct variable *var UNUSED, { PsppireDataStore *store = PSPPIRE_DATA_STORE (data); + psppire_data_store_delete_value (store, case_index); +} - datasheet_delete_columns (store->datasheet, case_index, 1); - datasheet_insert_column (store->datasheet, NULL, -1, case_index); +struct resize_datum_aux + { + const struct dictionary *dict; + const struct variable *new_variable; + const struct variable *old_variable; + }; + +static void +resize_datum (const union value *old, union value *new, const void *aux_) +{ + const struct resize_datum_aux *aux = aux_; + int new_width = var_get_width (aux->new_variable); + const char *enc = dict_get_encoding (aux->dict); + const struct fmt_spec *newfmt = var_get_print_format (aux->new_variable); + char *s = data_out (old, enc, var_get_print_format (aux->old_variable), + settings_get_fmt_settings ()); + enum fmt_type type = (fmt_usable_for_input (newfmt->type) + ? newfmt->type + : FMT_DOLLAR); + free (data_in (ss_cstr (s), enc, type, settings_get_fmt_settings (), + new, new_width, enc)); + free (s); } static void -variable_changed_callback (GObject *obj, gint var_num, gpointer data) +variable_changed_callback (GObject *obj, gint var_num, guint what, const struct variable *oldvar, + gpointer data) { + PsppireDataStore *store = PSPPIRE_DATA_STORE (data); + struct variable *variable = psppire_dict_get_variable (store->dict, var_num); + + if (what & VAR_TRAIT_WIDTH) + { + int posn = var_get_case_index (variable); + struct resize_datum_aux aux; + aux.old_variable = oldvar; + aux.new_variable = variable; + aux.dict = store->dict->dict; + datasheet_resize_column (store->datasheet, posn, var_get_width (variable), + resize_datum, &aux); + } } static void @@ -231,55 +434,6 @@ insert_variable_callback (GObject *obj, gint var_num, gpointer data) psppire_data_store_insert_value (store, var_get_width (variable), posn); } -struct resize_datum_aux - { - int old_width; - int new_width; - }; - - -void -resize_datum (const union value *old, union value *new, void *aux_) -{ - struct resize_datum_aux *aux = aux_; - - if (aux->new_width == 0) - { - /* FIXME: try to parse string as number. */ - new->f = SYSMIS; - } - else if (aux->old_width == 0) - { - /* FIXME: format number as string. */ - value_set_missing (new, aux->new_width); - } - else - value_copy_rpad (new, aux->new_width, old, aux->old_width, ' '); -} - -static void -dict_size_change_callback (GObject *obj, - gint var_num, gint old_width, gpointer data) -{ - PsppireDataStore *store = PSPPIRE_DATA_STORE (data); - struct variable *variable; - int posn; - - variable = psppire_dict_get_variable (store->dict, var_num); - posn = var_get_case_index (variable); - - if (old_width != var_get_width (variable)) - { - struct resize_datum_aux aux; - aux.old_width = old_width; - aux.new_width = var_get_width (variable); - datasheet_resize_column (store->datasheet, posn, aux.new_width, - resize_datum, &aux); - } -} - - - /** * psppire_data_store_new: * @dict: The dictionary for this data_store. @@ -304,23 +458,28 @@ psppire_data_store_set_reader (PsppireDataStore *ds, struct casereader *reader) { gint i; - - if ( ds->datasheet) - datasheet_destroy (ds->datasheet); + gint old_n = 0; + if (ds->datasheet) + { + old_n = datasheet_get_n_rows (ds->datasheet); + datasheet_destroy (ds->datasheet); + } ds->datasheet = datasheet_create (reader); - if ( ds->dict ) - for (i = 0 ; i < n_dict_signals; ++i ) + gint new_n = datasheet_get_n_rows (ds->datasheet); + + if (ds->dict) + for (i = 0 ; i < n_dict_signals; ++i) { - if ( ds->dict_handler_id [i] > 0) + if (ds->dict_handler_id [i] > 0) { g_signal_handler_unblock (ds->dict, ds->dict_handler_id[i]); } } - g_signal_emit (ds, signals[BACKEND_CHANGED], 0); + g_signal_emit (ds, signals[ITEMS_CHANGED], 0, 0, old_n, new_n); } @@ -338,8 +497,8 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di int i; /* Disconnect any existing handlers */ - if ( data_store->dict ) - for (i = 0 ; i < n_dict_signals; ++i ) + if (data_store->dict) + for (i = 0 ; i < n_dict_signals; ++i) { g_signal_handler_disconnect (data_store->dict, data_store->dict_handler_id[i]); @@ -347,7 +506,7 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di data_store->dict = dict; - if ( dict != NULL) + if (dict != NULL) { data_store->dict_handler_id [VARIABLE_INSERTED] = @@ -364,21 +523,16 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di g_signal_connect (dict, "variable-changed", G_CALLBACK (variable_changed_callback), data_store); - - data_store->dict_handler_id [SIZE_CHANGED] = - g_signal_connect (dict, "dict-size-changed", - G_CALLBACK (dict_size_change_callback), - data_store); } /* The entire model has changed */ - if ( data_store->dict ) - for (i = 0 ; i < n_dict_signals; ++i ) + if (data_store->dict) + for (i = 0 ; i < n_dict_signals; ++i) { - if ( data_store->dict_handler_id [i] > 0) + if (data_store->dict_handler_id [i] > 0) { g_signal_handler_block (data_store->dict, data_store->dict_handler_id[i]); @@ -410,6 +564,7 @@ psppire_data_store_dispose (GObject *object) if (ds->dispose_has_run) return; + psppire_data_store_set_dictionary (ds, NULL); /* must chain up */ (* parent_class->dispose) (object); @@ -442,6 +597,27 @@ psppire_data_store_insert_new_case (PsppireDataStore *ds, casenumber posn) return result; } +gboolean +psppire_data_store_get_value (PsppireDataStore *store, + glong row, const struct variable *var, + union value *val) +{ + g_return_val_if_fail (store != NULL, FALSE); + g_return_val_if_fail (store->datasheet != NULL, FALSE); + g_return_val_if_fail (var != NULL, FALSE); + + if (row < 0 || row >= datasheet_get_n_rows (store->datasheet)) + return FALSE; + + int width = var_get_width (var); + value_init (val, width); + datasheet_get_value (store->datasheet, row, var_get_case_index (var), val); + + return TRUE; +} + + + gchar * psppire_data_store_get_string (PsppireDataStore *store, glong row, const struct variable *var, @@ -449,18 +625,10 @@ psppire_data_store_get_string (PsppireDataStore *store, { gchar *string; union value v; - int width; - - g_return_val_if_fail (store != NULL, NULL); - g_return_val_if_fail (var != NULL, NULL); - - if (row < 0 || row >= datasheet_get_n_rows (store->datasheet)) + int width = var_get_width (var); + if (! psppire_data_store_get_value (store, row, var, &v)) return NULL; - width = var_get_width (var); - value_init (&v, width); - datasheet_get_value (store->datasheet, row, var_get_case_index (var), &v); - string = NULL; if (use_value_label) { @@ -530,7 +698,7 @@ psppire_data_store_clear (PsppireDataStore *ds) psppire_dict_clear (ds->dict); - g_signal_emit (ds, signals [CASES_DELETED], 0, 0, -1); + g_signal_emit (ds, signals [ITEMS_CHANGED], 0, 0, -1, 0); } @@ -539,11 +707,10 @@ psppire_data_store_clear (PsppireDataStore *ds) struct casereader * psppire_data_store_get_reader (PsppireDataStore *ds) { - int i; struct casereader *reader ; - if ( ds->dict ) - for (i = 0 ; i < n_dict_signals; ++i ) + if (ds->dict) + for (int i = 0 ; i < n_dict_signals; ++i) { g_signal_handler_block (ds->dict, ds->dict_handler_id[i]); @@ -557,17 +724,6 @@ psppire_data_store_get_reader (PsppireDataStore *ds) return reader; } - - -/* Column related funcs */ - - -static const gchar null_var_name[]=N_("var"); - - - - - /* Returns the CASENUMth case, or a null pointer on failure. */ struct ccase * @@ -594,7 +750,7 @@ psppire_data_store_delete_cases (PsppireDataStore *ds, casenumber first, datasheet_delete_rows (ds->datasheet, first, n_cases); - g_signal_emit (ds, signals [CASES_DELETED], 0, first, n_cases); + g_signal_emit (ds, signals[ITEMS_CHANGED], 0, first, n_cases, 0); return TRUE; } @@ -615,8 +771,10 @@ psppire_data_store_insert_case (PsppireDataStore *ds, cc = case_ref (cc); result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1); - if ( result ) - g_signal_emit (ds, signals [CASE_INSERTED], 0, posn); + if (result) + { + g_signal_emit (ds, signals[ITEMS_CHANGED], 0, posn, 0, 1); + } else g_warning ("Cannot insert case at position %ld\n", posn); @@ -638,7 +796,7 @@ psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum, g_return_val_if_fail (ds->datasheet, FALSE); n_cases = psppire_data_store_get_case_count (ds); - if ( casenum > n_cases) + if (casenum > n_cases) return FALSE; if (casenum == n_cases) @@ -647,7 +805,10 @@ psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum, ok = datasheet_put_value (ds->datasheet, casenum, var_get_case_index (var), v); if (ok) - g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum); + { + g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum); + g_signal_emit (ds, signals [ITEMS_CHANGED], 0, casenum, 1, 1); + } return ok; } @@ -679,8 +840,8 @@ psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx, FALSE); value_init (&value, width); ok = (datasheet_get_value (ds->datasheet, casenum, idx, &value) - && data_in_msg (input, UTF8, fmt->type, &value, width, - dict_get_encoding (dict->dict)) + && data_in_msg (input, UTF8, fmt->type, settings_get_fmt_settings (), + &value, width, dict_get_encoding (dict->dict)) && datasheet_put_value (ds->datasheet, casenum, idx, &value)); value_destroy (&value, width); @@ -691,7 +852,7 @@ psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx, given WIDTH into every one of them at the position immediately preceding WHERE. */ -static gboolean +gboolean psppire_data_store_insert_value (PsppireDataStore *ds, gint width, gint where) { @@ -701,7 +862,7 @@ psppire_data_store_insert_value (PsppireDataStore *ds, g_assert (width >= 0); - if ( ! ds->datasheet ) + if (! ds->datasheet) ds->datasheet = datasheet_create (NULL); value_init (&value, width); @@ -722,20 +883,20 @@ psppire_data_store_filtered (PsppireDataStore *ds, const struct dictionary *dict; const struct variable *filter; - if ( row < 0 || row >= datasheet_get_n_rows (ds->datasheet)) + if (row < 0 || row >= datasheet_get_n_rows (ds->datasheet)) return FALSE; dict = ds->dict->dict; g_return_val_if_fail (dict, FALSE); filter = dict_get_filter (dict); - if ( ! filter) + if (! filter) return FALSE; g_return_val_if_fail (var_is_numeric (filter), FALSE); value_init (&val, 0); - if ( ! datasheet_get_value (ds->datasheet, row, + if (! datasheet_get_value (ds->datasheet, row, var_get_case_index (filter), - &val) ) + &val)) return FALSE; return (val.f == 0.0);