X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=173bf0e10f5a6efb602f8cbfc90abf51815d7bcd;hb=37c21ba9301956091823dea7d84ff0400330bd4b;hp=b3cc11334c880cad3534101915b9c1ddd72d575c;hpb=07da9f454c17fb961cae09f6d7d505f7abb281c0;p=pspp diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index b3cc11334c..173bf0e10f 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -57,7 +57,7 @@ static gboolean psppire_data_store_insert_case (PsppireDataStore *ds, static gboolean psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx, struct substring input, - const struct fmt_spec *fmt); + struct fmt_spec); static GObjectClass *parent_class = NULL; @@ -98,7 +98,7 @@ __tree_model_get_n_columns (GtkTreeModel *tree_model) { PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); - return psppire_dict_get_var_cnt (store->dict); + return psppire_dict_get_n_vars (store->dict); } @@ -134,11 +134,11 @@ psppire_data_store_string_to_value (GtkTreeModel *model, gint col, gint row, { PsppireDataStore *store = PSPPIRE_DATA_STORE (model); - while (col >= psppire_dict_get_var_cnt (store->dict)) + while (col >= psppire_dict_get_n_vars (store->dict)) { const struct variable *var = psppire_dict_insert_variable (store->dict, - psppire_dict_get_var_cnt (store->dict), + psppire_dict_get_n_vars (store->dict), NULL); g_return_val_if_fail (var, FALSE); } @@ -146,7 +146,7 @@ psppire_data_store_string_to_value (GtkTreeModel *model, gint col, gint row, 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); + struct fmt_spec fmt = var_get_print_format (variable); int width = var_get_width (variable); @@ -164,7 +164,7 @@ psppire_data_store_string_to_value (GtkTreeModel *model, gint col, gint row, if (vp == NULL) { xx = data_in (ss_cstr (in), psppire_dict_encoding (store->dict), - fmt->type, settings_get_fmt_settings (), + fmt.type, settings_get_fmt_settings (), &val, width, "UTF-8"); } @@ -181,10 +181,10 @@ 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)) + var_is_value_missing (variable, val) == MV_SYSTEM) return g_strdup (""); - const struct fmt_spec *fmt = var_get_print_format (variable); + struct fmt_spec fmt = var_get_print_format (variable); return value_to_text__ (*val, fmt, psppire_dict_encoding (store->dict)); } @@ -253,7 +253,7 @@ __get_value (GtkTreeModel *tree_model, g_value_init (value, G_TYPE_VARIANT); - const union value *val = case_data_idx (cc, var_get_case_index (variable)); + const union value *val = case_data_idx (cc, var_get_dict_index (variable)); GVariant *vv = value_variant_new (val, var_get_width (variable)); @@ -332,7 +332,7 @@ psppire_data_store_get_case_count (const PsppireDataStore *store) size_t psppire_data_store_get_value_count (const PsppireDataStore *store) { - return psppire_dict_get_value_cnt (store->dict); + return psppire_dict_get_n_vars (store->dict); } const struct caseproto * @@ -352,27 +352,36 @@ psppire_data_store_init (PsppireDataStore *data_store) static void -psppire_data_store_delete_value (PsppireDataStore *store, gint case_index) +psppire_data_store_delete_values (PsppireDataStore *store, gint case_index, + guint n) { 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); + datasheet_delete_columns (store->datasheet, case_index, n); } /* - A callback which occurs after a variable has been deleted. + A callback which occurs after variables have been deleted. */ static void -delete_variable_callback (GObject *obj, const struct variable *var UNUSED, - gint dict_index, gint case_index, - gpointer data) +delete_variables_callback (GObject *obj, gint dict_index, unsigned int n, gpointer data) { PsppireDataStore *store = PSPPIRE_DATA_STORE (data); - psppire_data_store_delete_value (store, case_index); + psppire_data_store_delete_values (store, dict_index, n); +} + +/* + A callback which occurs after variables have been deleted. + */ +static void +move_variable_callback (GObject *obj, gint new_dict_index, int old_dict_index, gpointer data) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (data); + + datasheet_move_columns (store->datasheet, old_dict_index, new_dict_index, 1); } struct resize_datum_aux @@ -388,11 +397,11 @@ 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); + 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 + 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)); @@ -408,7 +417,7 @@ variable_changed_callback (GObject *obj, gint var_num, guint what, const struct if (what & VAR_TRAIT_WIDTH) { - int posn = var_get_case_index (variable); + int posn = var_get_dict_index (variable); struct resize_datum_aux aux; aux.old_variable = oldvar; aux.new_variable = variable; @@ -430,7 +439,7 @@ insert_variable_callback (GObject *obj, gint var_num, gpointer data) store = PSPPIRE_DATA_STORE (data); variable = psppire_dict_get_variable (store->dict, var_num); - posn = var_get_case_index (variable); + posn = var_get_dict_index (variable); psppire_data_store_insert_value (store, var_get_width (variable), posn); } @@ -514,9 +523,14 @@ psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di G_CALLBACK (insert_variable_callback), data_store); - data_store->dict_handler_id [VARIABLE_DELETED] = - g_signal_connect (dict, "variable-deleted", - G_CALLBACK (delete_variable_callback), + data_store->dict_handler_id [VARIABLES_DELETED] = + g_signal_connect (dict, "variables-deleted", + G_CALLBACK (delete_variables_callback), + data_store); + + data_store->dict_handler_id [VARIABLE_MOVED] = + g_signal_connect (dict, "variable-moved", + G_CALLBACK (move_variable_callback), data_store); data_store->dict_handler_id [VARIABLE_CHANGED] = @@ -611,7 +625,7 @@ psppire_data_store_get_value (PsppireDataStore *store, int width = var_get_width (var); value_init (val, width); - datasheet_get_value (store->datasheet, row, var_get_case_index (var), val); + datasheet_get_value (store->datasheet, row, var_get_dict_index (var), val); return TRUE; } @@ -669,7 +683,7 @@ psppire_data_store_set_string (PsppireDataStore *store, if (row == n_cases) psppire_data_store_insert_new_case (store, row); - case_index = var_get_case_index (var); + case_index = var_get_dict_index (var); if (use_value_label) { const struct val_labs *vls = var_get_value_labels (var); @@ -707,11 +721,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) + for (int i = 0 ; i < n_dict_signals; ++i) { g_signal_handler_block (ds->dict, ds->dict_handler_id[i]); @@ -803,7 +816,7 @@ psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum, if (casenum == n_cases) psppire_data_store_insert_new_case (ds, casenum); - ok = datasheet_put_value (ds->datasheet, casenum, var_get_case_index (var), + ok = datasheet_put_value (ds->datasheet, casenum, var_get_dict_index (var), v); if (ok) { @@ -820,7 +833,7 @@ psppire_data_store_set_value (PsppireDataStore *ds, casenumber casenum, /* Set the IDXth value of case C using D_IN */ static gboolean psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx, - struct substring input, const struct fmt_spec *fmt) + struct substring input, struct fmt_spec fmt) { union value value; int width; @@ -841,7 +854,7 @@ 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, settings_get_fmt_settings (), + && 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); @@ -896,7 +909,7 @@ psppire_data_store_filtered (PsppireDataStore *ds, 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), + var_get_dict_index (filter), &val)) return FALSE;