X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=f97b8eaf1cdc5b246ec81685e590640b79686fd0;hb=4eb2e820b01d92ef662c741f5ac30f08bedd1de6;hp=9833fb496f8a0be6dd3145fc7bbb334fe46b341f;hpb=b5c82cc9aabe7e641011130240ae1b2e84348e23;p=pspp diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index 9833fb496f..f97b8eaf1c 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 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,13 +20,12 @@ #include #include #define _(msgid) gettext (msgid) -#define N_(msgid) msgid +#define P_(msgid) msgid #include #include #include -#include #include #include @@ -45,19 +45,14 @@ #include "xalloc.h" #include "xmalloca.h" - +#include "value-variant.h" static void psppire_data_store_init (PsppireDataStore *data_store); static void psppire_data_store_class_init (PsppireDataStoreClass *class); -static void psppire_data_store_sheet_model_init (PsppireSheetModelIface *iface); static void psppire_data_store_finalize (GObject *object); static void psppire_data_store_dispose (GObject *object); -static gboolean psppire_data_store_clear_datum (PsppireSheetModel *model, - glong row, glong column); - - static gboolean psppire_data_store_insert_case (PsppireDataStore *ds, struct ccase *cc, casenumber posn); @@ -68,22 +63,208 @@ static gboolean psppire_data_store_data_in (PsppireDataStore *ds, struct substring input, const struct fmt_spec *fmt); - - 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); +} + + +static gboolean +__iter_nth_child (GtkTreeModel *tree_model, + GtkTreeIter *iter, + GtkTreeIter *parent, + gint n) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); + + g_assert (parent == NULL); + g_return_val_if_fail (store, FALSE); + + if (!store->datasheet || n >= datasheet_get_n_rows (store->datasheet)) + { + iter->stamp = -1; + iter->user_data = NULL; + return FALSE; + } + + 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); + char *xx = + data_in (ss_cstr (in), psppire_dict_encoding (store->dict), + fmt->type, &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) +{ + const struct fmt_spec *fmt = var_get_print_format (variable); + return data_out (val, psppire_dict_encoding (store->dict), fmt); +} + +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); + 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; + + g_value_init (value, G_TYPE_VARIANT); + + gint row = GPOINTER_TO_INT (iter->user_data); + + struct ccase *cc = datasheet_get_row (store->datasheet, row); + + 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; +} + GType psppire_data_store_get_type (void) @@ -105,22 +286,18 @@ psppire_data_store_get_type (void) (GInstanceInitFunc) psppire_data_store_init, }; - static const GInterfaceInfo sheet_model_info = - { - (GInterfaceInitFunc) psppire_data_store_sheet_model_init, + static const GInterfaceInfo tree_model_info = { + (GInterfaceInitFunc) __tree_model_init, NULL, NULL }; - data_store_type = g_type_register_static (G_TYPE_OBJECT, "PsppireDataStore", &data_store_info, 0); - g_type_add_interface_static (data_store_type, - PSPPIRE_TYPE_SHEET_MODEL, - &sheet_model_info); - + g_type_add_interface_static (data_store_type, GTK_TYPE_TREE_MODEL, + &tree_model_info); } return data_store_type; @@ -138,27 +315,18 @@ psppire_data_store_class_init (PsppireDataStoreClass *class) object_class->finalize = psppire_data_store_finalize; object_class->dispose = psppire_data_store_dispose; - signals [BACKEND_CHANGED] = - g_signal_new ("backend-changed", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_FIRST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - signals [CASE_INSERTED] = - g_signal_new ("case-inserted", + signals [ITEMS_CHANGED] = + g_signal_new ("items-changed", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, - g_cclosure_marshal_VOID__INT, + psppire_marshal_VOID__UINT_UINT_UINT, 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", @@ -170,47 +338,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); - -static bool -psppire_data_store_get_value (const PsppireDataStore *ds, - casenumber casenum, size_t idx, - union value *value); - - -static gboolean -psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum, - gint idx, union value *v); - - - - -static glong -psppire_data_store_get_var_count (const PsppireSheetModel *model) -{ - const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); - - return psppire_dict_get_var_cnt (store->dict); -} - casenumber psppire_data_store_get_case_count (const PsppireDataStore *store) { @@ -229,71 +360,22 @@ psppire_data_store_get_proto (const PsppireDataStore *store) return psppire_dict_get_proto (store->dict); } -static casenumber -psppire_data_store_get_case_count_wrapper (const PsppireSheetModel *model) -{ - const PsppireDataStore *store = PSPPIRE_DATA_STORE (model); - return psppire_data_store_get_case_count (store); -} - static void psppire_data_store_init (PsppireDataStore *data_store) { - data_store->dict = 0; + data_store->dict = NULL; data_store->datasheet = NULL; data_store->dispose_has_run = FALSE; + data_store->stamp = g_random_int (); } -static inline gchar * -psppire_data_store_get_string_wrapper (const PsppireSheetModel *model, glong row, - glong column) -{ - return psppire_data_store_get_string (PSPPIRE_DATA_STORE (model), row, column); -} - - -static inline gboolean -psppire_data_store_set_string_wrapper (PsppireSheetModel *model, - const gchar *text, - glong row, glong column) -{ - return psppire_data_store_set_string (PSPPIRE_DATA_STORE (model), text, - row, column); -} - - - -static gchar * get_column_subtitle (const PsppireSheetModel *model, gint col); -static gchar * get_column_button_label (const PsppireSheetModel *model, gint col); -static gboolean get_column_sensitivity (const PsppireSheetModel *model, gint col); -static GtkJustification get_column_justification (const PsppireSheetModel *model, gint col); - -static gchar * get_row_button_label (const PsppireSheetModel *model, gint row); -static gboolean get_row_sensitivity (const PsppireSheetModel *model, gint row); -static gboolean get_row_overstrike (const PsppireSheetModel *model, gint row); - static void -psppire_data_store_sheet_model_init (PsppireSheetModelIface *iface) +psppire_data_store_delete_value (PsppireDataStore *store, gint case_index) { - iface->free_strings = TRUE; - iface->get_string = psppire_data_store_get_string_wrapper; - iface->set_string = psppire_data_store_set_string_wrapper; - iface->clear_datum = psppire_data_store_clear_datum; - iface->is_editable = NULL; - iface->get_foreground = NULL; - iface->get_background = NULL; - iface->get_column_count = psppire_data_store_get_var_count; - iface->get_row_count = psppire_data_store_get_case_count_wrapper; - - iface->get_column_subtitle = get_column_subtitle; - iface->get_column_title = get_column_button_label; - iface->get_column_sensitivity = get_column_sensitivity; - iface->get_column_justification = get_column_justification; - - iface->get_row_title = get_row_button_label; - iface->get_row_sensitivity = get_row_sensitivity; - iface->get_row_overstrike = get_row_overstrike; + g_return_if_fail (store->datasheet); + datasheet_delete_columns (store->datasheet, case_index, 1); + datasheet_insert_column (store->datasheet, NULL, -1, case_index); } @@ -301,37 +383,54 @@ psppire_data_store_sheet_model_init (PsppireSheetModelIface *iface) A callback which occurs after a variable has been deleted. */ static void -delete_variable_callback (GObject *obj, gint dict_index, - gint case_index, gint width, - gpointer data) +delete_variable_callback (GObject *obj, const struct variable *var UNUSED, + gint dict_index, gint case_index, + gpointer data) { PsppireDataStore *store = PSPPIRE_DATA_STORE (data); + psppire_data_store_delete_value (store, case_index); +} - psppire_sheet_model_columns_deleted (PSPPIRE_SHEET_MODEL (store), dict_index, 1); - datasheet_delete_columns (store->datasheet, case_index, 1); - datasheet_insert_column (store->datasheet, NULL, -1, case_index); -#if AXIS_TRANSITION - +struct resize_datum_aux + { + const struct dictionary *dict; + const struct variable *new_variable; + const struct variable *old_variable; + }; - psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (store), - dict_index, -1); -#endif +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)); + enum fmt_type type = (fmt_usable_for_input (newfmt->type) + ? newfmt->type + : FMT_DOLLAR); + free (data_in (ss_cstr (s), enc, type, 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) { -#if AXIS_TRANSITION PsppireDataStore *store = PSPPIRE_DATA_STORE (data); + struct variable *variable = psppire_dict_get_variable (store->dict, var_num); - psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (store), - var_num, 1); - - psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), - -1, var_num, - -1, var_num); -#endif + 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 @@ -348,65 +447,8 @@ insert_variable_callback (GObject *obj, gint var_num, gpointer data) variable = psppire_dict_get_variable (store->dict, var_num); posn = var_get_case_index (variable); psppire_data_store_insert_value (store, var_get_width (variable), posn); - -#if AXIS_TRANSITION - - psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (store), - var_num, 1); -#endif - - psppire_sheet_model_columns_inserted (PSPPIRE_SHEET_MODEL (store), var_num, 1); } -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. @@ -419,7 +461,7 @@ psppire_data_store_new (PsppireDict *dict) { PsppireDataStore *retval; - retval = g_object_new (GTK_TYPE_DATA_STORE, NULL); + retval = g_object_new (PSPPIRE_TYPE_DATA_STORE, NULL); psppire_data_store_set_dictionary (retval, dict); @@ -431,14 +473,16 @@ psppire_data_store_set_reader (PsppireDataStore *ds, struct casereader *reader) { gint i; - + gint old_n = 0; if ( ds->datasheet) - datasheet_destroy (ds->datasheet); + { + old_n = datasheet_get_n_rows (ds->datasheet); + datasheet_destroy (ds->datasheet); + } ds->datasheet = datasheet_create (reader); - psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (ds), - -1, -1, -1, -1); + gint new_n = datasheet_get_n_rows (ds->datasheet); if ( ds->dict ) for (i = 0 ; i < n_dict_signals; ++i ) @@ -450,7 +494,7 @@ psppire_data_store_set_reader (PsppireDataStore *ds, } } - g_signal_emit (ds, signals[BACKEND_CHANGED], 0); + g_signal_emit (ds, signals[ITEMS_CHANGED], 0, 0, old_n, new_n); } @@ -494,21 +538,11 @@ 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 */ - psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (data_store), -1, -1, -1, -1); - -#if AXIS_TRANSITION - psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (data_store), 0, -1); -#endif if ( data_store->dict ) for (i = 0 ; i < n_dict_signals; ++i ) @@ -524,6 +558,13 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di static void psppire_data_store_finalize (GObject *object) { + PsppireDataStore *ds = PSPPIRE_DATA_STORE (object); + + if (ds->datasheet) + { + datasheet_destroy (ds->datasheet); + ds->datasheet = NULL; + } /* must chain up */ (* parent_class->finalize) (object); @@ -538,11 +579,7 @@ psppire_data_store_dispose (GObject *object) if (ds->dispose_has_run) return; - if (ds->datasheet) - { - datasheet_destroy (ds->datasheet); - ds->datasheet = NULL; - } + psppire_data_store_set_dictionary (ds, NULL); /* must chain up */ (* parent_class->dispose) (object); @@ -575,132 +612,99 @@ psppire_data_store_insert_new_case (PsppireDataStore *ds, casenumber posn) return result; } - -gchar * -psppire_data_store_get_string (PsppireDataStore *store, glong row, glong column) +gboolean +psppire_data_store_get_value (PsppireDataStore *store, + glong row, const struct variable *var, + union value *val) { - gint idx; - char *text; - const struct fmt_spec *fp ; - const struct variable *pv ; - const struct dictionary *dict; - union value v; - int width; - - g_return_val_if_fail (store->dict, NULL); - g_return_val_if_fail (store->datasheet, NULL); - - dict = store->dict->dict; - - if (column >= psppire_dict_get_var_cnt (store->dict)) - return NULL; + 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 >= psppire_data_store_get_case_count (store)) - return NULL; + if (row < 0 || row >= datasheet_get_n_rows (store->datasheet)) + return FALSE; - pv = psppire_dict_get_variable (store->dict, column); + int width = var_get_width (var); + value_init (val, width); + datasheet_get_value (store->datasheet, row, var_get_case_index (var), val); - g_assert (pv); + return TRUE; +} - idx = var_get_case_index (pv); - width = var_get_width (pv); - g_assert (idx >= 0); - value_init (&v, width); - if (!psppire_data_store_get_value (store, row, idx, &v)) +gchar * +psppire_data_store_get_string (PsppireDataStore *store, + glong row, const struct variable *var, + bool use_value_label) +{ + gchar *string; + union value v; + int width = var_get_width (var); + if (! psppire_data_store_get_value (store, row, var, &v)) return NULL; - if ( store->show_labels) + string = NULL; + if (use_value_label) { - const gchar *label = var_lookup_value_label (pv, &v); - if (label) - { - value_destroy (&v, width); - return g_strdup (label); - } + const char *label = var_lookup_value_label (var, &v); + if (label != NULL) + string = g_strdup (label); } - - fp = var_get_write_format (pv); - - text = data_out (&v, dict_get_encoding (dict), fp); - - g_strchomp (text); + if (string == NULL) + string = value_to_text (v, var); value_destroy (&v, width); - return text; -} - - -static gboolean -psppire_data_store_clear_datum (PsppireSheetModel *model, - glong row, glong col) -{ - PsppireDataStore *store = PSPPIRE_DATA_STORE (model); - union value v; - const struct variable *pv = psppire_dict_get_variable (store->dict, col); - int width = var_get_width (pv); - - const gint index = var_get_case_index (pv) ; + return string; +} - value_init (&v, width); - value_set_missing (&v, width); - psppire_data_store_set_value (store, row, index, &v); - value_destroy (&v, width); - psppire_sheet_model_range_changed (model, row, col, row, col); +/* Attempts to update that part of the variable store which corresponds to VAR + within ROW with the value TEXT. + If USE_VALUE_LABEL is true, and TEXT is a value label for the column's + variable, then stores the value from that value label instead of the literal + TEXT. - return TRUE; -} - - -/* Attempts to update that part of the variable store which corresponds - to ROW, COL with the value TEXT. - Returns true if anything was updated, false otherwise. -*/ + Returns true if anything was updated, false otherwise. */ gboolean psppire_data_store_set_string (PsppireDataStore *store, - const gchar *text, glong row, glong col) + const gchar *text, + glong row, const struct variable *var, + gboolean use_value_label) { + gint case_index; glong n_cases; - const struct variable *pv = psppire_dict_get_variable (store->dict, col); - if ( NULL == pv) - return FALSE; + gboolean ok; n_cases = psppire_data_store_get_case_count (store); - - if ( row > n_cases) + if (row > n_cases) return FALSE; - if (row == n_cases) psppire_data_store_insert_new_case (store, row); - psppire_data_store_data_in (store, row, - var_get_case_index (pv), ss_cstr (text), - var_get_write_format (pv)); - - psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), row, col, row, col); + case_index = var_get_case_index (var); + if (use_value_label) + { + const struct val_labs *vls = var_get_value_labels (var); + const union value *value = vls ? val_labs_find_value (vls, text) : NULL; + if (value) + ok = datasheet_put_value (store->datasheet, row, case_index, value); + else + ok = FALSE; + } + else + ok = psppire_data_store_data_in (store, row, case_index, ss_cstr (text), + var_get_print_format (var)); - return TRUE; + if (ok) + g_signal_emit (store, signals [CASE_CHANGED], 0, row); + return ok; } -void -psppire_data_store_show_labels (PsppireDataStore *store, gboolean show_labels) -{ - g_return_if_fail (store); - g_return_if_fail (PSPPIRE_IS_DATA_STORE (store)); - - store->show_labels = show_labels; - - psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), - -1, -1, -1, -1); -} - - void psppire_data_store_clear (PsppireDataStore *ds) { @@ -709,7 +713,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); } @@ -736,104 +740,6 @@ psppire_data_store_get_reader (PsppireDataStore *ds) return reader; } - - -/* Column related funcs */ - - -static const gchar null_var_name[]=N_("var"); - - - -/* Row related funcs */ - -static gchar * -get_row_button_label (const PsppireSheetModel *model, gint unit) -{ - // PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); - - return g_strdup_printf (_("%d"), unit + FIRST_CASE_NUMBER); -} - - -static gboolean -get_row_sensitivity (const PsppireSheetModel *model, gint unit) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); - - return (unit < psppire_data_store_get_case_count (ds)); -} - - - - -/* Column related stuff */ - -static gchar * -get_column_subtitle (const PsppireSheetModel *model, gint col) -{ - const struct variable *v ; - PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); - - if ( col >= psppire_dict_get_var_cnt (ds->dict) ) - return NULL; - - v = psppire_dict_get_variable (ds->dict, col); - - if ( ! var_has_label (v)) - return NULL; - - return xstrdup (var_get_label (v)); -} - -static gchar * -get_column_button_label (const PsppireSheetModel *model, gint col) -{ - struct variable *pv ; - PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); - - if ( col >= psppire_dict_get_var_cnt (ds->dict) ) - return g_locale_to_utf8 (null_var_name, -1, 0, 0, 0); - - pv = psppire_dict_get_variable (ds->dict, col); - - if (NULL == pv) - return NULL; - - return xstrdup (var_get_name (pv)); -} - -static gboolean -get_column_sensitivity (const PsppireSheetModel *model, gint col) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); - - return (col < psppire_dict_get_var_cnt (ds->dict)); -} - - - -static GtkJustification -get_column_justification (const PsppireSheetModel *model, gint col) -{ - PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); - const struct variable *pv ; - - if ( col >= psppire_dict_get_var_cnt (ds->dict) ) - return GTK_JUSTIFY_LEFT; - - pv = psppire_dict_get_variable (ds->dict, col); - - return (var_get_alignment (pv) == ALIGN_LEFT ? GTK_JUSTIFY_LEFT - : var_get_alignment (pv) == ALIGN_RIGHT ? GTK_JUSTIFY_RIGHT - : GTK_JUSTIFY_CENTER); -} - - - - - - /* Returns the CASENUMth case, or a null pointer on failure. */ struct ccase * @@ -860,8 +766,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); - psppire_sheet_model_rows_deleted (PSPPIRE_SHEET_MODEL (ds), first, n_cases); + g_signal_emit (ds, signals[ITEMS_CHANGED], 0, first, n_cases, 0); return TRUE; } @@ -879,13 +784,12 @@ psppire_data_store_insert_case (PsppireDataStore *ds, g_return_val_if_fail (ds, FALSE); g_return_val_if_fail (ds->datasheet, FALSE); - case_ref (cc); + cc = case_ref (cc); result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1); if ( result ) { - g_signal_emit (ds, signals [CASE_INSERTED], 0, posn); - psppire_sheet_model_rows_inserted (PSPPIRE_SHEET_MODEL (ds), posn, 1); + g_signal_emit (ds, signals[ITEMS_CHANGED], 0, posn, 0, 1); } else g_warning ("Cannot insert case at position %ld\n", posn); @@ -894,40 +798,33 @@ psppire_data_store_insert_case (PsppireDataStore *ds, } -/* Copies the IDXth value from case CASENUM into VALUE, which - must be of the correct width for IDX. - Returns true if successful, false on failure. */ -static bool -psppire_data_store_get_value (const PsppireDataStore *ds, - casenumber casenum, size_t idx, - union value *value) -{ - g_return_val_if_fail (ds, false); - g_return_val_if_fail (ds->datasheet, false); - g_return_val_if_fail (idx < datasheet_get_n_columns (ds->datasheet), false); - - return datasheet_get_value (ds->datasheet, casenum, idx, value); -} - - - -/* Set the IDXth value of case C to V. +/* Set the value of VAR in case CASENUM to V. V must be the correct width for IDX. Returns true if successful, false on I/O error. */ -static gboolean +gboolean psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum, - gint idx, union value *v) + const struct variable *var, const union value *v) { + glong n_cases; bool ok; g_return_val_if_fail (ds, FALSE); g_return_val_if_fail (ds->datasheet, FALSE); - g_return_val_if_fail (idx < datasheet_get_n_columns (ds->datasheet), FALSE); + n_cases = psppire_data_store_get_case_count (ds); + if ( casenum > n_cases) + return FALSE; - ok = datasheet_put_value (ds->datasheet, casenum, idx, v); + if (casenum == n_cases) + psppire_data_store_insert_new_case (ds, 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; } @@ -959,14 +856,11 @@ 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 (input, UTF8, fmt->type, 0, 0, 0, - dict->dict, &value, width) + && data_in_msg (input, UTF8, fmt->type, &value, width, + dict_get_encoding (dict->dict)) && datasheet_put_value (ds->datasheet, casenum, idx, &value)); value_destroy (&value, width); - if (ok) - g_signal_emit (ds, signals [CASE_CHANGED], 0, casenum); - return ok; } @@ -974,7 +868,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) { @@ -988,40 +882,38 @@ psppire_data_store_insert_value (PsppireDataStore *ds, ds->datasheet = datasheet_create (NULL); value_init (&value, width); - if (width == 0) - value.f = 0; - else - value_set_missing (&value, width); + value_set_missing (&value, width); datasheet_insert_column (ds->datasheet, &value, width, where); + value_destroy (&value, width); return TRUE; } -static gboolean -get_row_overstrike (const PsppireSheetModel *model, gint row) +gboolean +psppire_data_store_filtered (PsppireDataStore *ds, + glong row) { union value val; - PsppireDataStore *ds = PSPPIRE_DATA_STORE (model); - - const struct dictionary *dict = ds->dict->dict; - const struct variable *filter = dict_get_filter (dict); + const struct dictionary *dict; + const struct variable *filter; 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) return FALSE; - g_assert (var_is_numeric (filter)); - + g_return_val_if_fail (var_is_numeric (filter), FALSE); value_init (&val, 0); if ( ! datasheet_get_value (ds->datasheet, row, - var_get_case_index (filter), - &val) ) + var_get_case_index (filter), + &val) ) return FALSE; - return (val.f == 0.0); }